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

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

Issue 178073004: Cast: IPC from browser to renderer to send packet events from transport to cast library. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed hubbe's comments Created 6 years, 9 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
11 namespace media { 11 namespace media {
12 namespace cast { 12 namespace cast {
13 namespace transport { 13 namespace transport {
14 14
15 CastTransportSender* CastTransportSender::CreateCastTransportSender( 15 CastTransportSender* CastTransportSender::CreateCastTransportSender(
16 base::TickClock* clock, 16 base::TickClock* clock,
17 const CastTransportConfig& config, 17 const CastTransportConfig& config,
18 const CastTransportStatusCallback& status_callback, 18 const CastTransportStatusCallback& status_callback,
19 const BulkRawEventsCallback& raw_events_callback,
19 const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner) { 20 const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner) {
20 return new CastTransportSenderImpl( 21 return new CastTransportSenderImpl(clock,
21 clock, config, status_callback, transport_task_runner.get(), NULL); 22 config,
23 status_callback,
24 raw_events_callback,
25 transport_task_runner.get(),
26 NULL);
22 } 27 }
23 28
24 CastTransportSenderImpl::CastTransportSenderImpl( 29 CastTransportSenderImpl::CastTransportSenderImpl(
25 base::TickClock* clock, 30 base::TickClock* clock,
26 const CastTransportConfig& config, 31 const CastTransportConfig& config,
27 const CastTransportStatusCallback& status_callback, 32 const CastTransportStatusCallback& status_callback,
33 const BulkRawEventsCallback& raw_events_callback,
28 const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner, 34 const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner,
29 PacketSender* external_transport) 35 PacketSender* external_transport)
30 : transport_(external_transport ? NULL 36 : transport_(external_transport ? NULL
31 : new UdpTransport(transport_task_runner, 37 : new UdpTransport(transport_task_runner,
32 config.local_endpoint, 38 config.local_endpoint,
33 config.receiver_endpoint, 39 config.receiver_endpoint,
34 status_callback)), 40 status_callback)),
35 pacer_(clock, 41 pacer_(clock,
36 external_transport ? external_transport : transport_.get(), 42 external_transport ? external_transport : transport_.get(),
37 transport_task_runner), 43 transport_task_runner),
38 rtcp_builder_(&pacer_), 44 rtcp_builder_(&pacer_),
39 audio_sender_(config, clock, transport_task_runner, &pacer_), 45 audio_sender_(config, clock, transport_task_runner, &pacer_),
40 video_sender_(config, clock, transport_task_runner, &pacer_) { 46 video_sender_(config, clock, transport_task_runner, &pacer_),
47 logging_(transport_task_runner,
48 CastLoggingConfig(config.enable_raw_event_logging,
49 false, false)),
50 raw_events_callback_(raw_events_callback) {
41 if (audio_sender_.initialized() && video_sender_.initialized()) { 51 if (audio_sender_.initialized() && video_sender_.initialized()) {
42 status_callback.Run(TRANSPORT_INITIALIZED); 52 status_callback.Run(TRANSPORT_INITIALIZED);
43 } else { 53 } else {
44 status_callback.Run(TRANSPORT_UNINITIALIZED); 54 status_callback.Run(TRANSPORT_UNINITIALIZED);
45 } 55 }
56
57 if (config.enable_raw_event_logging) {
58 event_subscriber_.reset(new SimpleEventSubscriber);
59 logging_.AddRawEventSubscriber(event_subscriber_.get());
60 raw_events_timer_.Start(
61 FROM_HERE,
62 base::TimeDelta::FromSeconds(kSendRawEventsIntervalSecs),
63 this,
64 &CastTransportSenderImpl::SendRawEvents);
65 }
46 } 66 }
47 67
48 CastTransportSenderImpl::~CastTransportSenderImpl() {} 68 CastTransportSenderImpl::~CastTransportSenderImpl() {
69 if (event_subscriber_.get())
70 logging_.RemoveRawEventSubscriber(event_subscriber_.get());
71 }
49 72
50 void CastTransportSenderImpl::SetPacketReceiver( 73 void CastTransportSenderImpl::SetPacketReceiver(
51 const PacketReceiverCallback& packet_receiver) { 74 const PacketReceiverCallback& packet_receiver) {
52 transport_->StartReceiving(packet_receiver); 75 transport_->StartReceiving(packet_receiver);
53 } 76 }
54 77
55 void CastTransportSenderImpl::InsertCodedAudioFrame( 78 void CastTransportSenderImpl::InsertCodedAudioFrame(
56 const EncodedAudioFrame* audio_frame, 79 const EncodedAudioFrame* audio_frame,
57 const base::TimeTicks& recorded_time) { 80 const base::TimeTicks& recorded_time) {
58 audio_sender_.InsertCodedAudioFrame(audio_frame, recorded_time); 81 audio_sender_.InsertCodedAudioFrame(audio_frame, recorded_time);
(...skipping 29 matching lines...) Expand all
88 void CastTransportSenderImpl::SubscribeAudioRtpStatsCallback( 111 void CastTransportSenderImpl::SubscribeAudioRtpStatsCallback(
89 const CastTransportRtpStatistics& callback) { 112 const CastTransportRtpStatistics& callback) {
90 audio_sender_.SubscribeAudioRtpStatsCallback(callback); 113 audio_sender_.SubscribeAudioRtpStatsCallback(callback);
91 } 114 }
92 115
93 void CastTransportSenderImpl::SubscribeVideoRtpStatsCallback( 116 void CastTransportSenderImpl::SubscribeVideoRtpStatsCallback(
94 const CastTransportRtpStatistics& callback) { 117 const CastTransportRtpStatistics& callback) {
95 video_sender_.SubscribeVideoRtpStatsCallback(callback); 118 video_sender_.SubscribeVideoRtpStatsCallback(callback);
96 } 119 }
97 120
121 void CastTransportSenderImpl::SendRawEvents() {
122 DCHECK(event_subscriber_.get());
123 std::vector<PacketEvent> packet_events;
124 event_subscriber_->GetPacketEventsAndReset(&packet_events);
125 raw_events_callback_.Run(packet_events);
126 }
127
98 } // namespace transport 128 } // namespace transport
99 } // namespace cast 129 } // namespace cast
100 } // namespace media 130 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698