From 4d9e876b44b1169a195f3da1e502d829dec1d279 Mon Sep 17 00:00:00 2001 From: James Zern Date: Sat, 18 Jun 2016 11:03:26 -0700 Subject: [PATCH] realtime_test: remove decoded frame count check decoding is done if the decoder is available, with errors handled accordingly. the encoded frame count should be sufficient for this test. + remove HandleDecodeResult() as it's redundant given the base implementation BUG=webm:1233 Change-Id: I513c1c3475c58a746f4df627491bdc392fe21416 --- test/realtime_test.cc | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/test/realtime_test.cc b/test/realtime_test.cc index c362bdc06..24749e4ec 100644 --- a/test/realtime_test.cc +++ b/test/realtime_test.cc @@ -24,7 +24,7 @@ class RealtimeTest public ::libvpx_test::CodecTestWithParam { protected: RealtimeTest() - : EncoderTest(GET_PARAM(0)), num_decoded_(0), frame_packets_(0) {} + : EncoderTest(GET_PARAM(0)), frame_packets_(0) {} virtual ~RealtimeTest() {} virtual void SetUp() { @@ -44,18 +44,7 @@ class RealtimeTest virtual void FramePktHook(const vpx_codec_cx_pkt_t * /*pkt*/) { frame_packets_++; } - virtual void DecompressedFrameHook(const vpx_image_t & /*img*/, - vpx_codec_pts_t /*pts*/) { - num_decoded_++; - } - virtual bool HandleDecodeResult(const vpx_codec_err_t res_dec, - const libvpx_test::VideoSource & /*video*/, - libvpx_test::Decoder *decoder) { - EXPECT_EQ(VPX_CODEC_OK, res_dec) << decoder->DecodeError(); - return !::testing::Test::HasFailure(); - } - int num_decoded_; int frame_packets_; }; @@ -64,7 +53,6 @@ TEST_P(RealtimeTest, RealtimeFirstPassProducesFrames) { video.SetSize(kVideoSourceWidth, kVideoSourceHeight); video.set_limit(kFramesToEncode); ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); - EXPECT_EQ(kFramesToEncode, num_decoded_); EXPECT_EQ(kFramesToEncode, frame_packets_); }