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

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

Issue 1322973004: Fold AudioEncoderMutable into AudioEncoder (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: review fixes 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 29 matching lines...) Expand all
40 ~AudioCodingModuleImpl() override; 40 ~AudioCodingModuleImpl() override;
41 41
42 ///////////////////////////////////////// 42 /////////////////////////////////////////
43 // Sender 43 // Sender
44 // 44 //
45 45
46 // Can be called multiple times for Codec, CNG, RED. 46 // Can be called multiple times for Codec, CNG, RED.
47 int RegisterSendCodec(const CodecInst& send_codec) override; 47 int RegisterSendCodec(const CodecInst& send_codec) override;
48 48
49 void RegisterExternalSendCodec( 49 void RegisterExternalSendCodec(
50 AudioEncoderMutable* external_speech_encoder) override; 50 AudioEncoder* external_speech_encoder) override;
51 51
52 // Get current send codec. 52 // Get current send codec.
53 int SendCodec(CodecInst* current_codec) const override; 53 int SendCodec(CodecInst* current_codec) const override;
54 54
55 // Get current send frequency. 55 // Get current send frequency.
56 int SendFrequency() const override; 56 int SendFrequency() const override;
57 57
58 // Sets the bitrate to the specified value in bits/sec. In case the codec does 58 // Sets the bitrate to the specified value in bits/sec. In case the codec does
59 // not support the requested value it will choose an appropriate value 59 // not support the requested value it will choose an appropriate value
60 // instead. 60 // instead.
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 int playout_frequency_hz_; 371 int playout_frequency_hz_;
372 // TODO(henrik.lundin): All members below this line are temporary and should 372 // TODO(henrik.lundin): All members below this line are temporary and should
373 // be removed after refactoring is completed. 373 // be removed after refactoring is completed.
374 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_; 374 rtc::scoped_ptr<acm2::AudioCodingModuleImpl> acm_old_;
375 CodecInst current_send_codec_; 375 CodecInst current_send_codec_;
376 }; 376 };
377 377
378 } // namespace webrtc 378 } // namespace webrtc
379 379
380 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ 380 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698