mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
0bc58cf876
This is a no-op change because rtc::Optional is an alias to absl::optional
This CL generated by running script with parameter 'api'
Then undo changes to optional target itself and optional_unittests
find $@ -type f \( -name \*.h -o -name \*.cc \) \
-exec sed -i 's|rtc::Optional|absl::optional|g' {} \+ \
-exec sed -i 's|rtc::nullopt|absl::nullopt|g' {} \+ \
-exec sed -i 's|#include "api/optional.h"|#include "absl/types/optional.h"|' {} \+
find $@ -type f -name BUILD.gn \
-exec sed -r -i 's|"[\./api]*:optional"|"//third_party/abseil-cpp/absl/types:optional"|' {} \+;
git cl format
Bug: webrtc:9078
Change-Id: I44093da213369d6a502e33792c694f620f53b779
Reviewed-on: https://webrtc-review.googlesource.com/84621
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23707}
62 lines
2.1 KiB
C++
62 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "api/audio_codecs/isac/audio_encoder_isac_fix.h"
|
|
|
|
#include "common_types.h" // NOLINT(build/include)
|
|
#include "modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h"
|
|
#include "rtc_base/ptr_util.h"
|
|
#include "rtc_base/string_to_number.h"
|
|
|
|
namespace webrtc {
|
|
|
|
absl::optional<AudioEncoderIsacFix::Config> AudioEncoderIsacFix::SdpToConfig(
|
|
const SdpAudioFormat& format) {
|
|
if (STR_CASE_CMP(format.name.c_str(), "ISAC") == 0 &&
|
|
format.clockrate_hz == 16000 && format.num_channels == 1) {
|
|
Config config;
|
|
const auto ptime_iter = format.parameters.find("ptime");
|
|
if (ptime_iter != format.parameters.end()) {
|
|
const auto ptime = rtc::StringToNumber<int>(ptime_iter->second);
|
|
if (ptime && *ptime >= 60) {
|
|
config.frame_size_ms = 60;
|
|
}
|
|
}
|
|
return config;
|
|
} else {
|
|
return absl::nullopt;
|
|
}
|
|
}
|
|
|
|
void AudioEncoderIsacFix::AppendSupportedEncoders(
|
|
std::vector<AudioCodecSpec>* specs) {
|
|
const SdpAudioFormat fmt = {"ISAC", 16000, 1};
|
|
const AudioCodecInfo info = QueryAudioEncoder(*SdpToConfig(fmt));
|
|
specs->push_back({fmt, info});
|
|
}
|
|
|
|
AudioCodecInfo AudioEncoderIsacFix::QueryAudioEncoder(
|
|
AudioEncoderIsacFix::Config config) {
|
|
RTC_DCHECK(config.IsOk());
|
|
return {16000, 1, 32000, 10000, 32000};
|
|
}
|
|
|
|
std::unique_ptr<AudioEncoder> AudioEncoderIsacFix::MakeAudioEncoder(
|
|
AudioEncoderIsacFix::Config config,
|
|
int payload_type,
|
|
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
|
|
RTC_DCHECK(config.IsOk());
|
|
AudioEncoderIsacFixImpl::Config c;
|
|
c.frame_size_ms = config.frame_size_ms;
|
|
c.payload_type = payload_type;
|
|
return rtc::MakeUnique<AudioEncoderIsacFixImpl>(c);
|
|
}
|
|
|
|
} // namespace webrtc
|