From 54dec3f3d7c892e92a9675cb0315ac150ff76543 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Tue, 2 Apr 2024 17:20:26 +0200 Subject: [PATCH] Delete deprecated variants for parsing/building AudioLevelExtension MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:15788 Change-Id: I37034b9b1daf7b26dd5e66156e71c63e2fb85b21 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/345520 Auto-Submit: Danil Chapovalov Commit-Queue: Åsa Persson Reviewed-by: Åsa Persson Cr-Commit-Position: refs/heads/main@{#42152} --- .../rtp_rtcp/source/rtp_header_extensions.cc | 17 ----------------- modules/rtp_rtcp/source/rtp_header_extensions.h | 12 ------------ 2 files changed, 29 deletions(-) diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.cc b/modules/rtp_rtcp/source/rtp_header_extensions.cc index b77c293d6e..43770a728a 100644 --- a/modules/rtp_rtcp/source/rtp_header_extensions.cc +++ b/modules/rtp_rtcp/source/rtp_header_extensions.cc @@ -181,23 +181,6 @@ bool AudioLevelExtension::Write(rtc::ArrayView data, return true; } -bool AudioLevelExtension::Parse(rtc::ArrayView data, - bool* voice_activity, - uint8_t* audio_level) { - AudioLevel extension; - Parse(data, &extension); - *voice_activity = extension.voice_activity(); - *audio_level = extension.level(); - return true; -} - -bool AudioLevelExtension::Write(rtc::ArrayView data, - bool voice_activity, - uint8_t audio_level) { - AudioLevel extension(voice_activity, audio_level); - return Write(data, extension); -} - // An RTP Header Extension for Mixer-to-Client Audio Level Indication // // https://tools.ietf.org/html/rfc6465 diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.h b/modules/rtp_rtcp/source/rtp_header_extensions.h index 941b79a536..23a0aec558 100644 --- a/modules/rtp_rtcp/source/rtp_header_extensions.h +++ b/modules/rtp_rtcp/source/rtp_header_extensions.h @@ -96,18 +96,6 @@ class AudioLevelExtension { return kValueSizeBytes; } static bool Write(rtc::ArrayView data, const AudioLevel& extension); - - [[deprecated("Use AudioLevel struct")]] static bool Parse( - rtc::ArrayView data, - bool* voice_activity, - uint8_t* audio_level); - [[deprecated("Use AudioLevel struct")]] static size_t ValueSize( - bool voice_activity, - uint8_t audio_level) { - return kValueSizeBytes; - } - [[deprecated("Use AudioLevel struct")]] static bool - Write(rtc::ArrayView data, bool voice_activity, uint8_t audio_level); }; class CsrcAudioLevel {