From a341fe31d4558be85ce57857939bc52408d04075 Mon Sep 17 00:00:00 2001
From: Joachim Reiersen <joachimr@meta.com>
Date: Tue, 16 Apr 2024 14:33:29 -0700
Subject: [PATCH] Remove deprecated accessors for audio_level in
 RTPHeaderExtension

Bug: webrtc:15788
Change-Id: I0247e19edf89ed2212b93227c05136b87d56d8d3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/347760
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Joachim Reiersen <joachimr@meta.com>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42101}
---
 api/rtp_headers.cc | 21 ---------------------
 api/rtp_headers.h  | 15 +++++++--------
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/api/rtp_headers.cc b/api/rtp_headers.cc
index b45bf40e54..8813e0f4c2 100644
--- a/api/rtp_headers.cc
+++ b/api/rtp_headers.cc
@@ -27,9 +27,6 @@ RTPHeaderExtension::RTPHeaderExtension()
       absoluteSendTime(0),
       hasTransportSequenceNumber(false),
       transportSequenceNumber(0),
-      hasAudioLevel(false),
-      voiceActivity(false),
-      audioLevel(0),
       hasVideoRotation(false),
       videoRotation(kVideoRotation_0),
       hasVideoContentType(false),
@@ -42,24 +39,6 @@ RTPHeaderExtension::RTPHeaderExtension(const RTPHeaderExtension& other) =
 RTPHeaderExtension& RTPHeaderExtension::operator=(
     const RTPHeaderExtension& other) = default;
 
-absl::optional<AudioLevel> RTPHeaderExtension::audio_level() const {
-  if (!hasAudioLevel) {
-    return absl::nullopt;
-  }
-  return AudioLevel(voiceActivity, audioLevel);
-}
-
-void RTPHeaderExtension::set_audio_level(
-    absl::optional<AudioLevel> audio_level) {
-  if (audio_level) {
-    hasAudioLevel = true;
-    voiceActivity = audio_level->voice_activity();
-    audioLevel = audio_level->level();
-  } else {
-    hasAudioLevel = false;
-  }
-}
-
 RTPHeader::RTPHeader()
     : markerBit(false),
       payloadType(0),
diff --git a/api/rtp_headers.h b/api/rtp_headers.h
index 3ea643d37e..7ededb94fc 100644
--- a/api/rtp_headers.h
+++ b/api/rtp_headers.h
@@ -137,15 +137,11 @@ struct RTPHeaderExtension {
 
   // Audio Level includes both level in dBov and voiced/unvoiced bit. See:
   // https://tools.ietf.org/html/rfc6464#section-3
-  absl::optional<AudioLevel> audio_level() const;
+  absl::optional<AudioLevel> audio_level() const { return audio_level_; }
 
-  void set_audio_level(absl::optional<AudioLevel> audio_level);
-
-  // Direct use of the following members is discouraged and will be removed
-  // once downstream projects have been updated.
-  bool hasAudioLevel;
-  bool voiceActivity;
-  uint8_t audioLevel;
+  void set_audio_level(absl::optional<AudioLevel> audio_level) {
+    audio_level_ = audio_level;
+  }
 
   // For Coordination of Video Orientation. See
   // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/
@@ -173,6 +169,9 @@ struct RTPHeaderExtension {
   std::string mid;
 
   absl::optional<ColorSpace> color_space;
+
+ private:
+  absl::optional<AudioLevel> audio_level_;
 };
 
 enum { kRtpCsrcSize = 15 };  // RFC 3550 page 13