Cast: Refactor RTCP handling

media/cast/test/sender.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Test application that simulates a cast sender - Data can be either generated
 // or read from a file.
 
 #include <queue>
 
 #include "base/at_exit.h"
@@ skipping 105 matching lines @@
   return video_config;
 }
 
 void UpdateCastTransportStatus(
     media::cast::CastTransportStatus status) {
   VLOG(1) << "Transport status: " << status;
 }
 
 void LogRawEvents(
     const scoped_refptr<media::cast::CastEnvironment>& cast_environment,
-    const std::vector<media::cast::PacketEvent>& packet_events) {
+    const std::vector<media::cast::PacketEvent>& packet_events,
+    const std::vector<media::cast::FrameEvent>& frame_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->media_type,
                                                    it->rtp_timestamp,
                                                    it->frame_id,
                                                    it->packet_id,
                                                    it->max_packet_id,
                                                    it->size);
   }
+  VLOG(1) << "Got frame events from transport, size: " << frame_events.size();
+  for (std::vector<media::cast::FrameEvent>::const_iterator it =
+           frame_events.begin();
+       it != frame_events.end();
+       ++it) {
+    cast_environment->Logging()->InsertFrameEvent(it->timestamp,
+                                                  it->type,
+                                                  it->media_type,
+                                                  it->rtp_timestamp,
+                                                  it->frame_id);
+  }
 }
 
 void InitializationResult(media::cast::CastInitializationStatus result) {
   bool end_result = result == media::cast::STATUS_AUDIO_INITIALIZED ||
                     result == media::cast::STATUS_VIDEO_INITIALIZED;
   CHECK(end_result) << "Cast sender uninitialized";
 }
 
 net::IPEndPoint CreateUDPAddress(std::string ip_str, int port) {
   net::IPAddressNumber ip_number;
@@ skipping 169 matching lines @@
 
   // CastSender initialization.
   scoped_ptr<media::cast::CastSender> cast_sender =
       media::cast::CastSender::Create(cast_environment, transport_sender.get());
   cast_sender->InitializeVideo(
       fake_media_source->get_video_config(),
       base::Bind(&InitializationResult),
       media::cast::CreateDefaultVideoEncodeAcceleratorCallback(),
       media::cast::CreateDefaultVideoEncodeMemoryCallback());
   cast_sender->InitializeAudio(audio_config, base::Bind(&InitializationResult));
-  transport_sender->SetPacketReceiver(cast_sender->packet_receiver());
 
   // Set up event subscribers.
   scoped_ptr<media::cast::EncodingEventSubscriber> video_event_subscriber;
   scoped_ptr<media::cast::EncodingEventSubscriber> audio_event_subscriber;
   std::string video_log_file_name("/tmp/video_events.log.gz");
   std::string audio_log_file_name("/tmp/audio_events.log.gz");
   LOG(INFO) << "Logging audio events to: " << audio_log_file_name;
   LOG(INFO) << "Logging video events to: " << video_log_file_name;
   video_event_subscriber.reset(new media::cast::EncodingEventSubscriber(
       media::cast::VIDEO_EVENT, 10000));
@@ skipping 52 matching lines @@
                  base::Passed(&audio_stats_subscriber),
                  base::Passed(&offset_estimator)),
       base::TimeDelta::FromSeconds(logging_duration_seconds));
 
   fake_media_source->Start(cast_sender->audio_frame_input(),
                            cast_sender->video_frame_input());
 
   io_message_loop.Run();
   return 0;
 }