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

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

Issue 2426543002: Append second nack list in same compound rtcp packet (Closed)
Patch Set: restored case with two compound packets with nacks one after another Created 4 years, 2 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/rtcp_receiver_unittest.cc » ('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 628 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 PacketInformation* packet_information) { 639 PacketInformation* packet_information) {
640 rtcp::Nack nack; 640 rtcp::Nack nack;
641 if (!nack.Parse(rtcp_block)) { 641 if (!nack.Parse(rtcp_block)) {
642 ++num_skipped_packets_; 642 ++num_skipped_packets_;
643 return; 643 return;
644 } 644 }
645 645
646 if (receiver_only_ || main_ssrc_ != nack.media_ssrc()) // Not to us. 646 if (receiver_only_ || main_ssrc_ != nack.media_ssrc()) // Not to us.
647 return; 647 return;
648 648
649 packet_information->nack_sequence_numbers = nack.packet_ids(); 649 packet_information->nack_sequence_numbers.insert(
650 packet_information->nack_sequence_numbers.end(),
651 nack.packet_ids().begin(), nack.packet_ids().end());
650 for (uint16_t packet_id : nack.packet_ids()) 652 for (uint16_t packet_id : nack.packet_ids())
651 nack_stats_.ReportRequest(packet_id); 653 nack_stats_.ReportRequest(packet_id);
652 654
653 if (!nack.packet_ids().empty()) { 655 if (!nack.packet_ids().empty()) {
654 packet_information->packet_type_flags |= kRtcpNack; 656 packet_information->packet_type_flags |= kRtcpNack;
655 ++packet_type_counter_.nack_packets; 657 ++packet_type_counter_.nack_packets;
656 packet_type_counter_.nack_requests = nack_stats_.requests(); 658 packet_type_counter_.nack_requests = nack_stats_.requests();
657 packet_type_counter_.unique_nack_requests = nack_stats_.unique_requests(); 659 packet_type_counter_.unique_nack_requests = nack_stats_.unique_requests();
658 } 660 }
659 } 661 }
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 } else { 1055 } else {
1054 candidates.push_back(it->second.tmmbr_item); 1056 candidates.push_back(it->second.tmmbr_item);
1055 ++it; 1057 ++it;
1056 } 1058 }
1057 } 1059 }
1058 } 1060 }
1059 return candidates; 1061 return candidates;
1060 } 1062 }
1061 1063
1062 } // namespace webrtc 1064 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698