Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(731)

Unified Diff: webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc

Issue 3000713002: Add audio_level member to RtpSource and set it from RtpReceiverImpl::IncomingRtpPacket. (Closed)
Patch Set: Move set_audio_level before RemoveOutdatedSources. Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc
index 20f57460a68ffc1cb30d84b43e46dd2361400c7f..672c04b6a8063df689df253f8b97990fbaf6141a 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc
@@ -163,7 +163,11 @@ bool RtpReceiverImpl::IncomingRtpPacket(
webrtc_rtp_header.header = rtp_header;
CheckCSRC(webrtc_rtp_header);
- UpdateSources();
+ auto audio_level =
+ rtp_header.extension.hasAudioLevel
+ ? rtc::Optional<uint8_t>(rtp_header.extension.audioLevel)
+ : rtc::Optional<uint8_t>();
pthatcher 2017/08/21 22:55:40 Seems like rtp_header.extension.audioLevel should
Zach Stein 2017/08/22 21:29:59 Acknowledged.
+ UpdateSources(audio_level);
size_t payload_data_length = payload_length - rtp_header.paddingLength;
@@ -500,7 +504,7 @@ void RtpReceiverImpl::CheckCSRC(const WebRtcRTPHeader& rtp_header) {
}
}
-void RtpReceiverImpl::UpdateSources() {
+void RtpReceiverImpl::UpdateSources(rtc::Optional<uint8_t> audio_level) {
pthatcher 2017/08/21 22:55:40 Again with const X& instead of X.
Zach Stein 2017/08/22 21:30:00 Done.
rtc::CritScope lock(&critical_section_rtp_receiver_);
int64_t now_ms = clock_->TimeInMilliseconds();
@@ -527,6 +531,8 @@ void RtpReceiverImpl::UpdateSources() {
ssrc_sources_.rbegin()->update_timestamp_ms(now_ms);
}
+ ssrc_sources_.back().set_audio_level(audio_level);
+
RemoveOutdatedSources(now_ms);
}

Powered by Google App Engine
This is Rietveld 408576698