Move Ownership of RtpModules to VideoSendStream.

webrtc/video/video_send_stream.h

 /*
  *  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 24 matching lines @@
 class ProcessThread;
 class RtpRtcp;
 class ViEChannel;
 class ViEEncoder;
 class VieRemb;
 
 namespace internal {
 
 class VideoSendStream : public webrtc::VideoSendStream,
                         public webrtc::CpuOveruseObserver,
-                        public webrtc::BitrateAllocatorObserver {
+                        public webrtc::BitrateAllocatorObserver,
+                        public webrtc::VCMProtectionCallback {
  public:
   VideoSendStream(int num_cpu_cores,
                   ProcessThread* module_process_thread,
                   CallStats* call_stats,
                   CongestionController* congestion_controller,
                   BitrateAllocator* bitrate_allocator,
                   VieRemb* remb,
                   const VideoSendStream::Config& config,
                   const VideoEncoderConfig& encoder_config,
                   const std::map<uint32_t, RtpState>& suspended_ssrcs);
@@ skipping 18 matching lines @@
   typedef std::map<uint32_t, RtpState> RtpStateMap;
   RtpStateMap GetRtpStates() const;
 
   int GetPaddingNeededBps() const;
 
   // Implements BitrateAllocatorObserver.
   void OnBitrateUpdated(uint32_t bitrate_bps,
                         uint8_t fraction_loss,
                         int64_t rtt) override;
 
+  // implements webrtc::VCMProtectionCallback.

[pbos-webrtc, 2016/04/07 16:02:08]

Implements

[perkj_webrtc, 2016/04/08 10:59:04]

Done.

+  int ProtectionRequest(const FecProtectionParams* delta_params,
+                        const FecProtectionParams* key_params,
+                        uint32_t* sent_video_rate_bps,
+                        uint32_t* sent_nack_rate_bps,
+                        uint32_t* sent_fec_rate_bps) override;
+
  private:
   static bool EncoderThreadFunction(void* obj);
   void EncoderProcess();
 
   void ConfigureSsrcs();
 
   SendStatisticsProxy stats_proxy_;
   EncodedFrameCallbackAdapter encoded_frame_proxy_;
   const VideoSendStream::Config config_;
   std::map<uint32_t, RtpState> suspended_ssrcs_;
 
   ProcessThread* const module_process_thread_;
   CallStats* const call_stats_;
   CongestionController* const congestion_controller_;
   BitrateAllocator* const bitrate_allocator_;
   VieRemb* const remb_;
 
   rtc::PlatformThread encoder_thread_;
   rtc::Event encoder_wakeup_event_;
   volatile int stop_encoder_thread_;
 
   OveruseFrameDetector overuse_detector_;
-  PayloadRouter payload_router_;
   EncoderStateFeedback encoder_feedback_;
-  ViEChannel vie_channel_;
-  ViEReceiver* const vie_receiver_;
   ViEEncoder vie_encoder_;
   VideoCodingModule* const vcm_;
-  // TODO(pbos): Move RtpRtcp ownership to VideoSendStream.
-  // RtpRtcp modules, currently owned by ViEChannel but ownership should
-  // eventually move here.
+
+  // RtpRtcp modules, declared here as they  use other members on construction.

[pbos-webrtc, 2016/04/07 16:02:08]

remove double space.

[perkj_webrtc, 2016/04/08 10:59:04]

Done.

   const std::vector<RtpRtcp*> rtp_rtcp_modules_;
+  PayloadRouter payload_router_;
   VideoCaptureInput input_;
 };
 }  // namespace internal
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_