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

Side by Side Diff: webrtc/modules/audio_coding/acm2/rent_a_codec.cc

Issue 2337473002: Multi frequency DTMF support - receiver side (Closed)
Patch Set: rebase Created 4 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 std::map<std::string, std::string>{{"stereo", "0"}})); 92 std::map<std::string, std::string>{{"stereo", "0"}}));
93 case NetEqDecoder::kDecoderOpus_2ch: 93 case NetEqDecoder::kDecoderOpus_2ch:
94 return rtc::Optional<SdpAudioFormat>( 94 return rtc::Optional<SdpAudioFormat>(
95 SdpAudioFormat("opus", 48000, 2, 95 SdpAudioFormat("opus", 48000, 2,
96 std::map<std::string, std::string>{{"stereo", "1"}})); 96 std::map<std::string, std::string>{{"stereo", "1"}}));
97 case NetEqDecoder::kDecoderRED: 97 case NetEqDecoder::kDecoderRED:
98 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("red", 8000, 1)); 98 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("red", 8000, 1));
99 case NetEqDecoder::kDecoderAVT: 99 case NetEqDecoder::kDecoderAVT:
100 return rtc::Optional<SdpAudioFormat>( 100 return rtc::Optional<SdpAudioFormat>(
101 SdpAudioFormat("telephone-event", 8000, 1)); 101 SdpAudioFormat("telephone-event", 8000, 1));
102 case NetEqDecoder::kDecoderAVT16kHz:
103 return rtc::Optional<SdpAudioFormat>(
104 SdpAudioFormat("telephone-event", 16000, 1));
105 case NetEqDecoder::kDecoderAVT32kHz:
106 return rtc::Optional<SdpAudioFormat>(
107 SdpAudioFormat("telephone-event", 32000, 1));
108 case NetEqDecoder::kDecoderAVT48kHz:
109 return rtc::Optional<SdpAudioFormat>(
110 SdpAudioFormat("telephone-event", 48000, 1));
102 case NetEqDecoder::kDecoderCNGnb: 111 case NetEqDecoder::kDecoderCNGnb:
103 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("cn", 8000, 1)); 112 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("cn", 8000, 1));
104 case NetEqDecoder::kDecoderCNGwb: 113 case NetEqDecoder::kDecoderCNGwb:
105 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("cn", 16000, 1)); 114 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("cn", 16000, 1));
106 case NetEqDecoder::kDecoderCNGswb32kHz: 115 case NetEqDecoder::kDecoderCNGswb32kHz:
107 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("cn", 32000, 1)); 116 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("cn", 32000, 1));
108 case NetEqDecoder::kDecoderCNGswb48kHz: 117 case NetEqDecoder::kDecoderCNGswb48kHz:
109 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("cn", 48000, 1)); 118 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("cn", 48000, 1));
110 default: 119 default:
111 return rtc::Optional<SdpAudioFormat>(); 120 return rtc::Optional<SdpAudioFormat>();
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 } 380 }
372 return encoder_stack; 381 return encoder_stack;
373 } 382 }
374 383
375 std::unique_ptr<AudioDecoder> RentACodec::RentIsacDecoder(int sample_rate_hz) { 384 std::unique_ptr<AudioDecoder> RentACodec::RentIsacDecoder(int sample_rate_hz) {
376 return CreateIsacDecoder(sample_rate_hz, isac_bandwidth_info_); 385 return CreateIsacDecoder(sample_rate_hz, isac_bandwidth_info_);
377 } 386 }
378 387
379 } // namespace acm2 388 } // namespace acm2
380 } // namespace webrtc 389 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/acm2/rent_a_codec.h ('k') | webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698