ref: e6109dbd41a8680d9a3b4d254dec877f57dccaa8
parent: 4206c6dd01c33ff19b8eedc595aaac9b72105172
author: Adrian Grange <agrange@google.com>
date: Tue Oct 2 07:27:29 EDT 2012
Added handler for PSNR packets to EncoderTest class Added a virtual function to handle PSNR packets. Change-Id: Id2a6372c691a14f19bbeed217a93a9df03e81e75
--- a/test/encode_test_driver.cc
+++ b/test/encode_test_driver.cc
@@ -159,16 +159,25 @@
while (const vpx_codec_cx_pkt_t *pkt = iter.Next()) {
again = true;
- if (pkt->kind != VPX_CODEC_CX_FRAME_PKT)
- continue;
+ switch (pkt->kind) {
+ case VPX_CODEC_CX_FRAME_PKT:
#if CONFIG_VP8_DECODER
- has_cxdata = true;
- decoder.DecodeFrame((const uint8_t*)pkt->data.frame.buf,
- pkt->data.frame.sz);
+ has_cxdata = true;
+ decoder.DecodeFrame((const uint8_t*)pkt->data.frame.buf,
+ pkt->data.frame.sz);
#endif
- ASSERT_GE(pkt->data.frame.pts, last_pts_);
- last_pts_ = pkt->data.frame.pts;
- FramePktHook(pkt);
+ ASSERT_GE(pkt->data.frame.pts, last_pts_);
+ last_pts_ = pkt->data.frame.pts;
+ FramePktHook(pkt);
+ break;
+
+ case VPX_CODEC_PSNR_PKT:
+ PSNRPktHook(pkt);
+ break;
+
+ default:
+ break;
+ }
}
#if CONFIG_VP8_DECODER
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -176,6 +176,9 @@
// Hook to be called on every compressed data packet.
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.
virtual bool Continue() const { return !abort_; }
--
⑨