Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Side by Side Diff: webrtc/video/video_send_stream.h

Issue 1394243006: Move ownership of send ViEChannels and ViEEncoder to VideoSendStream. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed header leftovers. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 bool SetSendCodec(VideoCodec video_codec); 71 bool SetSendCodec(VideoCodec video_codec);
72 void ConfigureSsrcs(); 72 void ConfigureSsrcs();
73 TransportAdapter transport_adapter_; 73 TransportAdapter transport_adapter_;
74 EncodedFrameCallbackAdapter encoded_frame_proxy_; 74 EncodedFrameCallbackAdapter encoded_frame_proxy_;
75 const VideoSendStream::Config config_; 75 const VideoSendStream::Config config_;
76 VideoEncoderConfig encoder_config_; 76 VideoEncoderConfig encoder_config_;
77 std::map<uint32_t, RtpState> suspended_ssrcs_; 77 std::map<uint32_t, RtpState> suspended_ssrcs_;
78 78
79 ProcessThread* const module_process_thread_; 79 ProcessThread* const module_process_thread_;
80 ChannelGroup* const channel_group_; 80 ChannelGroup* const channel_group_;
81 const int channel_id_;
82 81
83 rtc::scoped_ptr<VideoCaptureInput> input_; 82 rtc::scoped_ptr<VideoCaptureInput> input_;
84 ViEChannel* vie_channel_; 83 rtc::scoped_ptr<ViEChannel> vie_channel_;
85 ViEEncoder* vie_encoder_; 84 rtc::scoped_ptr<ViEEncoder> vie_encoder_;
86 85
87 // Used as a workaround to indicate that we should be using the configured 86 // Used as a workaround to indicate that we should be using the configured
88 // start bitrate initially, instead of the one reported by VideoEngine (which 87 // start bitrate initially, instead of the one reported by VideoEngine (which
89 // defaults to too high). 88 // defaults to too high).
90 bool use_config_bitrate_; 89 bool use_config_bitrate_;
91 90
92 SendStatisticsProxy stats_proxy_; 91 SendStatisticsProxy stats_proxy_;
93 }; 92 };
94 } // namespace internal 93 } // namespace internal
95 } // namespace webrtc 94 } // namespace webrtc
96 95
97 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 96 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698