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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/playout_delay_oracle.cc

Issue 2642783006: Move implmentation specific constants out of rtp_header_extension.h (Closed)
Patch Set: . Created 3 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtp_header_extension.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h" 11 #include "webrtc/modules/rtp_rtcp/source/playout_delay_oracle.h"
12 12
13 #include "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 #include "webrtc/base/logging.h" 14 #include "webrtc/base/logging.h"
15 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 15 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
16 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extension.h" 16 #include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
17 17
18 namespace webrtc { 18 namespace webrtc {
19 19
20 PlayoutDelayOracle::PlayoutDelayOracle() 20 PlayoutDelayOracle::PlayoutDelayOracle()
21 : high_sequence_number_(0), 21 : high_sequence_number_(0),
22 send_playout_delay_(false), 22 send_playout_delay_(false),
23 ssrc_(0), 23 ssrc_(0),
24 playout_delay_{-1, -1} {} 24 playout_delay_{-1, -1} {}
25 25
26 PlayoutDelayOracle::~PlayoutDelayOracle() {} 26 PlayoutDelayOracle::~PlayoutDelayOracle() {}
27 27
28 void PlayoutDelayOracle::UpdateRequest(uint32_t ssrc, 28 void PlayoutDelayOracle::UpdateRequest(uint32_t ssrc,
29 PlayoutDelay playout_delay, 29 PlayoutDelay playout_delay,
30 uint16_t seq_num) { 30 uint16_t seq_num) {
31 rtc::CritScope lock(&crit_sect_); 31 rtc::CritScope lock(&crit_sect_);
32 RTC_DCHECK_LE(playout_delay.min_ms, kPlayoutDelayMaxMs); 32 RTC_DCHECK_LE(playout_delay.min_ms, PlayoutDelayLimits::kMaxMs);
33 RTC_DCHECK_LE(playout_delay.max_ms, kPlayoutDelayMaxMs); 33 RTC_DCHECK_LE(playout_delay.max_ms, PlayoutDelayLimits::kMaxMs);
34 RTC_DCHECK_LE(playout_delay.min_ms, playout_delay.max_ms); 34 RTC_DCHECK_LE(playout_delay.min_ms, playout_delay.max_ms);
35 int64_t unwrapped_seq_num = unwrapper_.Unwrap(seq_num); 35 int64_t unwrapped_seq_num = unwrapper_.Unwrap(seq_num);
36 if (playout_delay.min_ms >= 0 && 36 if (playout_delay.min_ms >= 0 &&
37 playout_delay.min_ms != playout_delay_.min_ms) { 37 playout_delay.min_ms != playout_delay_.min_ms) {
38 send_playout_delay_ = true; 38 send_playout_delay_ = true;
39 playout_delay_.min_ms = playout_delay.min_ms; 39 playout_delay_.min_ms = playout_delay.min_ms;
40 high_sequence_number_ = unwrapped_seq_num; 40 high_sequence_number_ = unwrapped_seq_num;
41 } 41 }
42 42
43 if (playout_delay.max_ms >= 0 && 43 if (playout_delay.max_ms >= 0 &&
(...skipping 12 matching lines...) Expand all
56 rtc::CritScope lock(&crit_sect_); 56 rtc::CritScope lock(&crit_sect_);
57 for (const RTCPReportBlock& report_block : report_blocks) { 57 for (const RTCPReportBlock& report_block : report_blocks) {
58 if ((ssrc_ == report_block.sourceSSRC) && send_playout_delay_ && 58 if ((ssrc_ == report_block.sourceSSRC) && send_playout_delay_ &&
59 (report_block.extendedHighSeqNum > high_sequence_number_)) { 59 (report_block.extendedHighSeqNum > high_sequence_number_)) {
60 send_playout_delay_ = false; 60 send_playout_delay_ = false;
61 } 61 }
62 } 62 }
63 } 63 }
64 64
65 } // namespace webrtc 65 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtp_header_extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698