zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adopt absl::string_view in modules/audio_coding/

Browse Source 
Bug: webrtc:13579
Change-Id: Ifec66fb6ba9724d18539de7245a358c2d13c7939
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/268547
Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Ali Tofigh <alito@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37573}
This commit is contained in:
Ali Tofigh
2022-07-20 12:53:07 +02:00
committed by WebRTC LUCI CQ
parent 761072f68e
commit 714e3cbb48
63 changed files with 234 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/audio_coding/codecs/builtin_audio_decoder_factory_unittest.cc
View File

@ -178,7 +178,7 @@ TEST(AudioDecoderFactoryTest, CreateOpus) {
for (int hz : {8000, 16000, 32000, 48000}) {
for (int channels : {0, 1, 2, 3}) {
for (std::string stereo : {"XX", "0", "1", "2"}) {
std::map<std::string, std::string> params;
SdpAudioFormat::Parameters params;
if (stereo != "XX") {
params["stereo"] = stereo;
}

8
modules/audio_coding/codecs/opus/audio_coder_opus_common.cc
View File

@ -10,11 +10,13 @@
#include "modules/audio_coding/codecs/opus/audio_coder_opus_common.h"
#include "absl/strings/string_view.h"
namespace webrtc {
absl::optional<std::string> GetFormatParameter(const SdpAudioFormat& format,
const std::string& param) {
auto it = format.parameters.find(param);
absl::string_view param) {
auto it = format.parameters.find(std::string(param));
if (it == format.parameters.end())
return absl::nullopt;
@ -25,7 +27,7 @@ absl::optional<std::string> GetFormatParameter(const SdpAudioFormat& format,
template <>
absl::optional<std::vector<unsigned char>> GetFormatParameter(
const SdpAudioFormat& format,
const std::string& param) {
absl::string_view param) {
std::vector<unsigned char> result;
const std::string comma_separated_list =
GetFormatParameter(format, param).value_or("");

7
modules/audio_coding/codecs/opus/audio_coder_opus_common.h
View File

@ -15,6 +15,7 @@
#include <utility>
#include <vector>
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "api/audio_codecs/audio_decoder.h"
#include "api/audio_codecs/audio_format.h"
@ -23,18 +24,18 @@
namespace webrtc {
absl::optional<std::string> GetFormatParameter(const SdpAudioFormat& format,
const std::string& param);
absl::string_view param);
template <typename T>
absl::optional<T> GetFormatParameter(const SdpAudioFormat& format,
const std::string& param) {
absl::string_view param) {
return rtc::StringToNumber<T>(GetFormatParameter(format, param).value_or(""));
}
template <>
absl::optional<std::vector<unsigned char>> GetFormatParameter(
const SdpAudioFormat& format,
const std::string& param);
absl::string_view param);
class OpusFrame : public AudioDecoder::EncodedAudioFrame {
public:

5
modules/audio_coding/codecs/opus/audio_encoder_opus.cc
View File

@ -17,6 +17,7 @@
#include <utility>
#include "absl/strings/match.h"
#include "absl/strings/string_view.h"
#include "modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h"
#include "modules/audio_coding/audio_network_adaptor/controller_manager.h"
#include "modules/audio_coding/codecs/opus/audio_coder_opus_common.h"
@ -349,7 +350,7 @@ AudioEncoderOpusImpl::AudioEncoderOpusImpl(const AudioEncoderOpusConfig& config,
: AudioEncoderOpusImpl(
config,
payload_type,
[this](const std::string& config_string, RtcEventLog* event_log) {
[this](absl::string_view config_string, RtcEventLog* event_log) {
return DefaultAudioNetworkAdaptorCreator(config_string, event_log);
},
// We choose 5sec as initial time constant due to empirical data.
@ -777,7 +778,7 @@ void AudioEncoderOpusImpl::ApplyAudioNetworkAdaptor() {
std::unique_ptr<AudioNetworkAdaptor>
AudioEncoderOpusImpl::DefaultAudioNetworkAdaptorCreator(
const std::string& config_string,
absl::string_view config_string,
RtcEventLog* event_log) const {
AudioNetworkAdaptorImpl::Config config;
config.event_log = event_log;

5
modules/audio_coding/codecs/opus/audio_encoder_opus.h
View File

@ -16,6 +16,7 @@
#include <string>
#include <vector>
#include "absl/strings/string_view.h"
#include "absl/types/optional.h"
#include "api/audio_codecs/audio_encoder.h"
#include "api/audio_codecs/audio_format.h"
@ -45,7 +46,7 @@ class AudioEncoderOpusImpl final : public AudioEncoder {
OpusEncInst* inst);
using AudioNetworkAdaptorCreator =
std::function<std::unique_ptr<AudioNetworkAdaptor>(const std::string&,
std::function<std::unique_ptr<AudioNetworkAdaptor>(absl::string_view,
RtcEventLog*)>;
AudioEncoderOpusImpl(const AudioEncoderOpusConfig& config, int payload_type);
@ -146,7 +147,7 @@ class AudioEncoderOpusImpl final : public AudioEncoder {
void ApplyAudioNetworkAdaptor();
std::unique_ptr<AudioNetworkAdaptor> DefaultAudioNetworkAdaptorCreator(
const std::string& config_string,
absl::string_view config_string,
RtcEventLog* event_log) const;
void MaybeUpdateUplinkBandwidth();

3
modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
View File

@ -14,6 +14,7 @@
#include <memory>
#include <utility>
#include "absl/strings/string_view.h"
#include "common_audio/mocks/mock_smoothing_filter.h"
#include "modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h"
#include "modules/audio_coding/codecs/opus/audio_encoder_opus.h"
@ -61,7 +62,7 @@ std::unique_ptr<AudioEncoderOpusStates> CreateCodec(int sample_rate_hz,
MockAudioNetworkAdaptor** mock_ptr = &states->mock_audio_network_adaptor;
AudioEncoderOpusImpl::AudioNetworkAdaptorCreator creator =
[mock_ptr](const std::string&, RtcEventLog* event_log) {
[mock_ptr](absl::string_view, RtcEventLog* event_log) {
std::unique_ptr<MockAudioNetworkAdaptor> adaptor(
new NiceMock<MockAudioNetworkAdaptor>());
EXPECT_CALL(*adaptor, Die());

1
modules/audio_coding/codecs/red/audio_encoder_copy_red.cc
View File

@ -15,6 +15,7 @@
#include <utility>
#include <vector>
#include "absl/strings/string_view.h"
#include "rtc_base/byte_order.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"