| 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 a45105a6ced3ea2c30b0499c1abe12828e3ab41c..30641dcf2fd52750c51131ecc54458186b96cf25 100644
|
| --- a/webrtc/modules/video_coding/video_coding_impl.h
|
| +++ b/webrtc/modules/video_coding/video_coding_impl.h
|
| @@ -18,8 +18,9 @@
|
| #include <vector>
|
|
|
| #include "webrtc/base/onetimeevent.h"
|
| -#include "webrtc/base/thread_annotations.h"
|
| #include "webrtc/base/sequenced_task_checker.h"
|
| +#include "webrtc/base/thread_annotations.h"
|
| +#include "webrtc/base/thread_checker.h"
|
| #include "webrtc/common_video/include/frame_callback.h"
|
| #include "webrtc/modules/video_coding/codec_database.h"
|
| #include "webrtc/modules/video_coding/frame_buffer.h"
|
| @@ -171,6 +172,9 @@ class VideoReceiver : public Module {
|
|
|
| int32_t Decode(const webrtc::VCMEncodedFrame* frame);
|
|
|
| + // Called on the decoder thread when thread is exiting.
|
| + void DecodingStopped();
|
| +
|
| int32_t ReceiveCodec(VideoCodec* currentReceiveCodec) const;
|
| VideoCodecType ReceiveCodec() const;
|
|
|
| @@ -206,6 +210,7 @@ class VideoReceiver : public Module {
|
| int32_t RequestSliceLossIndication(const uint64_t pictureID) const;
|
|
|
| private:
|
| + rtc::ThreadChecker construction_thread_;
|
| Clock* const clock_;
|
| rtc::CriticalSection process_crit_;
|
| rtc::CriticalSection receive_crit_;
|
| @@ -216,7 +221,6 @@ class VideoReceiver : public Module {
|
| VCMReceiveStatisticsCallback* _receiveStatsCallback GUARDED_BY(process_crit_);
|
| VCMDecoderTimingCallback* _decoderTimingCallback GUARDED_BY(process_crit_);
|
| VCMPacketRequestCallback* _packetRequestCallback GUARDED_BY(process_crit_);
|
| - VCMGenericDecoder* _decoder;
|
|
|
| VCMFrameBuffer _frameFromFile;
|
| bool _scheduleKeyRequest GUARDED_BY(process_crit_);
|
|
|