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

Side by Side Diff: media/cast/transport/cast_transport_sender_impl.cc

Issue 322953004: Cast: Don't cancel re-transmission for some cases (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged again Created 6 years, 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/transport/cast_transport_sender_impl.h" 5 #include "media/cast/transport/cast_transport_sender_impl.h"
6 6
7 #include "base/single_thread_task_runner.h" 7 #include "base/single_thread_task_runner.h"
8 #include "media/cast/transport/cast_transport_config.h" 8 #include "media/cast/transport/cast_transport_config.h"
9 #include "media/cast/transport/cast_transport_defines.h" 9 #include "media/cast/transport/cast_transport_defines.h"
10 10
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 } else { 170 } else {
171 LOG(ERROR) << "Sending RTCP with an invalid SSRC."; 171 LOG(ERROR) << "Sending RTCP with an invalid SSRC.";
172 return; 172 return;
173 } 173 }
174 rtcp_builder_.SendRtcpFromRtpSender( 174 rtcp_builder_.SendRtcpFromRtpSender(
175 packet_type_flags, sender_info, dlrr, sending_ssrc, c_name); 175 packet_type_flags, sender_info, dlrr, sending_ssrc, c_name);
176 } 176 }
177 177
178 void CastTransportSenderImpl::ResendPackets( 178 void CastTransportSenderImpl::ResendPackets(
179 bool is_audio, 179 bool is_audio,
180 const MissingFramesAndPacketsMap& missing_packets) { 180 const MissingFramesAndPacketsMap& missing_packets,
181 bool cancel_rtx_if_not_in_list) {
181 if (is_audio) { 182 if (is_audio) {
182 DCHECK(audio_sender_) << "Audio sender uninitialized"; 183 DCHECK(audio_sender_) << "Audio sender uninitialized";
183 audio_sender_->ResendPackets(missing_packets); 184 audio_sender_->ResendPackets(missing_packets,
185 cancel_rtx_if_not_in_list);
184 } else { 186 } else {
185 DCHECK(video_sender_) << "Video sender uninitialized"; 187 DCHECK(video_sender_) << "Video sender uninitialized";
186 video_sender_->ResendPackets(missing_packets); 188 video_sender_->ResendPackets(missing_packets,
189 cancel_rtx_if_not_in_list);
187 } 190 }
188 } 191 }
189 192
190 void CastTransportSenderImpl::SendRawEvents() { 193 void CastTransportSenderImpl::SendRawEvents() {
191 DCHECK(event_subscriber_.get()); 194 DCHECK(event_subscriber_.get());
192 DCHECK(!raw_events_callback_.is_null()); 195 DCHECK(!raw_events_callback_.is_null());
193 std::vector<PacketEvent> packet_events; 196 std::vector<PacketEvent> packet_events;
194 event_subscriber_->GetPacketEventsAndReset(&packet_events); 197 event_subscriber_->GetPacketEventsAndReset(&packet_events);
195 raw_events_callback_.Run(packet_events); 198 raw_events_callback_.Run(packet_events);
196 } 199 }
197 200
198 } // namespace transport 201 } // namespace transport
199 } // namespace cast 202 } // namespace cast
200 } // namespace media 203 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/transport/cast_transport_sender_impl.h ('k') | media/cast/transport/rtp_sender/rtp_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698