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

Side by Side Diff: talk/session/media/channelmanager.h

Issue 1655793003: Make cricket::VideoCapturer implement VideoSourceInterface (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added dummy capturerenderadapter.cc 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 | « no previous file | talk/session/media/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 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 rtc::scoped_ptr<CaptureManager> capture_manager_; 224 rtc::scoped_ptr<CaptureManager> capture_manager_;
225 bool initialized_; 225 bool initialized_;
226 rtc::Thread* main_thread_; 226 rtc::Thread* main_thread_;
227 rtc::Thread* worker_thread_; 227 rtc::Thread* worker_thread_;
228 228
229 VoiceChannels voice_channels_; 229 VoiceChannels voice_channels_;
230 VideoChannels video_channels_; 230 VideoChannels video_channels_;
231 DataChannels data_channels_; 231 DataChannels data_channels_;
232 232
233 int audio_output_volume_; 233 int audio_output_volume_;
234 VideoRenderer* local_renderer_;
235 bool enable_rtx_; 234 bool enable_rtx_;
236 235
237 bool capturing_; 236 bool capturing_;
238 }; 237 };
239 238
240 } // namespace cricket 239 } // namespace cricket
241 240
242 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_ 241 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | talk/session/media/channelmanager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698