From 24744a9b5e549180e581ff809605adb086c18b5f Mon Sep 17 00:00:00 2001 From: Karl Wiberg Date: Wed, 15 Aug 2018 15:23:08 +0200 Subject: [PATCH] Use string_view instead of overloading for const string& and const char* Bug: none Change-Id: Ia9e194cfcc2b6489d5d7c84baace67ad423111c2 Reviewed-on: https://webrtc-review.googlesource.com/85982 Reviewed-by: Mirko Bonadei Commit-Queue: Karl Wiberg Cr-Commit-Position: refs/heads/master@{#24338} --- DEPS | 1 + api/audio_codecs/BUILD.gn | 1 + api/audio_codecs/audio_format.cc | 18 ++---------------- api/audio_codecs/audio_format.h | 12 +++--------- 4 files changed, 7 insertions(+), 25 deletions(-) diff --git a/DEPS b/DEPS index 2d81a24dba..8cf06aa70e 100644 --- a/DEPS +++ b/DEPS @@ -1046,6 +1046,7 @@ include_rules = [ # Abseil whitelist. "+absl/container/inlined_vector.h", "+absl/memory/memory.h", + "+absl/strings/string_view.h", "+absl/types/optional.h", "+absl/types/variant.h", ] diff --git a/api/audio_codecs/BUILD.gn b/api/audio_codecs/BUILD.gn index 8e6a0f3522..a7060a229a 100644 --- a/api/audio_codecs/BUILD.gn +++ b/api/audio_codecs/BUILD.gn @@ -35,6 +35,7 @@ rtc_source_set("audio_codecs_api") { "../../rtc_base:deprecation", "../../rtc_base:rtc_base_approved", "../../rtc_base:sanitizer", + "//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/types:optional", ] } diff --git a/api/audio_codecs/audio_format.cc b/api/audio_codecs/audio_format.cc index 9db5ce01dc..81ed299ddb 100644 --- a/api/audio_codecs/audio_format.cc +++ b/api/audio_codecs/audio_format.cc @@ -17,26 +17,12 @@ namespace webrtc { SdpAudioFormat::SdpAudioFormat(const SdpAudioFormat&) = default; SdpAudioFormat::SdpAudioFormat(SdpAudioFormat&&) = default; -SdpAudioFormat::SdpAudioFormat(const char* name, +SdpAudioFormat::SdpAudioFormat(absl::string_view name, int clockrate_hz, size_t num_channels) : name(name), clockrate_hz(clockrate_hz), num_channels(num_channels) {} -SdpAudioFormat::SdpAudioFormat(const std::string& name, - int clockrate_hz, - size_t num_channels) - : name(name), clockrate_hz(clockrate_hz), num_channels(num_channels) {} - -SdpAudioFormat::SdpAudioFormat(const char* name, - int clockrate_hz, - size_t num_channels, - const Parameters& param) - : name(name), - clockrate_hz(clockrate_hz), - num_channels(num_channels), - parameters(param) {} - -SdpAudioFormat::SdpAudioFormat(const std::string& name, +SdpAudioFormat::SdpAudioFormat(absl::string_view name, int clockrate_hz, size_t num_channels, const Parameters& param) diff --git a/api/audio_codecs/audio_format.h b/api/audio_codecs/audio_format.h index d132067d09..aa5dbb13b6 100644 --- a/api/audio_codecs/audio_format.h +++ b/api/audio_codecs/audio_format.h @@ -15,6 +15,7 @@ #include #include +#include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "rtc_base/checks.h" @@ -27,15 +28,8 @@ struct SdpAudioFormat { SdpAudioFormat(const SdpAudioFormat&); SdpAudioFormat(SdpAudioFormat&&); - SdpAudioFormat(const char* name, int clockrate_hz, size_t num_channels); - SdpAudioFormat(const std::string& name, - int clockrate_hz, - size_t num_channels); - SdpAudioFormat(const char* name, - int clockrate_hz, - size_t num_channels, - const Parameters& param); - SdpAudioFormat(const std::string& name, + SdpAudioFormat(absl::string_view name, int clockrate_hz, size_t num_channels); + SdpAudioFormat(absl::string_view name, int clockrate_hz, size_t num_channels, const Parameters& param);