2017-06-30 05:24:56 -07:00
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "api/audio_codecs/opus/audio_decoder_opus.h"
|
2017-06-30 05:24:56 -07:00
|
|
|
|
|
|
|
|
#include <memory>
|
|
|
|
|
#include <utility>
|
|
|
|
|
#include <vector>
|
|
|
|
|
|
Use absl::make_unique and absl::WrapUnique directly
Instead of going through our wrappers in ptr_util.h.
This CL was generated by the following script:
git grep -l ptr_util | xargs perl -pi -e 's,#include "rtc_base/ptr_util.h",#include "absl/memory/memory.h",'
git grep -l MakeUnique | xargs perl -pi -e 's,\b(rtc::)?MakeUnique\b,absl::make_unique,g'
git grep -l WrapUnique | xargs perl -pi -e 's,\b(rtc::)?WrapUnique\b,absl::WrapUnique,g'
git checkout -- rtc_base/ptr_util{.h,_unittest.cc}
git cl format
Followed by manually adding dependencies on
//third_party/abseil-cpp/absl/memory until `gn check` stopped
complaining.
Bug: webrtc:9473
Change-Id: I89ccd363f070479b8c431eb2c3d404a46eaacc1c
Reviewed-on: https://webrtc-review.googlesource.com/86600
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23850}
2018-07-05 11:40:33 +02:00
|
|
|
#include "absl/memory/memory.h"
|
2018-10-22 09:48:08 +02:00
|
|
|
#include "absl/strings/match.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "modules/audio_coding/codecs/opus/audio_decoder_opus.h"
|
2017-06-30 05:24:56 -07:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
|
|
|
|
|
2018-06-21 13:32:56 +02:00
|
|
|
absl::optional<AudioDecoderOpus::Config> AudioDecoderOpus::SdpToConfig(
|
2017-06-30 05:24:56 -07:00
|
|
|
const SdpAudioFormat& format) {
|
2018-06-21 13:32:56 +02:00
|
|
|
const auto num_channels = [&]() -> absl::optional<int> {
|
2017-06-30 05:24:56 -07:00
|
|
|
auto stereo = format.parameters.find("stereo");
|
|
|
|
|
if (stereo != format.parameters.end()) {
|
|
|
|
|
if (stereo->second == "0") {
|
2017-11-16 10:52:34 +01:00
|
|
|
return 1;
|
2017-06-30 05:24:56 -07:00
|
|
|
} else if (stereo->second == "1") {
|
2017-11-16 10:52:34 +01:00
|
|
|
return 2;
|
2017-06-30 05:24:56 -07:00
|
|
|
} else {
|
2018-06-21 13:32:56 +02:00
|
|
|
return absl::nullopt; // Bad stereo parameter.
|
2017-06-30 05:24:56 -07:00
|
|
|
}
|
|
|
|
|
}
|
2017-11-16 10:52:34 +01:00
|
|
|
return 1; // Default to mono.
|
2017-06-30 05:24:56 -07:00
|
|
|
}();
|
2018-10-22 09:48:08 +02:00
|
|
|
if (absl::EqualsIgnoreCase(format.name, "opus") &&
|
2017-06-30 05:24:56 -07:00
|
|
|
format.clockrate_hz == 48000 && format.num_channels == 2 &&
|
|
|
|
|
num_channels) {
|
2017-11-16 10:52:34 +01:00
|
|
|
return Config{*num_channels};
|
2017-06-30 05:24:56 -07:00
|
|
|
} else {
|
2018-06-21 13:32:56 +02:00
|
|
|
return absl::nullopt;
|
2017-06-30 05:24:56 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void AudioDecoderOpus::AppendSupportedDecoders(
|
|
|
|
|
std::vector<AudioCodecSpec>* specs) {
|
|
|
|
|
AudioCodecInfo opus_info{48000, 1, 64000, 6000, 510000};
|
|
|
|
|
opus_info.allow_comfort_noise = false;
|
|
|
|
|
opus_info.supports_network_adaption = true;
|
|
|
|
|
SdpAudioFormat opus_format(
|
|
|
|
|
{"opus", 48000, 2, {{"minptime", "10"}, {"useinbandfec", "1"}}});
|
2019-01-31 21:38:12 +01:00
|
|
|
specs->push_back({std::move(opus_format), opus_info});
|
2017-06-30 05:24:56 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
std::unique_ptr<AudioDecoder> AudioDecoderOpus::MakeAudioDecoder(
|
2018-03-01 15:13:27 +01:00
|
|
|
Config config,
|
2018-06-21 13:32:56 +02:00
|
|
|
absl::optional<AudioCodecPairId> /*codec_pair_id*/) {
|
Use absl::make_unique and absl::WrapUnique directly
Instead of going through our wrappers in ptr_util.h.
This CL was generated by the following script:
git grep -l ptr_util | xargs perl -pi -e 's,#include "rtc_base/ptr_util.h",#include "absl/memory/memory.h",'
git grep -l MakeUnique | xargs perl -pi -e 's,\b(rtc::)?MakeUnique\b,absl::make_unique,g'
git grep -l WrapUnique | xargs perl -pi -e 's,\b(rtc::)?WrapUnique\b,absl::WrapUnique,g'
git checkout -- rtc_base/ptr_util{.h,_unittest.cc}
git cl format
Followed by manually adding dependencies on
//third_party/abseil-cpp/absl/memory until `gn check` stopped
complaining.
Bug: webrtc:9473
Change-Id: I89ccd363f070479b8c431eb2c3d404a46eaacc1c
Reviewed-on: https://webrtc-review.googlesource.com/86600
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23850}
2018-07-05 11:40:33 +02:00
|
|
|
return absl::make_unique<AudioDecoderOpusImpl>(config.num_channels);
|
2017-06-30 05:24:56 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace webrtc
|