Merge "Verify that the ouput of q0 is lossless in cpu speed test."

This commit is contained in:
Alex Converse 2014-06-27 11:09:14 -07:00 committed by Gerrit Code Review
commit 63de0f1628

View File

@ -17,6 +17,8 @@
namespace { namespace {
const int kMaxPSNR = 100;
class CpuSpeedTest : public ::libvpx_test::EncoderTest, class CpuSpeedTest : public ::libvpx_test::EncoderTest,
public ::libvpx_test::CodecTestWith2Params< public ::libvpx_test::CodecTestWith2Params<
libvpx_test::TestMode, int> { libvpx_test::TestMode, int> {
@ -24,7 +26,8 @@ class CpuSpeedTest : public ::libvpx_test::EncoderTest,
CpuSpeedTest() CpuSpeedTest()
: EncoderTest(GET_PARAM(0)), : EncoderTest(GET_PARAM(0)),
encoding_mode_(GET_PARAM(1)), encoding_mode_(GET_PARAM(1)),
set_cpu_used_(GET_PARAM(2)) {} set_cpu_used_(GET_PARAM(2)),
min_psnr_(kMaxPSNR) {}
virtual ~CpuSpeedTest() {} virtual ~CpuSpeedTest() {}
virtual void SetUp() { virtual void SetUp() {
@ -39,6 +42,10 @@ class CpuSpeedTest : public ::libvpx_test::EncoderTest,
} }
} }
virtual void BeginPassHook(unsigned int /*pass*/) {
min_psnr_ = kMaxPSNR;
}
virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video, virtual void PreEncodeFrameHook(::libvpx_test::VideoSource *video,
::libvpx_test::Encoder *encoder) { ::libvpx_test::Encoder *encoder) {
if (video->frame() == 1) { if (video->frame() == 1) {
@ -57,8 +64,14 @@ class CpuSpeedTest : public ::libvpx_test::EncoderTest,
} }
} }
virtual void PSNRPktHook(const vpx_codec_cx_pkt_t *pkt) {
if (pkt->data.psnr.psnr[0] < min_psnr_)
min_psnr_ = pkt->data.psnr.psnr[0];
}
::libvpx_test::TestMode encoding_mode_; ::libvpx_test::TestMode encoding_mode_;
int set_cpu_used_; int set_cpu_used_;
double min_psnr_;
}; };
TEST_P(CpuSpeedTest, TestQ0) { TEST_P(CpuSpeedTest, TestQ0) {
@ -75,7 +88,10 @@ TEST_P(CpuSpeedTest, TestQ0) {
::libvpx_test::I420VideoSource video("hantro_odd.yuv", 208, 144, 30, 1, 0, ::libvpx_test::I420VideoSource video("hantro_odd.yuv", 208, 144, 30, 1, 0,
20); 20);
init_flags_ = VPX_CODEC_USE_PSNR;
ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
EXPECT_GE(min_psnr_, kMaxPSNR);
} }