Extract ViESyncModule outside ViEChannel.

webrtc/video/video_receive_stream.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 160 matching lines @@
                    nullptr,
                    nullptr,
                    congestion_controller_->GetRemoteBitrateEstimator(
                        UseSendSideBwe(config_)),
                    call_stats_->rtcp_rtt_stats(),
                    congestion_controller_->pacer(),
                    congestion_controller_->packet_router(),
                    1,
                    false),
       vie_receiver_(vie_channel_.vie_receiver()),
+      vie_sync_(vcm_.get()),
       rtp_rtcp_(vie_channel_.rtp_rtcp()) {
   LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString();
 
   RTC_DCHECK(process_thread_);
   RTC_DCHECK(congestion_controller_);
   RTC_DCHECK(call_stats_);
   RTC_DCHECK(remb_);
   RTC_CHECK(vie_channel_.Init() == 0);
 
   // Register the channel to receive stats updates.
@@ skipping 104 matching lines @@
   }
 
   vcm_->SetRenderDelay(config.render_delay_ms);
   incoming_video_stream_.SetExpectedRenderDelay(config.render_delay_ms);
   vcm_->RegisterPreDecodeImageCallback(this);
   incoming_video_stream_.SetExternalCallback(this);
   vie_channel_.SetIncomingVideoStream(&incoming_video_stream_);
   vie_channel_.RegisterPreRenderCallback(this);
 
   process_thread_->RegisterModule(vcm_.get());
+  process_thread_->RegisterModule(&vie_sync_);
 }
 
 VideoReceiveStream::~VideoReceiveStream() {
   LOG(LS_INFO) << "~VideoReceiveStream: " << config_.ToString();
   Stop();
 
+  process_thread_->DeRegisterModule(&vie_sync_);
   process_thread_->DeRegisterModule(vcm_.get());
 
   // Deregister external decoders so that they are no longer running during
   // destruction. This effectively stops the VCM since the decoder thread is
   // stopped, the VCM is deregistered and no asynchronous decoder threads are
   // running.
   for (const Decoder& decoder : config_.decoders)
     vcm_->RegisterExternalDecoder(nullptr, decoder.payload_type);
 
   vie_channel_.RegisterPreRenderCallback(nullptr);
@@ skipping 21 matching lines @@
 void VideoReceiveStream::Stop() {
   incoming_video_stream_.Stop();
   vie_receiver_->StopReceive();
   vcm_->TriggerDecoderShutdown();
   decode_thread_.Stop();
   transport_adapter_.Disable();
 }
 
 void VideoReceiveStream::SetSyncChannel(VoiceEngine* voice_engine,
                                         int audio_channel_id) {
+  VoEVideoSync* voe_sync_interface = nullptr;
   if (voice_engine != nullptr && audio_channel_id != -1) {

[danilchap, 2016/02/16 08:54:06]

Probably better to leave old way of branching to clearly show
ConfigureSync(-1, nullptr,...) and
ConfigureSync(channel_id>=0, sync_interface != nullptr,...) are distinct cases.

[pbos-webrtc, 2016/02/16 10:10:23]

Done.

-    VoEVideoSync* voe_sync_interface = VoEVideoSync::GetInterface(voice_engine);
-    vie_channel_.SetVoiceChannel(audio_channel_id, voe_sync_interface);
+    voe_sync_interface = VoEVideoSync::GetInterface(voice_engine);
+  } else {
+    audio_channel_id = -1;
+  }
+  vie_sync_.ConfigureSync(audio_channel_id, voe_sync_interface, rtp_rtcp_,
+                          vie_receiver_->GetRtpReceiver());
+  if (voe_sync_interface)
     voe_sync_interface->Release();
-  } else {
-    vie_channel_.SetVoiceChannel(-1, nullptr);
-  }
 }
 
 VideoReceiveStream::Stats VideoReceiveStream::GetStats() const {
   return stats_proxy_.GetStats();
 }
 
 bool VideoReceiveStream::DeliverRtcp(const uint8_t* packet, size_t length) {
   return vie_receiver_->DeliverRtcp(packet, length);
 }
 
@@ skipping 54 matching lines @@
   return true;
 }
 
 void VideoReceiveStream::Decode() {
   static const int kMaxDecodeWaitTimeMs = 50;
   vcm_->Decode(kMaxDecodeWaitTimeMs);
 }
 
 }  // namespace internal
 }  // namespace webrtc