| Index: media/cast/test/sender.cc
|
| diff --git a/media/cast/test/sender.cc b/media/cast/test/sender.cc
|
| index 4f94a44c26ca3dc6152f13cc8861e6d0c984ea71..395c3f5a4785ea5b28ad9cbb702966e75792e60e 100644
|
| --- a/media/cast/test/sender.cc
|
| +++ b/media/cast/test/sender.cc
|
| @@ -318,6 +318,24 @@ namespace {
|
| void UpdateCastTransportStatus(
|
| media::cast::transport::CastTransportStatus status) {}
|
|
|
| +void LogRawEvents(
|
| + const scoped_refptr<media::cast::CastEnvironment>& cast_environment,
|
| + const std::vector<media::cast::PacketEvent>& packet_events) {
|
| + VLOG(1) << "Got packet events from transport, size: " << packet_events.size();
|
| + for (std::vector<media::cast::PacketEvent>::const_iterator it =
|
| + packet_events.begin();
|
| + it != packet_events.end();
|
| + ++it) {
|
| + cast_environment->Logging()->InsertPacketEvent(it->timestamp,
|
| + it->type,
|
| + it->rtp_timestamp,
|
| + it->frame_id,
|
| + it->packet_id,
|
| + it->max_packet_id,
|
| + it->size);
|
| + }
|
| +}
|
| +
|
| void InitializationResult(media::cast::CastInitializationStatus result) {
|
| CHECK_EQ(result, media::cast::STATUS_INITIALIZED);
|
| VLOG(1) << "Cast Sender initialized";
|
| @@ -422,18 +440,12 @@ int main(int argc, char** argv) {
|
| config.audio_rtp_config = audio_config.rtp_config;
|
| config.video_rtp_config = video_config.rtp_config;
|
|
|
| - scoped_ptr<media::cast::transport::CastTransportSender> transport_sender(
|
| - media::cast::transport::CastTransportSender::CreateCastTransportSender(
|
| - clock.get(),
|
| - config,
|
| - base::Bind(&UpdateCastTransportStatus),
|
| - io_message_loop.message_loop_proxy()));
|
| -
|
| // Enable main and send side threads only. Enable raw event logging.
|
| // Running transport on the main thread.
|
| + config.enable_raw_event_logging = true;
|
| media::cast::CastLoggingConfig logging_config;
|
| logging_config.enable_raw_data_collection = true;
|
| -
|
| +
|
| scoped_refptr<media::cast::CastEnvironment> cast_environment(
|
| new media::cast::CastEnvironment(clock.Pass(),
|
| io_message_loop.message_loop_proxy(),
|
| @@ -444,6 +456,15 @@ int main(int argc, char** argv) {
|
| io_message_loop.message_loop_proxy(),
|
| logging_config));
|
|
|
| + scoped_ptr<media::cast::transport::CastTransportSender> transport_sender(
|
| + media::cast::transport::CastTransportSender::CreateCastTransportSender(
|
| + cast_environment->Clock(),
|
| + config,
|
| + logging_config,
|
| + base::Bind(&UpdateCastTransportStatus),
|
| + base::Bind(&LogRawEvents, cast_environment),
|
| + io_message_loop.message_loop_proxy()));
|
| +
|
| scoped_ptr<media::cast::CastSender> cast_sender(
|
| media::cast::CastSender::CreateCastSender(
|
| cast_environment,
|
|
|