| Index: webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
|
| diff --git a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
|
| index a47c209ad42945bbe4de5cd7b110aabbf3b85e1c..ea6959997b0a97472e4e7e152b07a2c5cf465803 100644
|
| --- a/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
|
| +++ b/webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
|
| @@ -92,16 +92,17 @@ class Vp8UnitTestDecodeCompleteCallback : public webrtc::DecodedImageCallback {
|
| public:
|
| explicit Vp8UnitTestDecodeCompleteCallback(rtc::Optional<VideoFrame>* frame)
|
| : decoded_frame_(frame), decode_complete(false) {}
|
| - int32_t Decoded(VideoFrame& frame) override;
|
| + int32_t Decoded(VideoFrame& frame) override {
|
| + RTC_NOTREACHED();
|
| + return -1;
|
| + }
|
| int32_t Decoded(VideoFrame& frame, int64_t decode_time_ms) override {
|
| RTC_NOTREACHED();
|
| return -1;
|
| }
|
| void Decoded(VideoFrame& frame,
|
| rtc::Optional<int32_t> decode_time_ms,
|
| - rtc::Optional<uint8_t> qp) override {
|
| - RTC_NOTREACHED();
|
| - }
|
| + rtc::Optional<uint8_t> qp) override;
|
| bool DecodeComplete();
|
|
|
| private:
|
| @@ -117,10 +118,12 @@ bool Vp8UnitTestDecodeCompleteCallback::DecodeComplete() {
|
| return false;
|
| }
|
|
|
| -int Vp8UnitTestDecodeCompleteCallback::Decoded(VideoFrame& image) {
|
| - *decoded_frame_ = rtc::Optional<VideoFrame>(image);
|
| +void Vp8UnitTestDecodeCompleteCallback::Decoded(
|
| + VideoFrame& frame,
|
| + rtc::Optional<int32_t> decode_time_ms,
|
| + rtc::Optional<uint8_t> qp) {
|
| + *decoded_frame_ = rtc::Optional<VideoFrame>(frame);
|
| decode_complete = true;
|
| - return 0;
|
| }
|
|
|
| class TestVp8Impl : public ::testing::Test {
|
|
|