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

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

Issue 1512853007: Remove cricket::VideoEncoderConfig. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove stale function Created 5 years 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/webrtcvideoengine2_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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 // Destroys a data channel created with the Create API. 122 // Destroys a data channel created with the Create API.
123 void DestroyDataChannel(DataChannel* data_channel); 123 void DestroyDataChannel(DataChannel* data_channel);
124 124
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 bool SetDefaultVideoEncoderConfig(const VideoEncoderConfig& config);
133 // 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
134 // 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().
135 bool SetVideoRtxEnabled(bool enable); 134 bool SetVideoRtxEnabled(bool enable);
136 135
137 // Starts/stops the local microphone and enables polling of the input level. 136 // Starts/stops the local microphone and enables polling of the input level.
138 bool capturing() const { return capturing_; } 137 bool capturing() const { return capturing_; }
139 138
140 // Gets capturer's supported formats in a thread safe manner 139 // Gets capturer's supported formats in a thread safe manner
141 std::vector<cricket::VideoFormat> GetSupportedFormats( 140 std::vector<cricket::VideoFormat> GetSupportedFormats(
142 VideoCapturer* capturer) const; 141 VideoCapturer* capturer) const;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 rtc::scoped_ptr<CaptureManager> capture_manager_; 220 rtc::scoped_ptr<CaptureManager> capture_manager_;
222 bool initialized_; 221 bool initialized_;
223 rtc::Thread* main_thread_; 222 rtc::Thread* main_thread_;
224 rtc::Thread* worker_thread_; 223 rtc::Thread* worker_thread_;
225 224
226 VoiceChannels voice_channels_; 225 VoiceChannels voice_channels_;
227 VideoChannels video_channels_; 226 VideoChannels video_channels_;
228 DataChannels data_channels_; 227 DataChannels data_channels_;
229 228
230 int audio_output_volume_; 229 int audio_output_volume_;
231 VideoEncoderConfig default_video_encoder_config_;
232 VideoRenderer* local_renderer_; 230 VideoRenderer* local_renderer_;
233 bool enable_rtx_; 231 bool enable_rtx_;
234 232
235 bool capturing_; 233 bool capturing_;
236 }; 234 };
237 235
238 } // namespace cricket 236 } // namespace cricket
239 237
240 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_ 238 #endif // TALK_SESSION_MEDIA_CHANNELMANAGER_H_
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideoengine2_unittest.cc ('k') | talk/session/media/channelmanager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698