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 b5d04c4a68246b9655375be0ae71143857112a50..94e1db397d58f3d6e77bec5b12cd8ad09794d3f9 100644 |
--- a/webrtc/modules/video_coding/video_coding_impl.h |
+++ b/webrtc/modules/video_coding/video_coding_impl.h |
@@ -149,7 +149,8 @@ class VideoReceiver : public Module { |
EventFactory* event_factory, |
EncodedImageCallback* pre_decode_image_callback, |
NackSender* nack_sender = nullptr, |
- KeyFrameRequestSender* keyframe_request_sender = nullptr); |
+ KeyFrameRequestSender* keyframe_request_sender = nullptr, |
+ VCMTiming* timing = nullptr); |
stefan-webrtc
2016/12/14 13:00:32
Make this required instead.
philipel
2016/12/14 13:21:21
Done.
|
~VideoReceiver(); |
int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec, |
@@ -208,7 +209,8 @@ class VideoReceiver : public Module { |
Clock* const clock_; |
rtc::CriticalSection process_crit_; |
rtc::CriticalSection receive_crit_; |
- VCMTiming _timing; |
+ bool _ownsTiming; |
+ VCMTiming* _timing; |
VCMReceiver _receiver; |
VCMDecodedFrameCallback _decodedFrameCallback; |
VCMFrameTypeCallback* _frameTypeCallback GUARDED_BY(process_crit_); |