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

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

Issue 2312143002: Merge min_ms and max_ms accessors in PlayoutDelayOracle (Closed)
Patch Set: Created 4 years, 3 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/playout_delay_oracle.cc
diff --git a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.cc b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.cc
index 24cdf533ac3e5bd00cb2fdd556a5a753bf332f7a..e87a2ed5137948d4770406b90cb95d1ab84b47e0 100644
--- a/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.cc
+++ b/webrtc/modules/rtp_rtcp/source/playout_delay_oracle.cc
@@ -21,8 +21,7 @@ PlayoutDelayOracle::PlayoutDelayOracle()
: high_sequence_number_(0),
send_playout_delay_(false),
ssrc_(0),
- min_playout_delay_ms_(-1),
- max_playout_delay_ms_(-1) {}
+ playout_delay_{-1, -1} {}
PlayoutDelayOracle::~PlayoutDelayOracle() {}
@@ -35,16 +34,16 @@ void PlayoutDelayOracle::UpdateRequest(uint32_t ssrc,
RTC_DCHECK_LE(playout_delay.min_ms, playout_delay.max_ms);
int64_t unwrapped_seq_num = unwrapper_.Unwrap(seq_num);
if (playout_delay.min_ms >= 0 &&
- playout_delay.min_ms != min_playout_delay_ms_) {
+ playout_delay.min_ms != playout_delay_.min_ms) {
send_playout_delay_ = true;
- min_playout_delay_ms_ = playout_delay.min_ms;
+ playout_delay_.min_ms = playout_delay.min_ms;
high_sequence_number_ = unwrapped_seq_num;
}
if (playout_delay.max_ms >= 0 &&
- playout_delay.max_ms != max_playout_delay_ms_) {
+ playout_delay.max_ms != playout_delay_.max_ms) {
send_playout_delay_ = true;
- max_playout_delay_ms_ = playout_delay.max_ms;
+ playout_delay_.max_ms = playout_delay.max_ms;
high_sequence_number_ = unwrapped_seq_num;
}
ssrc_ = ssrc;
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h ('k') | webrtc/modules/rtp_rtcp/source/playout_delay_oracle_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698