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

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

Issue 252923007: Cast: Fix two video freezing problems (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hide max outstanding frames from cast library users Created 6 years, 7 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 // 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 } 67 }
68 } 68 }
69 69
70 CastTransportSenderImpl::~CastTransportSenderImpl() { 70 CastTransportSenderImpl::~CastTransportSenderImpl() {
71 if (event_subscriber_.get()) 71 if (event_subscriber_.get())
72 logging_.RemoveRawEventSubscriber(event_subscriber_.get()); 72 logging_.RemoveRawEventSubscriber(event_subscriber_.get());
73 } 73 }
74 74
75 void CastTransportSenderImpl::InitializeAudio( 75 void CastTransportSenderImpl::InitializeAudio(
76 const CastTransportAudioConfig& config) { 76 const CastTransportAudioConfig& config) {
77 pacer_.RegisterAudioSsrc(config.base.ssrc); 77 pacer_.RegisterAudioSsrc(config.rtp.config.ssrc);
78 audio_sender_.reset(new TransportAudioSender( 78 audio_sender_.reset(new TransportAudioSender(
79 config, clock_, &logging_, transport_task_runner_, &pacer_)); 79 config, clock_, &logging_, transport_task_runner_, &pacer_));
80 if (audio_sender_->initialized()) 80 if (audio_sender_->initialized())
81 status_callback_.Run(TRANSPORT_AUDIO_INITIALIZED); 81 status_callback_.Run(TRANSPORT_AUDIO_INITIALIZED);
82 else 82 else
83 status_callback_.Run(TRANSPORT_AUDIO_UNINITIALIZED); 83 status_callback_.Run(TRANSPORT_AUDIO_UNINITIALIZED);
84 } 84 }
85 85
86 void CastTransportSenderImpl::InitializeVideo( 86 void CastTransportSenderImpl::InitializeVideo(
87 const CastTransportVideoConfig& config) { 87 const CastTransportVideoConfig& config) {
88 pacer_.RegisterVideoSsrc(config.base.ssrc); 88 pacer_.RegisterVideoSsrc(config.rtp.config.ssrc);
89 video_sender_.reset(new TransportVideoSender( 89 video_sender_.reset(new TransportVideoSender(
90 config, clock_, &logging_, transport_task_runner_, &pacer_)); 90 config, clock_, &logging_, transport_task_runner_, &pacer_));
91 if (video_sender_->initialized()) 91 if (video_sender_->initialized())
92 status_callback_.Run(TRANSPORT_VIDEO_INITIALIZED); 92 status_callback_.Run(TRANSPORT_VIDEO_INITIALIZED);
93 else 93 else
94 status_callback_.Run(TRANSPORT_VIDEO_UNINITIALIZED); 94 status_callback_.Run(TRANSPORT_VIDEO_UNINITIALIZED);
95 } 95 }
96 96
97 void CastTransportSenderImpl::SetPacketReceiver( 97 void CastTransportSenderImpl::SetPacketReceiver(
98 const PacketReceiverCallback& packet_receiver) { 98 const PacketReceiverCallback& packet_receiver) {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 DCHECK(event_subscriber_.get()); 152 DCHECK(event_subscriber_.get());
153 DCHECK(!raw_events_callback_.is_null()); 153 DCHECK(!raw_events_callback_.is_null());
154 std::vector<PacketEvent> packet_events; 154 std::vector<PacketEvent> packet_events;
155 event_subscriber_->GetPacketEventsAndReset(&packet_events); 155 event_subscriber_->GetPacketEventsAndReset(&packet_events);
156 raw_events_callback_.Run(packet_events); 156 raw_events_callback_.Run(packet_events);
157 } 157 }
158 158
159 } // namespace transport 159 } // namespace transport
160 } // namespace cast 160 } // namespace cast
161 } // namespace media 161 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698