Move ownership of receive ViEChannel to VideoReceiveStream.

webrtc/video/video_receive_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 23 matching lines @@
 namespace internal {
 
 class VideoReceiveStream : public webrtc::VideoReceiveStream,
                            public I420FrameCallback,
                            public VideoRenderCallback {
  public:
   VideoReceiveStream(int num_cpu_cores,
                      ChannelGroup* channel_group,
                      int channel_id,
                      const VideoReceiveStream::Config& config,
-                     webrtc::VoiceEngine* voice_engine);
+                     webrtc::VoiceEngine* voice_engine,
+                     ProcessThread* process_thread);
   ~VideoReceiveStream() override;
 
   // webrtc::ReceiveStream implementation.
   void Start() override;
   void Stop() override;
   void SignalNetworkState(NetworkState state) override;
   bool DeliverRtcp(const uint8_t* packet, size_t length) override;
   bool DeliverRtp(const uint8_t* packet,
                   size_t length,
                   const PacketTime& packet_time) override;
@@ skipping 12 matching lines @@
 
   void SetSyncChannel(VoiceEngine* voice_engine, int audio_channel_id);
 
  private:
   TransportAdapter transport_adapter_;
   EncodedFrameCallbackAdapter encoded_frame_proxy_;
   const VideoReceiveStream::Config config_;
   Clock* const clock_;
 
   ChannelGroup* const channel_group_;
-  const int channel_id_;
 
-  ViEChannel* vie_channel_;
+  rtc::scoped_ptr<ViEChannel> vie_channel_;
   rtc::scoped_ptr<IncomingVideoStream> incoming_video_stream_;
 
   rtc::scoped_ptr<ReceiveStatisticsProxy> stats_proxy_;

[pbos-webrtc, 2015/10/16 12:49:57]

I think you can move this one to the top since it should outlive vie_channel_

[mflodman, 2015/10/16 13:31:57]

Done.

 };
 }  // namespace internal
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_