| OLD | NEW | 
|---|
| 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 122   // Gets capturer's supported formats in a thread safe manner | 122   // Gets capturer's supported formats in a thread safe manner | 
| 123   std::vector<cricket::VideoFormat> GetSupportedFormats( | 123   std::vector<cricket::VideoFormat> GetSupportedFormats( | 
| 124       VideoCapturer* capturer) const; | 124       VideoCapturer* capturer) const; | 
| 125   // The following are done in the new "CaptureManager" style that | 125   // The following are done in the new "CaptureManager" style that | 
| 126   // all local video capturers, processors, and managers should move to. | 126   // all local video capturers, processors, and managers should move to. | 
| 127   // TODO(pthatcher): Make methods nicer by having start return a handle that | 127   // TODO(pthatcher): Make methods nicer by having start return a handle that | 
| 128   // can be used for stop and restart, rather than needing to pass around | 128   // can be used for stop and restart, rather than needing to pass around | 
| 129   // formats a a pseudo-handle. | 129   // formats a a pseudo-handle. | 
| 130   bool StartVideoCapture(VideoCapturer* video_capturer, | 130   bool StartVideoCapture(VideoCapturer* video_capturer, | 
| 131                          const VideoFormat& video_format); | 131                          const VideoFormat& video_format); | 
| 132   // When muting, produce black frames then pause the camera. |  | 
| 133   // When unmuting, start the camera. Camera starts unmuted. |  | 
| 134   bool MuteToBlackThenPause(VideoCapturer* video_capturer, bool muted); |  | 
| 135   bool StopVideoCapture(VideoCapturer* video_capturer, | 132   bool StopVideoCapture(VideoCapturer* video_capturer, | 
| 136                         const VideoFormat& video_format); | 133                         const VideoFormat& video_format); | 
| 137   bool RestartVideoCapture(VideoCapturer* video_capturer, | 134   bool RestartVideoCapture(VideoCapturer* video_capturer, | 
| 138                            const VideoFormat& previous_format, | 135                            const VideoFormat& previous_format, | 
| 139                            const VideoFormat& desired_format, | 136                            const VideoFormat& desired_format, | 
| 140                            CaptureManager::RestartOptions options); | 137                            CaptureManager::RestartOptions options); | 
| 141 | 138 | 
| 142   virtual void AddVideoSink(VideoCapturer* video_capturer, | 139   virtual void AddVideoSink(VideoCapturer* video_capturer, | 
| 143                             rtc::VideoSinkInterface<VideoFrame>* sink); | 140                             rtc::VideoSinkInterface<VideoFrame>* sink); | 
| 144   virtual void RemoveVideoSink(VideoCapturer* video_capturer, | 141   virtual void RemoveVideoSink(VideoCapturer* video_capturer, | 
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 215 | 212 | 
| 216   int audio_output_volume_; | 213   int audio_output_volume_; | 
| 217   bool enable_rtx_; | 214   bool enable_rtx_; | 
| 218 | 215 | 
| 219   bool capturing_; | 216   bool capturing_; | 
| 220 }; | 217 }; | 
| 221 | 218 | 
| 222 }  // namespace cricket | 219 }  // namespace cricket | 
| 223 | 220 | 
| 224 #endif  // TALK_SESSION_MEDIA_CHANNELMANAGER_H_ | 221 #endif  // TALK_SESSION_MEDIA_CHANNELMANAGER_H_ | 
| OLD | NEW | 
|---|