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

Side by Side Diff: webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h

Issue 1311533010: Remove AudioEncoder methods SetMaxBitrate and SetMaxPayloadSize (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@ifc-merge-2
Patch Set: 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 // Get 10 milliseconds of raw audio data to play out, and 178 // Get 10 milliseconds of raw audio data to play out, and
179 // automatic resample to the requested frequency if > 0. 179 // automatic resample to the requested frequency if > 0.
180 int PlayoutData10Ms(int desired_freq_hz, AudioFrame* audio_frame) override; 180 int PlayoutData10Ms(int desired_freq_hz, AudioFrame* audio_frame) override;
181 181
182 ///////////////////////////////////////// 182 /////////////////////////////////////////
183 // Statistics 183 // Statistics
184 // 184 //
185 185
186 int GetNetworkStatistics(NetworkStatistics* statistics) override; 186 int GetNetworkStatistics(NetworkStatistics* statistics) override;
187 187
188 int SetISACMaxRate(int max_bit_per_sec) override;
189
190 int SetISACMaxPayloadSize(int max_size_bytes) override;
191
192 int SetOpusApplication(OpusApplicationMode application) override; 188 int SetOpusApplication(OpusApplicationMode application) override;
193 189
194 // If current send codec is Opus, informs it about the maximum playback rate 190 // If current send codec is Opus, informs it about the maximum playback rate
195 // the receiver will render. 191 // the receiver will render.
196 int SetOpusMaxPlaybackRate(int frequency_hz) override; 192 int SetOpusMaxPlaybackRate(int frequency_hz) override;
197 193
198 int EnableOpusDtx() override; 194 int EnableOpusDtx() override;
199 195
200 int DisableOpusDtx() override; 196 int DisableOpusDtx() override;
201 197
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 int playout_frequency_hz_; 367 int playout_frequency_hz_;
372 // TODO(henrik.lundin): All members below this line are temporary and should 368 // TODO(henrik.lundin): All members below this line are temporary and should
373 // be removed after refactoring is completed. 369 // be removed after refactoring is completed.
374 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_; 370 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_;
375 CodecInst current_send_codec_; 371 CodecInst current_send_codec_;
376 }; 372 };
377 373
378 } // namespace webrtc 374 } // namespace webrtc
379 375
380 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ 376 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698