Create VideoReceiver with external VCMTiming object.

webrtc/modules/video_coding/video_receiver.cc

Index: webrtc/modules/video_coding/video_receiver.cc
diff --git a/webrtc/modules/video_coding/video_receiver.cc b/webrtc/modules/video_coding/video_receiver.cc
index 7395840feb17e99bdb23bccbe1f44981daec79cd..8d28ac9324bb292f9e16fd18e9939df5891a4e50 100644
--- a/webrtc/modules/video_coding/video_receiver.cc
+++ b/webrtc/modules/video_coding/video_receiver.cc
@@ -27,15 +27,17 @@ VideoReceiver::VideoReceiver(Clock* clock,
                              EventFactory* event_factory,
                              EncodedImageCallback* pre_decode_image_callback,
                              NackSender* nack_sender,
-                             KeyFrameRequestSender* keyframe_request_sender)
+                             KeyFrameRequestSender* keyframe_request_sender,
+                             VCMTiming* timing)
     : clock_(clock),
-      _timing(clock_),
-      _receiver(&_timing,
+      _ownsTiming(timing == nullptr),
+      _timing(_ownsTiming ? new VCMTiming(clock_) : timing),
+      _receiver(_timing,
                 clock_,
                 event_factory,
                 nack_sender,
                 keyframe_request_sender),
-      _decodedFrameCallback(&_timing, clock_),
+      _decodedFrameCallback(_timing, clock_),
       _frameTypeCallback(nullptr),
       _receiveStatsCallback(nullptr),
       _decoderTimingCallback(nullptr),
@@ -51,7 +53,10 @@ VideoReceiver::VideoReceiver(Clock* clock,
       _retransmissionTimer(10, clock_),
       _keyRequestTimer(500, clock_) {}
 
-VideoReceiver::~VideoReceiver() {}
+VideoReceiver::~VideoReceiver() {
+  if (_ownsTiming)
+    delete _timing;
+}
 
 void VideoReceiver::Process() {
   // Receive-side statistics
@@ -73,9 +78,9 @@ void VideoReceiver::Process() {
       int jitter_buffer_ms;
       int min_playout_delay_ms;
       int render_delay_ms;
-      _timing.GetTimings(&decode_ms, &max_decode_ms, &current_delay_ms,
-                         &target_delay_ms, &jitter_buffer_ms,
-                         &min_playout_delay_ms, &render_delay_ms);
+      _timing->GetTimings(&decode_ms, &max_decode_ms, &current_delay_ms,
+                          &target_delay_ms, &jitter_buffer_ms,
+                          &min_playout_delay_ms, &render_delay_ms);
       _decoderTimingCallback->OnDecoderTiming(
           decode_ms, max_decode_ms, current_delay_ms, target_delay_ms,
           jitter_buffer_ms, min_playout_delay_ms, render_delay_ms);
@@ -276,8 +281,8 @@ int32_t VideoReceiver::Decode(uint16_t maxWaitTimeMs) {
 
   rtc::CritScope cs(&receive_crit_);
   // If this frame was too late, we should adjust the delay accordingly
-  _timing.UpdateCurrentDelay(frame->RenderTimeMs(),
-                             clock_->TimeInMilliseconds());
+  _timing->UpdateCurrentDelay(frame->RenderTimeMs(),
+                              clock_->TimeInMilliseconds());
 
   if (first_frame_received_()) {
     LOG(LS_INFO) << "Received first "
@@ -440,20 +445,20 @@ int32_t VideoReceiver::IncomingPacket(const uint8_t* incomingPayload,
 // to sync with audio. Not included in  VideoCodingModule::Delay()
 // Defaults to 0 ms.
 int32_t VideoReceiver::SetMinimumPlayoutDelay(uint32_t minPlayoutDelayMs) {
-  _timing.set_min_playout_delay(minPlayoutDelayMs);
+  _timing->set_min_playout_delay(minPlayoutDelayMs);
   return VCM_OK;
 }
 
 // The estimated delay caused by rendering, defaults to
 // kDefaultRenderDelayMs = 10 ms
 int32_t VideoReceiver::SetRenderDelay(uint32_t timeMS) {
-  _timing.set_render_delay(timeMS);
+  _timing->set_render_delay(timeMS);
   return VCM_OK;
 }
 
 // Current video delay
 int32_t VideoReceiver::Delay() const {
-  return _timing.TargetVideoDelay();
+  return _timing->TargetVideoDelay();
 }
 
 uint32_t VideoReceiver::DiscardedPackets() const {