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 RTPHeaderExtension::audio_level() const { - if (!hasAudioLevel) { - return absl::nullopt; - } - return AudioLevel(voiceActivity, audioLevel); -} - -void RTPHeaderExtension::set_audio_level( - absl::optional 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 audio_level() const; + absl::optional audio_level() const { return audio_level_; } - void set_audio_level(absl::optional 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 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 color_space; + + private: + absl::optional audio_level_; }; enum { kRtpCsrcSize = 15 }; // RFC 3550 page 13