| OLD | NEW |
| 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 return rtc::ArrayView<const CodecInst>(ACMCodecDB::database_, | 54 return rtc::ArrayView<const CodecInst>(ACMCodecDB::database_, |
| 55 NumberOfCodecs()); | 55 NumberOfCodecs()); |
| 56 } | 56 } |
| 57 | 57 |
| 58 rtc::Maybe<NetEqDecoder> RentACodec::NetEqDecoderFromCodecId(CodecId codec_id, | 58 rtc::Maybe<NetEqDecoder> RentACodec::NetEqDecoderFromCodecId(CodecId codec_id, |
| 59 int num_channels) { | 59 int num_channels) { |
| 60 rtc::Maybe<int> i = CodecIndexFromId(codec_id); | 60 rtc::Maybe<int> i = CodecIndexFromId(codec_id); |
| 61 if (!i) | 61 if (!i) |
| 62 return rtc::Maybe<NetEqDecoder>(); | 62 return rtc::Maybe<NetEqDecoder>(); |
| 63 const NetEqDecoder ned = ACMCodecDB::neteq_decoders_[*i]; | 63 const NetEqDecoder ned = ACMCodecDB::neteq_decoders_[*i]; |
| 64 return (ned == NetEqDecoder::kDecoderOpus && num_channels == 2) | 64 return rtc::Maybe<NetEqDecoder>( |
| 65 ? NetEqDecoder::kDecoderOpus_2ch | 65 (ned == NetEqDecoder::kDecoderOpus && num_channels == 2) |
| 66 : ned; | 66 ? NetEqDecoder::kDecoderOpus_2ch |
| 67 : ned); |
| 67 } | 68 } |
| 68 | 69 |
| 69 } // namespace acm2 | 70 } // namespace acm2 |
| 70 } // namespace webrtc | 71 } // namespace webrtc |
| OLD | NEW |