| OLD | NEW |
| 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 // Indicates whether any channels exist. | 125 // Indicates whether any channels exist. |
| 126 bool has_channels() const { | 126 bool has_channels() const { |
| 127 return (!voice_channels_.empty() || !video_channels_.empty()); | 127 return (!voice_channels_.empty() || !video_channels_.empty()); |
| 128 } | 128 } |
| 129 | 129 |
| 130 bool GetOutputVolume(int* level); | 130 bool GetOutputVolume(int* level); |
| 131 bool SetOutputVolume(int level); | 131 bool SetOutputVolume(int level); |
| 132 // RTX will be enabled/disabled in engines that support it. The supporting | 132 // RTX will be enabled/disabled in engines that support it. The supporting |
| 133 // engines will start offering an RTX codec. Must be called before Init(). | 133 // engines will start offering an RTX codec. Must be called before Init(). |
| 134 bool SetVideoRtxEnabled(bool enable); | 134 bool SetVideoRtxEnabled(bool enable); |
| 135 bool SetEnableGcmCryptoSuites(bool enable); |
| 135 | 136 |
| 136 // Starts/stops the local microphone and enables polling of the input level. | 137 // Starts/stops the local microphone and enables polling of the input level. |
| 137 bool capturing() const { return capturing_; } | 138 bool capturing() const { return capturing_; } |
| 138 | 139 |
| 139 // Gets capturer's supported formats in a thread safe manner | 140 // Gets capturer's supported formats in a thread safe manner |
| 140 std::vector<cricket::VideoFormat> GetSupportedFormats( | 141 std::vector<cricket::VideoFormat> GetSupportedFormats( |
| 141 VideoCapturer* capturer) const; | 142 VideoCapturer* capturer) const; |
| 142 // The following are done in the new "CaptureManager" style that | 143 // The following are done in the new "CaptureManager" style that |
| 143 // all local video capturers, processors, and managers should move to. | 144 // all local video capturers, processors, and managers should move to. |
| 144 // TODO(pthatcher): Make methods nicer by having start return a handle that | 145 // TODO(pthatcher): Make methods nicer by having start return a handle that |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 rtc::Thread* main_thread_; | 223 rtc::Thread* main_thread_; |
| 223 rtc::Thread* worker_thread_; | 224 rtc::Thread* worker_thread_; |
| 224 | 225 |
| 225 VoiceChannels voice_channels_; | 226 VoiceChannels voice_channels_; |
| 226 VideoChannels video_channels_; | 227 VideoChannels video_channels_; |
| 227 DataChannels data_channels_; | 228 DataChannels data_channels_; |
| 228 | 229 |
| 229 int audio_output_volume_; | 230 int audio_output_volume_; |
| 230 VideoRenderer* local_renderer_; | 231 VideoRenderer* local_renderer_; |
| 231 bool enable_rtx_; | 232 bool enable_rtx_; |
| 233 bool enable_gcm_crypto_suites_; |
| 232 | 234 |
| 233 bool capturing_; | 235 bool capturing_; |
| 234 }; | 236 }; |
| 235 | 237 |
| 236 } // namespace cricket | 238 } // namespace cricket |
| 237 | 239 |
| 238 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_ | 240 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_ |
| OLD | NEW |