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

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

Issue 1344083004: Remove the SetLocalMonitor() API. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 3 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 | « talk/media/webrtc/webrtcvoiceengine_unittest.cc ('k') | 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 VideoCapturer* CreateVideoCapturer(); 158 VideoCapturer* CreateVideoCapturer();
159 // Create capturer from a screen. 159 // Create capturer from a screen.
160 VideoCapturer* CreateScreenCapturer(const ScreencastId& screenid); 160 VideoCapturer* CreateScreenCapturer(const ScreencastId& screenid);
161 bool SetCaptureDevice(const std::string& cam_device); 161 bool SetCaptureDevice(const std::string& cam_device);
162 bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config); 162 bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config);
163 // RTX will be enabled/disabled in engines that support it. The supporting 163 // RTX will be enabled/disabled in engines that support it. The supporting
164 // engines will start offering an RTX codec. Must be called before Init(). 164 // engines will start offering an RTX codec. Must be called before Init().
165 bool SetVideoRtxEnabled(bool enable); 165 bool SetVideoRtxEnabled(bool enable);
166 166
167 // Starts/stops the local microphone and enables polling of the input level. 167 // Starts/stops the local microphone and enables polling of the input level.
168 bool SetLocalMonitor(bool enable);
169 bool monitoring() const { return monitoring_; }
170 bool capturing() const { return capturing_; } 168 bool capturing() const { return capturing_; }
171 169
172 // Configures the logging output of the mediaengine(s). 170 // Configures the logging output of the mediaengine(s).
173 void SetVoiceLogging(int level, const char* filter); 171 void SetVoiceLogging(int level, const char* filter);
174 void SetVideoLogging(int level, const char* filter); 172 void SetVideoLogging(int level, const char* filter);
175 173
176 // Gets capturer's supported formats in a thread safe manner 174 // Gets capturer's supported formats in a thread safe manner
177 std::vector<cricket::VideoFormat> GetSupportedFormats( 175 std::vector<cricket::VideoFormat> GetSupportedFormats(
178 VideoCapturer* capturer) const; 176 VideoCapturer* capturer) const;
179 // The channel manager handles the Tx and Rx side for Voice processing. 177 // The channel manager handles the Tx and Rx side for Voice processing.
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 std::string audio_out_device_; 292 std::string audio_out_device_;
295 AudioOptions audio_options_; 293 AudioOptions audio_options_;
296 int audio_delay_offset_; 294 int audio_delay_offset_;
297 int audio_output_volume_; 295 int audio_output_volume_;
298 std::string camera_device_; 296 std::string camera_device_;
299 VideoEncoderConfig default_video_encoder_config_; 297 VideoEncoderConfig default_video_encoder_config_;
300 VideoRenderer* local_renderer_; 298 VideoRenderer* local_renderer_;
301 bool enable_rtx_; 299 bool enable_rtx_;
302 300
303 bool capturing_; 301 bool capturing_;
304 bool monitoring_;
305 302
306 // String containing currently set device. Note that this string is subtly 303 // String containing currently set device. Note that this string is subtly
307 // different from camera_device_. E.g. camera_device_ will list unplugged 304 // different from camera_device_. E.g. camera_device_ will list unplugged
308 // but selected devices while this sting will be empty or contain current 305 // but selected devices while this sting will be empty or contain current
309 // selected device. 306 // selected device.
310 // TODO(hellner): refactor the code such that there is no need to keep two 307 // TODO(hellner): refactor the code such that there is no need to keep two
311 // strings for video devices that have subtle differences in behavior. 308 // strings for video devices that have subtle differences in behavior.
312 std::string video_device_name_; 309 std::string video_device_name_;
313 }; 310 };
314 311
315 } // namespace cricket 312 } // namespace cricket
316 313
317 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_ 314 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvoiceengine_unittest.cc ('k') | talk/session/media/channelmanager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698