OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2017 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 |
11 #include "webrtc/api/audio_codecs/g722/audio_encoder_g722.h" | 11 #include "webrtc/api/audio_codecs/g722/audio_encoder_g722.h" |
12 | 12 |
13 #include <memory> | 13 #include <memory> |
14 #include <vector> | 14 #include <vector> |
15 | 15 |
| 16 #include "webrtc/common_types.h" |
16 #include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h" | 17 #include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h" |
17 #include "webrtc/rtc_base/ptr_util.h" | 18 #include "webrtc/rtc_base/ptr_util.h" |
18 #include "webrtc/rtc_base/safe_conversions.h" | 19 #include "webrtc/rtc_base/safe_conversions.h" |
| 20 #include "webrtc/rtc_base/safe_minmax.h" |
| 21 #include "webrtc/rtc_base/string_to_number.h" |
19 | 22 |
20 namespace webrtc { | 23 namespace webrtc { |
21 | 24 |
22 rtc::Optional<AudioEncoderG722Config> AudioEncoderG722::SdpToConfig( | 25 rtc::Optional<AudioEncoderG722Config> AudioEncoderG722::SdpToConfig( |
23 const SdpAudioFormat& format) { | 26 const SdpAudioFormat& format) { |
24 return AudioEncoderG722Impl::SdpToConfig(format); | 27 if (STR_CASE_CMP(format.name.c_str(), "g722") != 0 || |
| 28 format.clockrate_hz != 8000) { |
| 29 return rtc::Optional<AudioEncoderG722Config>(); |
| 30 } |
| 31 |
| 32 AudioEncoderG722Config config; |
| 33 config.num_channels = rtc::checked_cast<int>(format.num_channels); |
| 34 auto ptime_iter = format.parameters.find("ptime"); |
| 35 if (ptime_iter != format.parameters.end()) { |
| 36 auto ptime = rtc::StringToNumber<int>(ptime_iter->second); |
| 37 if (ptime && *ptime > 0) { |
| 38 const int whole_packets = *ptime / 10; |
| 39 config.frame_size_ms = rtc::SafeClamp<int>(whole_packets * 10, 10, 60); |
| 40 } |
| 41 } |
| 42 return config.IsOk() ? rtc::Optional<AudioEncoderG722Config>(config) |
| 43 : rtc::Optional<AudioEncoderG722Config>(); |
25 } | 44 } |
26 | 45 |
27 void AudioEncoderG722::AppendSupportedEncoders( | 46 void AudioEncoderG722::AppendSupportedEncoders( |
28 std::vector<AudioCodecSpec>* specs) { | 47 std::vector<AudioCodecSpec>* specs) { |
29 const SdpAudioFormat fmt = {"g722", 8000, 1}; | 48 const SdpAudioFormat fmt = {"g722", 8000, 1}; |
30 const AudioCodecInfo info = QueryAudioEncoder(*SdpToConfig(fmt)); | 49 const AudioCodecInfo info = QueryAudioEncoder(*SdpToConfig(fmt)); |
31 specs->push_back({fmt, info}); | 50 specs->push_back({fmt, info}); |
32 } | 51 } |
33 | 52 |
34 AudioCodecInfo AudioEncoderG722::QueryAudioEncoder( | 53 AudioCodecInfo AudioEncoderG722::QueryAudioEncoder( |
35 const AudioEncoderG722Config& config) { | 54 const AudioEncoderG722Config& config) { |
36 RTC_DCHECK(config.IsOk()); | 55 RTC_DCHECK(config.IsOk()); |
37 return {16000, rtc::dchecked_cast<size_t>(config.num_channels), | 56 return {16000, rtc::dchecked_cast<size_t>(config.num_channels), |
38 64000 * config.num_channels}; | 57 64000 * config.num_channels}; |
39 } | 58 } |
40 | 59 |
41 std::unique_ptr<AudioEncoder> AudioEncoderG722::MakeAudioEncoder( | 60 std::unique_ptr<AudioEncoder> AudioEncoderG722::MakeAudioEncoder( |
42 const AudioEncoderG722Config& config, | 61 const AudioEncoderG722Config& config, |
43 int payload_type) { | 62 int payload_type) { |
44 RTC_DCHECK(config.IsOk()); | 63 RTC_DCHECK(config.IsOk()); |
45 return rtc::MakeUnique<AudioEncoderG722Impl>(config, payload_type); | 64 return rtc::MakeUnique<AudioEncoderG722Impl>(config, payload_type); |
46 } | 65 } |
47 | 66 |
48 } // namespace webrtc | 67 } // namespace webrtc |
OLD | NEW |