Move back receiver VCM into 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 140 matching lines @@
     VieRemb* remb)
     : transport_adapter_(config.rtcp_send_transport),
       encoded_frame_proxy_(config.pre_decode_callback),
       config_(config),
       process_thread_(process_thread),
       clock_(Clock::GetRealTimeClock()),
       decode_thread_(DecodeThreadFunction, this, "DecodingThread"),
       congestion_controller_(congestion_controller),
       call_stats_(call_stats),
       remb_(remb),
-      vcm_(VideoCodingModule::Create(clock_, nullptr, nullptr)),
       incoming_video_stream_(
           0,
           config.renderer ? config.renderer->SmoothsRenderedFrames() : false),
       stats_proxy_(config_.rtp.remote_ssrc, clock_),
       vie_channel_(&transport_adapter_,
                    process_thread,
                    nullptr,
-                   vcm_.get(),
                    nullptr,
                    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()),
+      vcm_(vie_channel_.vcm()),
       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);
+  vie_channel_.Init();
 
   // Register the channel to receive stats updates.
   call_stats_->RegisterStatsObserver(vie_channel_.GetStatsObserver());
 
   // TODO(pbos): This is not fine grained enough...
   vie_channel_.SetProtectionMode(config_.rtp.nack.rtp_history_ms > 0, false, -1,
                                  -1);
   RTC_DCHECK(config_.rtp.rtcp_mode != RtcpMode::kOff)
       << "A stream should not be configured with RTCP disabled. This value is "
          "reserved for internal usage.";
@@ skipping 96 matching lines @@
                  vcm_->RegisterReceiveCodec(&codec, num_cpu_cores, false));
   }
 
   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());
+  // Registration of VCM and callbacks here is part of splitting ViEChannel and
+  // moving functionality to sender/receivers instead of ViEChannel.
+  RTC_CHECK_EQ(0, vcm_->RegisterReceiveCallback(&vie_channel_));
+  vcm_->RegisterFrameTypeCallback(&vie_channel_);
+  vcm_->RegisterReceiveStatisticsCallback(&vie_channel_);
+  vcm_->RegisterDecoderTimingCallback(&vie_channel_);
+
+  process_thread_->RegisterModule(vcm_);
 }
 
 VideoReceiveStream::~VideoReceiveStream() {
   LOG(LS_INFO) << "~VideoReceiveStream: " << config_.ToString();
   Stop();
 
-  process_thread_->DeRegisterModule(vcm_.get());
+  process_thread_->DeRegisterModule(vcm_);
   vie_channel_.RegisterPreRenderCallback(nullptr);
   vcm_->RegisterPreDecodeImageCallback(nullptr);
 
   call_stats_->DeregisterStatsObserver(vie_channel_.GetStatsObserver());
   rtp_rtcp_->SetREMBStatus(false);
   remb_->RemoveReceiveChannel(rtp_rtcp_);
 
   congestion_controller_->GetRemoteBitrateEstimator(UseSendSideBwe(config_))
       ->RemoveStream(vie_receiver_->GetRemoteSsrc());
 }
@@ skipping 47 matching lines @@
 
   // Post processing is not supported if the frame is backed by a texture.
   if (video_frame->native_handle() == NULL) {
     if (config_.pre_render_callback)
       config_.pre_render_callback->FrameCallback(video_frame);
   }
 }
 
 int VideoReceiveStream::RenderFrame(const uint32_t /*stream_id*/,
                                     const VideoFrame& video_frame) {
-  // TODO(pbos): Wire up config_.render->IsTextureSupported() and convert if not
-  // supported. Or provide methods for converting a texture frame in
-  // VideoFrame.
-
   if (config_.renderer != nullptr)
     config_.renderer->RenderFrame(
         video_frame,
         video_frame.render_time_ms() - clock_->TimeInMilliseconds());
 
   stats_proxy_.OnRenderedFrame(video_frame.width(), video_frame.height());
 
   return 0;
 }
 
@@ skipping 22 matching lines @@
   return true;
 }
 
 void VideoReceiveStream::Decode() {
   static const int kMaxDecodeWaitTimeMs = 50;
   vcm_->Decode(kMaxDecodeWaitTimeMs);
 }
 
 }  // namespace internal
 }  // namespace webrtc