mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove deprecated accessors for audio_level in RTPHeaderExtension

Browse source 
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}
This commit is contained in:
Joachim Reiersen 2024-04-16 14:33:29 -07:00 committed by WebRTC LUCI CQ
parent 85bea5a11b
commit a341fe31d4
2 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
api/rtp_headers.cc
View file

@ -27,9 +27,6 @@ RTPHeaderExtension::RTPHeaderExtension()
absoluteSendTime(0), absoluteSendTime(0),
hasTransportSequenceNumber(false), hasTransportSequenceNumber(false),
transportSequenceNumber(0), transportSequenceNumber(0),
hasAudioLevel(false),
voiceActivity(false),
audioLevel(0),
hasVideoRotation(false), hasVideoRotation(false),
videoRotation(kVideoRotation_0), videoRotation(kVideoRotation_0),
hasVideoContentType(false), hasVideoContentType(false),
@ -42,24 +39,6 @@ RTPHeaderExtension::RTPHeaderExtension(const RTPHeaderExtension& other) =
RTPHeaderExtension& RTPHeaderExtension::operator=( RTPHeaderExtension& RTPHeaderExtension::operator=(
const RTPHeaderExtension& other) = default; 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() RTPHeader::RTPHeader()
: markerBit(false), : markerBit(false),
payloadType(0), payloadType(0),

15
api/rtp_headers.h
View file

@ -137,15 +137,11 @@ struct RTPHeaderExtension {
// Audio Level includes both level in dBov and voiced/unvoiced bit. See: // Audio Level includes both level in dBov and voiced/unvoiced bit. See:
// https://tools.ietf.org/html/rfc6464#section-3 // 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); void set_audio_level(absl::optional<AudioLevel> audio_level) {
audio_level_ = 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;
// For Coordination of Video Orientation. See // For Coordination of Video Orientation. See
// http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/ // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/
@ -173,6 +169,9 @@ struct RTPHeaderExtension {
std::string mid; std::string mid;
absl::optional<ColorSpace> color_space; absl::optional<ColorSpace> color_space;
private:
absl::optional<AudioLevel> audio_level_;
}; };
enum { kRtpCsrcSize = 15 }; // RFC 3550 page 13 enum { kRtpCsrcSize = 15 }; // RFC 3550 page 13