| Index: webrtc/modules/video_coding/video_coding_impl.h
|
| diff --git a/webrtc/modules/video_coding/video_coding_impl.h b/webrtc/modules/video_coding/video_coding_impl.h
|
| index 73733253bfdc41a8a233fb93eb1ddfe740644d33..2786d8b82a83f31e0c5d1139d9860b6b9a172fd4 100644
|
| --- a/webrtc/modules/video_coding/video_coding_impl.h
|
| +++ b/webrtc/modules/video_coding/video_coding_impl.h
|
| @@ -149,7 +149,6 @@ class VideoReceiver {
|
| int RegisterRenderBufferSizeCallback(VCMRenderBufferSizeCallback* callback);
|
|
|
| int32_t Decode(uint16_t maxWaitTimeMs);
|
| - int32_t ResetDecoder();
|
|
|
| int32_t ReceiveCodec(VideoCodec* currentReceiveCodec) const;
|
| VideoCodecType ReceiveCodec() const;
|
| @@ -208,10 +207,12 @@ class VideoReceiver {
|
| #endif
|
| VCMFrameBuffer _frameFromFile;
|
| bool _scheduleKeyRequest GUARDED_BY(process_crit_sect_);
|
| + bool drop_frames_until_keyframe_ GUARDED_BY(process_crit_sect_);
|
| size_t max_nack_list_size_ GUARDED_BY(process_crit_sect_);
|
| - EncodedImageCallback* pre_decode_image_callback_ GUARDED_BY(_receiveCritSect);
|
|
|
| VCMCodecDataBase _codecDataBase GUARDED_BY(_receiveCritSect);
|
| + EncodedImageCallback* pre_decode_image_callback_ GUARDED_BY(_receiveCritSect);
|
| +
|
| VCMProcessTimer _receiveStatsTimer;
|
| VCMProcessTimer _retransmissionTimer;
|
| VCMProcessTimer _keyRequestTimer;
|
|
|