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

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

Issue 1864313003: Move Ownership of RtpModules to VideoSendStream. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 8 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 | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h ('k') | webrtc/video/encoder_state_feedback.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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 293
294 uint16_t ModuleRtpRtcpImpl::SequenceNumber() const { 294 uint16_t ModuleRtpRtcpImpl::SequenceNumber() const {
295 return rtp_sender_.SequenceNumber(); 295 return rtp_sender_.SequenceNumber();
296 } 296 }
297 297
298 // Set SequenceNumber, default is a random number. 298 // Set SequenceNumber, default is a random number.
299 void ModuleRtpRtcpImpl::SetSequenceNumber(const uint16_t seq_num) { 299 void ModuleRtpRtcpImpl::SetSequenceNumber(const uint16_t seq_num) {
300 rtp_sender_.SetSequenceNumber(seq_num); 300 rtp_sender_.SetSequenceNumber(seq_num);
301 } 301 }
302 302
303 bool ModuleRtpRtcpImpl::SetRtpStateForSsrc(uint32_t ssrc, 303 void ModuleRtpRtcpImpl::SetRtpState(const RtpState& rtp_state) {
304 const RtpState& rtp_state) { 304 SetStartTimestamp(rtp_state.start_timestamp);
305 if (rtp_sender_.SSRC() == ssrc) { 305 rtp_sender_.SetRtpState(rtp_state);
306 SetStartTimestamp(rtp_state.start_timestamp);
307 rtp_sender_.SetRtpState(rtp_state);
308 return true;
309 }
310 if (rtp_sender_.RtxSsrc() == ssrc) {
311 rtp_sender_.SetRtxRtpState(rtp_state);
312 return true;
313 }
314 return false;
315 } 306 }
316 307
317 bool ModuleRtpRtcpImpl::GetRtpStateForSsrc(uint32_t ssrc, RtpState* rtp_state) { 308 void ModuleRtpRtcpImpl::SetRtxState(const RtpState& rtp_state) {
318 if (rtp_sender_.SSRC() == ssrc) { 309 rtp_sender_.SetRtxRtpState(rtp_state);
319 *rtp_state = rtp_sender_.GetRtpState(); 310 }
320 return true; 311
321 } 312 RtpState ModuleRtpRtcpImpl::GetRtpState() const {
322 if (rtp_sender_.RtxSsrc() == ssrc) { 313 return rtp_sender_.GetRtpState();
323 *rtp_state = rtp_sender_.GetRtxRtpState(); 314 }
324 return true; 315
325 } 316 RtpState ModuleRtpRtcpImpl::GetRtxState() const {
326 return false; 317 return rtp_sender_.GetRtxRtpState();
327 } 318 }
328 319
329 uint32_t ModuleRtpRtcpImpl::SSRC() const { 320 uint32_t ModuleRtpRtcpImpl::SSRC() const {
330 return rtp_sender_.SSRC(); 321 return rtp_sender_.SSRC();
331 } 322 }
332 323
333 // Configure SSRC, default is a random number. 324 // Configure SSRC, default is a random number.
334 void ModuleRtpRtcpImpl::SetSSRC(const uint32_t ssrc) { 325 void ModuleRtpRtcpImpl::SetSSRC(const uint32_t ssrc) {
335 rtp_sender_.SetSSRC(ssrc); 326 rtp_sender_.SetSSRC(ssrc);
336 rtcp_sender_.SetSSRC(ssrc); 327 rtcp_sender_.SetSSRC(ssrc);
(...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after
993 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( 984 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback(
994 StreamDataCountersCallback* callback) { 985 StreamDataCountersCallback* callback) {
995 rtp_sender_.RegisterRtpStatisticsCallback(callback); 986 rtp_sender_.RegisterRtpStatisticsCallback(callback);
996 } 987 }
997 988
998 StreamDataCountersCallback* 989 StreamDataCountersCallback*
999 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { 990 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
1000 return rtp_sender_.GetRtpStatisticsCallback(); 991 return rtp_sender_.GetRtpStatisticsCallback();
1001 } 992 }
1002 } // namespace webrtc 993 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h ('k') | webrtc/video/encoder_state_feedback.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698