From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- third_party/libwebrtc/api/audio_codecs/audio_format.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'third_party/libwebrtc/api/audio_codecs/audio_format.h') diff --git a/third_party/libwebrtc/api/audio_codecs/audio_format.h b/third_party/libwebrtc/api/audio_codecs/audio_format.h index 0cf67799b8..edccc17e7d 100644 --- a/third_party/libwebrtc/api/audio_codecs/audio_format.h +++ b/third_party/libwebrtc/api/audio_codecs/audio_format.h @@ -17,6 +17,7 @@ #include #include "absl/strings/string_view.h" +#include "api/rtp_parameters.h" #include "rtc_base/checks.h" #include "rtc_base/system/rtc_export.h" @@ -24,7 +25,8 @@ namespace webrtc { // SDP specification for a single audio codec. struct RTC_EXPORT SdpAudioFormat { - using Parameters = std::map; + using Parameters [[deprecated(("Use webrtc::CodecParameterMap"))]] = + std::map; SdpAudioFormat(const SdpAudioFormat&); SdpAudioFormat(SdpAudioFormat&&); @@ -32,11 +34,11 @@ struct RTC_EXPORT SdpAudioFormat { SdpAudioFormat(absl::string_view name, int clockrate_hz, size_t num_channels, - const Parameters& param); + const CodecParameterMap& param); SdpAudioFormat(absl::string_view name, int clockrate_hz, size_t num_channels, - Parameters&& param); + CodecParameterMap&& param); ~SdpAudioFormat(); // Returns true if this format is compatible with `o`. In SDP terminology: @@ -55,7 +57,7 @@ struct RTC_EXPORT SdpAudioFormat { std::string name; int clockrate_hz; size_t num_channels; - Parameters parameters; + CodecParameterMap parameters; }; // Information about how an audio format is treated by the codec implementation. -- cgit v1.2.3