Index: media/cast/test/simulator.cc |
diff --git a/media/cast/test/simulator.cc b/media/cast/test/simulator.cc |
index 43b3a02dc625e78c1c2af861534a53f4d6c40f76..27812c333cbe3a287381d383205557c468d6e708 100644 |
--- a/media/cast/test/simulator.cc |
+++ b/media/cast/test/simulator.cc |
@@ -85,7 +85,8 @@ void VideoInitializationStatus(CastInitializationStatus status) { |
} |
void LogTransportEvents(const scoped_refptr<CastEnvironment>& env, |
- const std::vector<PacketEvent>& packet_events) { |
+ const std::vector<PacketEvent>& packet_events, |
+ const std::vector<FrameEvent>& frame_events) { |
for (std::vector<media::cast::PacketEvent>::const_iterator it = |
packet_events.begin(); |
it != packet_events.end(); |
@@ -99,6 +100,16 @@ void LogTransportEvents(const scoped_refptr<CastEnvironment>& env, |
it->max_packet_id, |
it->size); |
} |
+ for (std::vector<media::cast::FrameEvent>::const_iterator it = |
+ frame_events.begin(); |
+ it != frame_events.end(); |
+ ++it) { |
+ env->Logging()->InsertFrameEvent(it->timestamp, |
+ it->type, |
+ it->media_type, |
+ it->rtp_timestamp, |
+ it->frame_id); |
+ } |
} |
void GotVideoFrame( |
@@ -265,8 +276,8 @@ void RunSimulation(const base::FilePath& source_path, |
// Connect sender to receiver. This initializes the pipe. |
receiver_to_sender.Initialize( |
- ipp.NewBuffer(128 * 1024), cast_sender->packet_receiver(), task_runner, |
- &testing_clock); |
+ ipp.NewBuffer(128 * 1024), transport_sender->PacketReceiverForTesting(), |
+ task_runner, &testing_clock); |
sender_to_receiver.Initialize( |
ipp.NewBuffer(128 * 1024), cast_receiver->packet_receiver(), task_runner, |
&testing_clock); |