| Index: webrtc/modules/video_coding/generic_decoder.h
|
| diff --git a/webrtc/modules/video_coding/generic_decoder.h b/webrtc/modules/video_coding/generic_decoder.h
|
| index 48e25196e93d74b3618792c64d70a8239b2c5231..2d0007be81136102221d39ff2a5ff32eebb4ca8a 100644
|
| --- a/webrtc/modules/video_coding/generic_decoder.h
|
| +++ b/webrtc/modules/video_coding/generic_decoder.h
|
| @@ -37,13 +37,11 @@ class VCMDecodedFrameCallback : public DecodedImageCallback {
|
| void SetUserReceiveCallback(VCMReceiveCallback* receiveCallback);
|
| VCMReceiveCallback* UserReceiveCallback();
|
|
|
| - int32_t Decoded(VideoFrame& decodedImage) override;
|
| - int32_t Decoded(VideoFrame& decodedImage, int64_t decode_time_ms) override;
|
| - void Decoded(VideoFrame& decodedImage,
|
| - rtc::Optional<int32_t> decode_time_ms,
|
| - rtc::Optional<uint8_t> qp) override;
|
| - int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId) override;
|
| - int32_t ReceivedDecodedFrame(const uint64_t pictureId) override;
|
| + virtual int32_t Decoded(VideoFrame& decodedImage); // NOLINT
|
| + virtual int32_t Decoded(VideoFrame& decodedImage, // NOLINT
|
| + int64_t decode_time_ms);
|
| + virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId);
|
| + virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId);
|
|
|
| uint64_t LastReceivedPictureID() const;
|
| void OnDecoderImplementationName(const char* implementation_name);
|
|
|