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

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

Issue 1649493004: Support multiple rtx codecs. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 4 years, 10 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
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 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 211
212 void ModuleRtpRtcpImpl::SetRtxSsrc(uint32_t ssrc) { 212 void ModuleRtpRtcpImpl::SetRtxSsrc(uint32_t ssrc) {
213 rtp_sender_.SetRtxSsrc(ssrc); 213 rtp_sender_.SetRtxSsrc(ssrc);
214 } 214 }
215 215
216 void ModuleRtpRtcpImpl::SetRtxSendPayloadType(int payload_type, 216 void ModuleRtpRtcpImpl::SetRtxSendPayloadType(int payload_type,
217 int associated_payload_type) { 217 int associated_payload_type) {
218 rtp_sender_.SetRtxPayloadType(payload_type, associated_payload_type); 218 rtp_sender_.SetRtxPayloadType(payload_type, associated_payload_type);
219 } 219 }
220 220
221 std::pair<int, int> ModuleRtpRtcpImpl::RtxSendPayloadType() const {
222 return rtp_sender_.RtxPayloadType();
223 }
224
225 int32_t ModuleRtpRtcpImpl::IncomingRtcpPacket( 221 int32_t ModuleRtpRtcpImpl::IncomingRtcpPacket(
226 const uint8_t* rtcp_packet, 222 const uint8_t* rtcp_packet,
227 const size_t length) { 223 const size_t length) {
228 // Allow receive of non-compound RTCP packets. 224 // Allow receive of non-compound RTCP packets.
229 RTCPUtility::RTCPParserV2 rtcp_parser(rtcp_packet, length, true); 225 RTCPUtility::RTCPParserV2 rtcp_parser(rtcp_packet, length, true);
230 226
231 const bool valid_rtcpheader = rtcp_parser.IsValid(); 227 const bool valid_rtcpheader = rtcp_parser.IsValid();
232 if (!valid_rtcpheader) { 228 if (!valid_rtcpheader) {
233 LOG(LS_WARNING) << "Incoming invalid RTCP packet"; 229 LOG(LS_WARNING) << "Incoming invalid RTCP packet";
234 return -1; 230 return -1;
(...skipping 758 matching lines...) Expand 10 before | Expand all | Expand 10 after
993 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( 989 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback(
994 StreamDataCountersCallback* callback) { 990 StreamDataCountersCallback* callback) {
995 rtp_sender_.RegisterRtpStatisticsCallback(callback); 991 rtp_sender_.RegisterRtpStatisticsCallback(callback);
996 } 992 }
997 993
998 StreamDataCountersCallback* 994 StreamDataCountersCallback*
999 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { 995 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
1000 return rtp_sender_.GetRtpStatisticsCallback(); 996 return rtp_sender_.GetRtpStatisticsCallback();
1001 } 997 }
1002 } // namespace webrtc 998 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698