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

Side by Side Diff: webrtc/call/call.cc

Issue 1571283002: Fixes a bug which incorrectly logs incoming RTCP as outgoing. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 660 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 event_log_->LogRtcpPacket(true, media_type, packet, length); 671 event_log_->LogRtcpPacket(true, media_type, packet, length);
672 } 672 }
673 } 673 }
674 } 674 }
675 if (media_type == MediaType::ANY || media_type == MediaType::VIDEO) { 675 if (media_type == MediaType::ANY || media_type == MediaType::VIDEO) {
676 ReadLockScoped read_lock(*send_crit_); 676 ReadLockScoped read_lock(*send_crit_);
677 for (VideoSendStream* stream : video_send_streams_) { 677 for (VideoSendStream* stream : video_send_streams_) {
678 if (stream->DeliverRtcp(packet, length)) { 678 if (stream->DeliverRtcp(packet, length)) {
679 rtcp_delivered = true; 679 rtcp_delivered = true;
680 if (event_log_) 680 if (event_log_)
681 event_log_->LogRtcpPacket(false, media_type, packet, length); 681 event_log_->LogRtcpPacket(true, media_type, packet, length);
pbos-webrtc 2016/01/11 12:16:56 Can we change this into an enum that has kIncoming
terelius 2016/01/11 12:22:52 I suppose we could do that, though I think the ori
the sun 2016/01/11 12:36:16 +1
terelius 2016/01/11 13:07:20 There is an enum RTPDirections in common_types.h.
terelius 2016/01/13 17:08:18 Added an enum in rtc_event_log.h
682 } 682 }
683 } 683 }
684 } 684 }
685 return rtcp_delivered ? DELIVERY_OK : DELIVERY_PACKET_ERROR; 685 return rtcp_delivered ? DELIVERY_OK : DELIVERY_PACKET_ERROR;
686 } 686 }
687 687
688 PacketReceiver::DeliveryStatus Call::DeliverRtp(MediaType media_type, 688 PacketReceiver::DeliveryStatus Call::DeliverRtp(MediaType media_type,
689 const uint8_t* packet, 689 const uint8_t* packet,
690 size_t length, 690 size_t length,
691 const PacketTime& packet_time) { 691 const PacketTime& packet_time) {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 // thread. Then this check can be enabled. 737 // thread. Then this check can be enabled.
738 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); 738 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread());
739 if (RtpHeaderParser::IsRtcp(packet, length)) 739 if (RtpHeaderParser::IsRtcp(packet, length))
740 return DeliverRtcp(media_type, packet, length); 740 return DeliverRtcp(media_type, packet, length);
741 741
742 return DeliverRtp(media_type, packet, length, packet_time); 742 return DeliverRtp(media_type, packet, length, packet_time);
743 } 743 }
744 744
745 } // namespace internal 745 } // namespace internal
746 } // namespace webrtc 746 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/call/rtc_event_log_unittest.cc » ('j') | webrtc/modules/rtp_rtcp/include/rtp_rtcp.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698