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

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

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

Powered by Google App Engine
This is Rietveld 408576698