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

Side by Side Diff: webrtc/pc/channelmanager.h

Issue 1972493002: Do not create a temporary transport channel when using max-bundle (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2004 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 bool Init(); 73 bool Init();
74 // Shuts down the media engine. 74 // Shuts down the media engine.
75 void Terminate(); 75 void Terminate();
76 76
77 // The operations below all occur on the worker thread. 77 // The operations below all occur on the worker thread.
78 // Creates a voice channel, to be associated with the specified session. 78 // Creates a voice channel, to be associated with the specified session.
79 VoiceChannel* CreateVoiceChannel( 79 VoiceChannel* CreateVoiceChannel(
80 webrtc::MediaControllerInterface* media_controller, 80 webrtc::MediaControllerInterface* media_controller,
81 TransportController* transport_controller, 81 TransportController* transport_controller,
82 const std::string& content_name, 82 const std::string& content_name,
83 const std::string& transport_name,
83 bool rtcp, 84 bool rtcp,
84 const AudioOptions& options); 85 const AudioOptions& options);
85 // Destroys a voice channel created with the Create API. 86 // Destroys a voice channel created with the Create API.
86 void DestroyVoiceChannel(VoiceChannel* voice_channel); 87 void DestroyVoiceChannel(VoiceChannel* voice_channel);
87 // Creates a video channel, synced with the specified voice channel, and 88 // Creates a video channel, synced with the specified voice channel, and
88 // associated with the specified session. 89 // associated with the specified session.
89 VideoChannel* CreateVideoChannel( 90 VideoChannel* CreateVideoChannel(
90 webrtc::MediaControllerInterface* media_controller, 91 webrtc::MediaControllerInterface* media_controller,
91 TransportController* transport_controller, 92 TransportController* transport_controller,
92 const std::string& content_name, 93 const std::string& content_name,
94 const std::string& transport_name,
93 bool rtcp, 95 bool rtcp,
94 const VideoOptions& options); 96 const VideoOptions& options);
95 // Destroys a video channel created with the Create API. 97 // Destroys a video channel created with the Create API.
96 void DestroyVideoChannel(VideoChannel* video_channel); 98 void DestroyVideoChannel(VideoChannel* video_channel);
97 DataChannel* CreateDataChannel(TransportController* transport_controller, 99 DataChannel* CreateDataChannel(TransportController* transport_controller,
98 const std::string& content_name, 100 const std::string& content_name,
101 const std::string& transport_name,
99 bool rtcp, 102 bool rtcp,
100 DataChannelType data_channel_type); 103 DataChannelType data_channel_type);
101 // Destroys a data channel created with the Create API. 104 // Destroys a data channel created with the Create API.
102 void DestroyDataChannel(DataChannel* data_channel); 105 void DestroyDataChannel(DataChannel* data_channel);
103 106
104 // Indicates whether any channels exist. 107 // Indicates whether any channels exist.
105 bool has_channels() const { 108 bool has_channels() const {
106 return (!voice_channels_.empty() || !video_channels_.empty()); 109 return (!voice_channels_.empty() || !video_channels_.empty());
107 } 110 }
108 111
(...skipping 30 matching lines...) Expand all
139 void Construct(MediaEngineInterface* me, 142 void Construct(MediaEngineInterface* me,
140 DataEngineInterface* dme, 143 DataEngineInterface* dme,
141 rtc::Thread* worker_thread); 144 rtc::Thread* worker_thread);
142 bool InitMediaEngine_w(); 145 bool InitMediaEngine_w();
143 void DestructorDeletes_w(); 146 void DestructorDeletes_w();
144 void Terminate_w(); 147 void Terminate_w();
145 VoiceChannel* CreateVoiceChannel_w( 148 VoiceChannel* CreateVoiceChannel_w(
146 webrtc::MediaControllerInterface* media_controller, 149 webrtc::MediaControllerInterface* media_controller,
147 TransportController* transport_controller, 150 TransportController* transport_controller,
148 const std::string& content_name, 151 const std::string& content_name,
152 const std::string& transport_name,
149 bool rtcp, 153 bool rtcp,
150 const AudioOptions& options); 154 const AudioOptions& options);
151 void DestroyVoiceChannel_w(VoiceChannel* voice_channel); 155 void DestroyVoiceChannel_w(VoiceChannel* voice_channel);
152 VideoChannel* CreateVideoChannel_w( 156 VideoChannel* CreateVideoChannel_w(
153 webrtc::MediaControllerInterface* media_controller, 157 webrtc::MediaControllerInterface* media_controller,
154 TransportController* transport_controller, 158 TransportController* transport_controller,
155 const std::string& content_name, 159 const std::string& content_name,
160 const std::string& transport_name,
156 bool rtcp, 161 bool rtcp,
157 const VideoOptions& options); 162 const VideoOptions& options);
158 void DestroyVideoChannel_w(VideoChannel* video_channel); 163 void DestroyVideoChannel_w(VideoChannel* video_channel);
159 DataChannel* CreateDataChannel_w(TransportController* transport_controller, 164 DataChannel* CreateDataChannel_w(TransportController* transport_controller,
160 const std::string& content_name, 165 const std::string& content_name,
166 const std::string& transport_name,
161 bool rtcp, 167 bool rtcp,
162 DataChannelType data_channel_type); 168 DataChannelType data_channel_type);
163 void DestroyDataChannel_w(DataChannel* data_channel); 169 void DestroyDataChannel_w(DataChannel* data_channel);
164 170
165 std::unique_ptr<MediaEngineInterface> media_engine_; 171 std::unique_ptr<MediaEngineInterface> media_engine_;
166 std::unique_ptr<DataEngineInterface> data_media_engine_; 172 std::unique_ptr<DataEngineInterface> data_media_engine_;
167 bool initialized_; 173 bool initialized_;
168 rtc::Thread* main_thread_; 174 rtc::Thread* main_thread_;
169 rtc::Thread* worker_thread_; 175 rtc::Thread* worker_thread_;
170 176
171 VoiceChannels voice_channels_; 177 VoiceChannels voice_channels_;
172 VideoChannels video_channels_; 178 VideoChannels video_channels_;
173 DataChannels data_channels_; 179 DataChannels data_channels_;
174 180
175 int audio_output_volume_; 181 int audio_output_volume_;
176 bool enable_rtx_; 182 bool enable_rtx_;
177 183
178 bool capturing_; 184 bool capturing_;
179 }; 185 };
180 186
181 } // namespace cricket 187 } // namespace cricket
182 188
183 #endif // WEBRTC_PC_CHANNELMANAGER_H_ 189 #endif // WEBRTC_PC_CHANNELMANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698