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

Side by Side Diff: webrtc/voice_engine/channel.h

Issue 2516993002: Pass SdpAudioFormat through Channel, without converting to CodecInst (Closed)
Patch Set: rebase Created 4 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
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 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 int32_t DeRegisterVoiceEngineObserver(); 190 int32_t DeRegisterVoiceEngineObserver();
191 191
192 // VoECodec 192 // VoECodec
193 int32_t GetSendCodec(CodecInst& codec); 193 int32_t GetSendCodec(CodecInst& codec);
194 int32_t GetRecCodec(CodecInst& codec); 194 int32_t GetRecCodec(CodecInst& codec);
195 int32_t SetSendCodec(const CodecInst& codec); 195 int32_t SetSendCodec(const CodecInst& codec);
196 void SetBitRate(int bitrate_bps, int64_t probing_interval_ms); 196 void SetBitRate(int bitrate_bps, int64_t probing_interval_ms);
197 int32_t SetVADStatus(bool enableVAD, ACMVADMode mode, bool disableDTX); 197 int32_t SetVADStatus(bool enableVAD, ACMVADMode mode, bool disableDTX);
198 int32_t GetVADStatus(bool& enabledVAD, ACMVADMode& mode, bool& disabledDTX); 198 int32_t GetVADStatus(bool& enabledVAD, ACMVADMode& mode, bool& disabledDTX);
199 int32_t SetRecPayloadType(const CodecInst& codec); 199 int32_t SetRecPayloadType(const CodecInst& codec);
200 int32_t SetRecPayloadType(int payload_type, const SdpAudioFormat& format);
200 int32_t GetRecPayloadType(CodecInst& codec); 201 int32_t GetRecPayloadType(CodecInst& codec);
201 int32_t SetSendCNPayloadType(int type, PayloadFrequencies frequency); 202 int32_t SetSendCNPayloadType(int type, PayloadFrequencies frequency);
202 int SetOpusMaxPlaybackRate(int frequency_hz); 203 int SetOpusMaxPlaybackRate(int frequency_hz);
203 int SetOpusDtx(bool enable_dtx); 204 int SetOpusDtx(bool enable_dtx);
204 int GetOpusDtx(bool* enabled); 205 int GetOpusDtx(bool* enabled);
205 bool EnableAudioNetworkAdaptor(const std::string& config_string); 206 bool EnableAudioNetworkAdaptor(const std::string& config_string);
206 void DisableAudioNetworkAdaptor(); 207 void DisableAudioNetworkAdaptor();
207 void SetReceiverFrameLengthRange(int min_frame_length_ms, 208 void SetReceiverFrameLengthRange(int min_frame_length_ms,
208 int max_frame_length_ms); 209 int max_frame_length_ms);
209 210
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed. 549 // TODO(ossu): Remove once GetAudioDecoderFactory() is no longer needed.
549 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_; 550 rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
550 551
551 SmoothingFilterImpl bitrate_smoother_; 552 SmoothingFilterImpl bitrate_smoother_;
552 }; 553 };
553 554
554 } // namespace voe 555 } // namespace voe
555 } // namespace webrtc 556 } // namespace webrtc
556 557
557 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_ 558 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698