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

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

Issue 1406123011: Let AudioCodingModule::SendCodec return Maybe<CodecInst> (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: review fix Created 5 years, 1 month 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 30 matching lines...) Expand all
41 // Sender 41 // Sender
42 // 42 //
43 43
44 // Can be called multiple times for Codec, CNG, RED. 44 // Can be called multiple times for Codec, CNG, RED.
45 int RegisterSendCodec(const CodecInst& send_codec) override; 45 int RegisterSendCodec(const CodecInst& send_codec) override;
46 46
47 void RegisterExternalSendCodec( 47 void RegisterExternalSendCodec(
48 AudioEncoder* external_speech_encoder) override; 48 AudioEncoder* external_speech_encoder) override;
49 49
50 // Get current send codec. 50 // Get current send codec.
51 int SendCodec(CodecInst* current_codec) const override; 51 rtc::Maybe<CodecInst> SendCodec() const override;
52 52
53 // Get current send frequency. 53 // Get current send frequency.
54 int SendFrequency() const override; 54 int SendFrequency() const override;
55 55
56 // Sets the bitrate to the specified value in bits/sec. In case the codec does 56 // Sets the bitrate to the specified value in bits/sec. In case the codec does
57 // not support the requested value it will choose an appropriate value 57 // not support the requested value it will choose an appropriate value
58 // instead. 58 // instead.
59 void SetBitRate(int bitrate_bps) override; 59 void SetBitRate(int bitrate_bps) override;
60 60
61 // Register a transport callback which will be 61 // Register a transport callback which will be
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 const rtc::scoped_ptr<CriticalSectionWrapper> callback_crit_sect_; 272 const rtc::scoped_ptr<CriticalSectionWrapper> callback_crit_sect_;
273 AudioPacketizationCallback* packetization_callback_ 273 AudioPacketizationCallback* packetization_callback_
274 GUARDED_BY(callback_crit_sect_); 274 GUARDED_BY(callback_crit_sect_);
275 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_); 275 ACMVADCallback* vad_callback_ GUARDED_BY(callback_crit_sect_);
276 }; 276 };
277 277
278 } // namespace acm2 278 } // namespace acm2
279 } // namespace webrtc 279 } // namespace webrtc
280 280
281 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_ 281 #endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_AUDIO_CODING_MODULE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698