generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Added handler for PSNR packets to EncoderTest class"

Browse Source
This commit is contained in:
Adrian Grange 2012-10-04 10:38:35 -07:00 committed by Gerrit Code Review
commit eb8e9f80c4
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/encode_test_driver.cc
View File

@ -159,16 +159,25 @@ void EncoderTest::RunLoop(VideoSource *video) {
while (const vpx_codec_cx_pkt_t *pkt = iter.Next()) { while (const vpx_codec_cx_pkt_t *pkt = iter.Next()) {
again = true; again = true;
if (pkt->kind != VPX_CODEC_CX_FRAME_PKT) switch (pkt->kind) {
continue; case VPX_CODEC_CX_FRAME_PKT:
#if CONFIG_VP8_DECODER #if CONFIG_VP8_DECODER
has_cxdata = true; has_cxdata = true;
decoder.DecodeFrame((const uint8_t*)pkt->data.frame.buf, decoder.DecodeFrame((const uint8_t*)pkt->data.frame.buf,
pkt->data.frame.sz); pkt->data.frame.sz);
#endif #endif
ASSERT_GE(pkt->data.frame.pts, last_pts_); ASSERT_GE(pkt->data.frame.pts, last_pts_);
last_pts_ = pkt->data.frame.pts; last_pts_ = pkt->data.frame.pts;
FramePktHook(pkt); FramePktHook(pkt);
break;
case VPX_CODEC_PSNR_PKT:
PSNRPktHook(pkt);
break;
default:
break;
}
} }
#if CONFIG_VP8_DECODER #if CONFIG_VP8_DECODER

3
test/encode_test_driver.h
View File

@ -176,6 +176,9 @@ class EncoderTest {
// Hook to be called on every compressed data packet. // Hook to be called on every compressed data packet.
virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) {} virtual void FramePktHook(const vpx_codec_cx_pkt_t *pkt) {}
// Hook to be called on every PSNR packet.
virtual void PSNRPktHook(const vpx_codec_cx_pkt_t *pkt) {}
// Hook to determine whether the encode loop should continue. // Hook to determine whether the encode loop should continue.
virtual bool Continue() const { return !abort_; } virtual bool Continue() const { return !abort_; }