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

Side by Side Diff: media/cast/net/rtcp/rtcp_receiver.cc

Issue 388663003: Cast: Reshuffle files under media/cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing includes Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « media/cast/net/rtcp/rtcp_receiver.h ('k') | media/cast/net/rtcp/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 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cast/rtcp/rtcp_receiver.h" 5 #include "media/cast/net/rtcp/rtcp_receiver.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/cast/rtcp/rtcp_utility.h" 8 #include "media/cast/net/cast_transport_defines.h"
9 #include "media/cast/transport/cast_transport_defines.h" 9 #include "media/cast/net/rtcp/rtcp_utility.h"
10 10
11 namespace { 11 namespace {
12 12
13 // A receiver frame event is identified by frame RTP timestamp, event timestamp 13 // A receiver frame event is identified by frame RTP timestamp, event timestamp
14 // and event type. 14 // and event type.
15 // A receiver packet event is identified by all of the above plus packet id. 15 // A receiver packet event is identified by all of the above plus packet id.
16 // The key format is as follows: 16 // The key format is as follows:
17 // First uint64: 17 // First uint64:
18 // bits 0-11: zeroes (unused). 18 // bits 0-11: zeroes (unused).
19 // bits 12-15: event type ID. 19 // bits 12-15: event type ID.
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 const RtcpField& rtcp_field = rtcp_parser->Field(); 128 const RtcpField& rtcp_field = rtcp_parser->Field();
129 129
130 DCHECK(rtcp_field_type == kRtcpSrCode) << "Invalid state"; 130 DCHECK(rtcp_field_type == kRtcpSrCode) << "Invalid state";
131 131
132 // Synchronization source identifier for the originator of this SR packet. 132 // Synchronization source identifier for the originator of this SR packet.
133 uint32 remote_ssrc = rtcp_field.sender_report.sender_ssrc; 133 uint32 remote_ssrc = rtcp_field.sender_report.sender_ssrc;
134 134
135 VLOG(2) << "Cast RTCP received SR from SSRC " << remote_ssrc; 135 VLOG(2) << "Cast RTCP received SR from SSRC " << remote_ssrc;
136 136
137 if (remote_ssrc_ == remote_ssrc) { 137 if (remote_ssrc_ == remote_ssrc) {
138 transport::RtcpSenderInfo remote_sender_info; 138 RtcpSenderInfo remote_sender_info;
139 remote_sender_info.ntp_seconds = 139 remote_sender_info.ntp_seconds =
140 rtcp_field.sender_report.ntp_most_significant; 140 rtcp_field.sender_report.ntp_most_significant;
141 remote_sender_info.ntp_fraction = 141 remote_sender_info.ntp_fraction =
142 rtcp_field.sender_report.ntp_least_significant; 142 rtcp_field.sender_report.ntp_least_significant;
143 remote_sender_info.rtp_timestamp = rtcp_field.sender_report.rtp_timestamp; 143 remote_sender_info.rtp_timestamp = rtcp_field.sender_report.rtp_timestamp;
144 remote_sender_info.send_packet_count = 144 remote_sender_info.send_packet_count =
145 rtcp_field.sender_report.sender_packet_count; 145 rtcp_field.sender_report.sender_packet_count;
146 remote_sender_info.send_octet_count = 146 remote_sender_info.send_octet_count =
147 rtcp_field.sender_report.sender_octet_count; 147 rtcp_field.sender_report.sender_octet_count;
148 if (receiver_feedback_) { 148 if (receiver_feedback_) {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 186
187 const RtcpFieldReportBlockItem& rb = rtcp_field->report_block_item; 187 const RtcpFieldReportBlockItem& rb = rtcp_field->report_block_item;
188 188
189 // Filter out all report blocks that are not for us. 189 // Filter out all report blocks that are not for us.
190 if (rb.ssrc != ssrc_) { 190 if (rb.ssrc != ssrc_) {
191 // This block is not for us ignore it. 191 // This block is not for us ignore it.
192 return; 192 return;
193 } 193 }
194 VLOG(2) << "Cast RTCP received RB from SSRC " << remote_ssrc; 194 VLOG(2) << "Cast RTCP received RB from SSRC " << remote_ssrc;
195 195
196 transport::RtcpReportBlock report_block; 196 RtcpReportBlock report_block;
197 report_block.remote_ssrc = remote_ssrc; 197 report_block.remote_ssrc = remote_ssrc;
198 report_block.media_ssrc = rb.ssrc; 198 report_block.media_ssrc = rb.ssrc;
199 report_block.fraction_lost = rb.fraction_lost; 199 report_block.fraction_lost = rb.fraction_lost;
200 report_block.cumulative_lost = rb.cumulative_number_of_packets_lost; 200 report_block.cumulative_lost = rb.cumulative_number_of_packets_lost;
201 report_block.extended_high_sequence_number = 201 report_block.extended_high_sequence_number =
202 rb.extended_highest_sequence_number; 202 rb.extended_highest_sequence_number;
203 report_block.jitter = rb.jitter; 203 report_block.jitter = rb.jitter;
204 report_block.last_sr = rb.last_sender_report; 204 report_block.last_sr = rb.last_sender_report;
205 report_block.delay_since_last_sr = rb.delay_last_sender_report; 205 report_block.delay_since_last_sr = rb.delay_last_sender_report;
206 206
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 void RtcpReceiver::HandleFIRItem(const RtcpField* rtcp_field) { 555 void RtcpReceiver::HandleFIRItem(const RtcpField* rtcp_field) {
556 // Is it our sender that is requested to generate a new keyframe. 556 // Is it our sender that is requested to generate a new keyframe.
557 if (ssrc_ != rtcp_field->fir_item.ssrc) 557 if (ssrc_ != rtcp_field->fir_item.ssrc)
558 return; 558 return;
559 559
560 VLOG(2) << "Cast RTCP received FIR on our SSRC " << ssrc_; 560 VLOG(2) << "Cast RTCP received FIR on our SSRC " << ssrc_;
561 } 561 }
562 562
563 } // namespace cast 563 } // namespace cast
564 } // namespace media 564 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/net/rtcp/rtcp_receiver.h ('k') | media/cast/net/rtcp/rtcp_receiver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698