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

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

Issue 3009403002: Drop return value from RtpRtcp::IncomingRtcpPacket. (Closed)
Patch Set: Delete VoENetworkTest.ReceivedRTCPPacketWithJunkDataShouldFail. Created 3 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 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 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 int associated_payload_type) { 263 int associated_payload_type) {
264 rtp_sender_->SetRtxPayloadType(payload_type, associated_payload_type); 264 rtp_sender_->SetRtxPayloadType(payload_type, associated_payload_type);
265 } 265 }
266 266
267 rtc::Optional<uint32_t> ModuleRtpRtcpImpl::FlexfecSsrc() const { 267 rtc::Optional<uint32_t> ModuleRtpRtcpImpl::FlexfecSsrc() const {
268 if (rtp_sender_) 268 if (rtp_sender_)
269 return rtp_sender_->FlexfecSsrc(); 269 return rtp_sender_->FlexfecSsrc();
270 return rtc::Optional<uint32_t>(); 270 return rtc::Optional<uint32_t>();
271 } 271 }
272 272
273 int32_t ModuleRtpRtcpImpl::IncomingRtcpPacket( 273 void ModuleRtpRtcpImpl::IncomingRtcpPacket(const uint8_t* rtcp_packet,
274 const uint8_t* rtcp_packet, 274 const size_t length) {
275 const size_t length) { 275 rtcp_receiver_.IncomingPacket(rtcp_packet, length);
276 return rtcp_receiver_.IncomingPacket(rtcp_packet, length) ? 0 : -1;
277 } 276 }
278 277
279 int32_t ModuleRtpRtcpImpl::RegisterSendPayload( 278 int32_t ModuleRtpRtcpImpl::RegisterSendPayload(
280 const CodecInst& voice_codec) { 279 const CodecInst& voice_codec) {
281 return rtp_sender_->RegisterPayload( 280 return rtp_sender_->RegisterPayload(
282 voice_codec.plname, voice_codec.pltype, voice_codec.plfreq, 281 voice_codec.plname, voice_codec.pltype, voice_codec.plfreq,
283 voice_codec.channels, (voice_codec.rate < 0) ? 0 : voice_codec.rate); 282 voice_codec.channels, (voice_codec.rate < 0) ? 0 : voice_codec.rate);
284 } 283 }
285 284
286 int32_t ModuleRtpRtcpImpl::RegisterSendPayload(const VideoCodec& video_codec) { 285 int32_t ModuleRtpRtcpImpl::RegisterSendPayload(const VideoCodec& video_codec) {
(...skipping 636 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 StreamDataCountersCallback* 922 StreamDataCountersCallback*
924 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { 923 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
925 return rtp_sender_->GetRtpStatisticsCallback(); 924 return rtp_sender_->GetRtpStatisticsCallback();
926 } 925 }
927 926
928 void ModuleRtpRtcpImpl::SetVideoBitrateAllocation( 927 void ModuleRtpRtcpImpl::SetVideoBitrateAllocation(
929 const BitrateAllocation& bitrate) { 928 const BitrateAllocation& bitrate) {
930 rtcp_sender_.SetVideoBitrateAllocation(bitrate); 929 rtcp_sender_.SetVideoBitrateAllocation(bitrate);
931 } 930 }
932 } // namespace webrtc 931 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698