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

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

Issue 1412143002: Remove the video channel id completely. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove string. 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 | « webrtc/video/video_receive_stream.cc ('k') | 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 22 matching lines...) Expand all
33 class ViEEncoder; 33 class ViEEncoder;
34 34
35 namespace internal { 35 namespace internal {
36 36
37 class VideoSendStream : public webrtc::VideoSendStream, 37 class VideoSendStream : public webrtc::VideoSendStream,
38 public webrtc::CpuOveruseObserver { 38 public webrtc::CpuOveruseObserver {
39 public: 39 public:
40 VideoSendStream(int num_cpu_cores, 40 VideoSendStream(int num_cpu_cores,
41 ProcessThread* module_process_thread, 41 ProcessThread* module_process_thread,
42 ChannelGroup* channel_group, 42 ChannelGroup* channel_group,
43 int channel_id,
44 const VideoSendStream::Config& config, 43 const VideoSendStream::Config& config,
45 const VideoEncoderConfig& encoder_config, 44 const VideoEncoderConfig& encoder_config,
46 const std::map<uint32_t, RtpState>& suspended_ssrcs); 45 const std::map<uint32_t, RtpState>& suspended_ssrcs);
47 46
48 ~VideoSendStream() override; 47 ~VideoSendStream() override;
49 48
50 // webrtc::SendStream implementation. 49 // webrtc::SendStream implementation.
51 void Start() override; 50 void Start() override;
52 void Stop() override; 51 void Stop() override;
53 void SignalNetworkState(NetworkState state) override; 52 void SignalNetworkState(NetworkState state) override;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // start bitrate initially, instead of the one reported by VideoEngine (which 86 // start bitrate initially, instead of the one reported by VideoEngine (which
88 // defaults to too high). 87 // defaults to too high).
89 bool use_config_bitrate_; 88 bool use_config_bitrate_;
90 89
91 SendStatisticsProxy stats_proxy_; 90 SendStatisticsProxy stats_proxy_;
92 }; 91 };
93 } // namespace internal 92 } // namespace internal
94 } // namespace webrtc 93 } // namespace webrtc
95 94
96 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 95 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/video_receive_stream.cc ('k') | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698