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

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

Issue 1689923002: Reland of Make cricket::VideoCapturer implement VideoSourceInterface (patchset #14 id:30000… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 10 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/media/media.gyp ('k') | webrtc/pc/channelmanager.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 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 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 rtc::scoped_ptr<CaptureManager> capture_manager_; 207 rtc::scoped_ptr<CaptureManager> capture_manager_;
208 bool initialized_; 208 bool initialized_;
209 rtc::Thread* main_thread_; 209 rtc::Thread* main_thread_;
210 rtc::Thread* worker_thread_; 210 rtc::Thread* worker_thread_;
211 211
212 VoiceChannels voice_channels_; 212 VoiceChannels voice_channels_;
213 VideoChannels video_channels_; 213 VideoChannels video_channels_;
214 DataChannels data_channels_; 214 DataChannels data_channels_;
215 215
216 int audio_output_volume_; 216 int audio_output_volume_;
217 VideoRenderer* local_renderer_;
218 bool enable_rtx_; 217 bool enable_rtx_;
219 218
220 bool capturing_; 219 bool capturing_;
221 }; 220 };
222 221
223 } // namespace cricket 222 } // namespace cricket
224 223
225 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_ 224 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_
OLDNEW
« no previous file with comments | « webrtc/media/media.gyp ('k') | webrtc/pc/channelmanager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698