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

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

Issue 2516993002: Pass SdpAudioFormat through Channel, without converting to CodecInst (Closed)
Patch Set: add TODO Created 3 years, 11 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) 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("l16", 32000, 2)); 80 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("l16", 32000, 2));
81 case NetEqDecoder::kDecoderPCM16Bswb48kHz_2ch: 81 case NetEqDecoder::kDecoderPCM16Bswb48kHz_2ch:
82 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("l16", 48000, 2)); 82 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("l16", 48000, 2));
83 case NetEqDecoder::kDecoderPCM16B_5ch: 83 case NetEqDecoder::kDecoderPCM16B_5ch:
84 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("l16", 8000, 5)); 84 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("l16", 8000, 5));
85 case NetEqDecoder::kDecoderG722: 85 case NetEqDecoder::kDecoderG722:
86 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("g722", 8000, 1)); 86 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("g722", 8000, 1));
87 case NetEqDecoder::kDecoderG722_2ch: 87 case NetEqDecoder::kDecoderG722_2ch:
88 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("g722", 8000, 2)); 88 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("g722", 8000, 2));
89 case NetEqDecoder::kDecoderOpus: 89 case NetEqDecoder::kDecoderOpus:
90 return rtc::Optional<SdpAudioFormat>( 90 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("opus", 48000, 2));
91 SdpAudioFormat("opus", 48000, 2,
92 std::map<std::string, std::string>{{"stereo", "0"}}));
93 case NetEqDecoder::kDecoderOpus_2ch: 91 case NetEqDecoder::kDecoderOpus_2ch:
94 return rtc::Optional<SdpAudioFormat>( 92 return rtc::Optional<SdpAudioFormat>(
95 SdpAudioFormat("opus", 48000, 2, 93 SdpAudioFormat("opus", 48000, 2,
96 std::map<std::string, std::string>{{"stereo", "1"}})); 94 std::map<std::string, std::string>{{"stereo", "1"}}));
97 case NetEqDecoder::kDecoderRED: 95 case NetEqDecoder::kDecoderRED:
98 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("red", 8000, 1)); 96 return rtc::Optional<SdpAudioFormat>(SdpAudioFormat("red", 8000, 1));
99 case NetEqDecoder::kDecoderAVT: 97 case NetEqDecoder::kDecoderAVT:
100 return rtc::Optional<SdpAudioFormat>( 98 return rtc::Optional<SdpAudioFormat>(
101 SdpAudioFormat("telephone-event", 8000, 1)); 99 SdpAudioFormat("telephone-event", 8000, 1));
102 case NetEqDecoder::kDecoderAVT16kHz: 100 case NetEqDecoder::kDecoderAVT16kHz:
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 } 378 }
381 return encoder_stack; 379 return encoder_stack;
382 } 380 }
383 381
384 std::unique_ptr<AudioDecoder> RentACodec::RentIsacDecoder(int sample_rate_hz) { 382 std::unique_ptr<AudioDecoder> RentACodec::RentIsacDecoder(int sample_rate_hz) {
385 return CreateIsacDecoder(sample_rate_hz, isac_bandwidth_info_); 383 return CreateIsacDecoder(sample_rate_hz, isac_bandwidth_info_);
386 } 384 }
387 385
388 } // namespace acm2 386 } // namespace acm2
389 } // namespace webrtc 387 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698