Cast: Remove logging of k{AV}PacketSentToPacer events.

We don't need to log these events since we already have kAVFrameEncoded
and kAVPacketSentToNetwork.

BUG=366198

Review URL: https://codereview.chromium.org/256943002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267108 0039d316-1c4b-4281-b951-d872f2087c98

16 files changed, 19 insertions, 77 deletions

diff --git a/media/cast/logging/encoding_event_subscriber_unittest.cc b/media/cast/logging/encoding_event_subscriber_unittest.cc
index eafe3f1..cdaed1f 100644
--- a/media/cast/logging/encoding_event_subscriber_unittest.cc
+++ b/media/cast/logging/encoding_event_subscriber_unittest.cc
@@ -343,7 +343,7 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForPacket) {
   int packet_id = 2;
   int size = 100;
   cast_environment_->Logging()->InsertPacketEvent(now1,
-                                                  kVideoPacketSentToPacer,
+                                                  kVideoPacketSentToNetwork,
                                                   rtp_timestamp,
                                                   /*frame_id*/ 0,
                                                   packet_id,
@@ -353,7 +353,7 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForPacket) {
   testing_clock_->Advance(base::TimeDelta::FromMilliseconds(20));
   base::TimeTicks now2(testing_clock_->NowTicks());
   cast_environment_->Logging()->InsertPacketEvent(now2,
-                                                  kVideoPacketSentToNetwork,
+                                                  kVideoPacketRetransmitted,
                                                   rtp_timestamp,
                                                   /*frame_id*/ 0,
                                                   packet_id,
@@ -375,9 +375,9 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForPacket) {
   const BasePacketEvent& base_event = event->base_packet_event(0);
   EXPECT_EQ(packet_id, base_event.packet_id());
   ASSERT_EQ(2, base_event.event_type_size());
-  EXPECT_EQ(media::cast::proto::VIDEO_PACKET_SENT_TO_PACER,
-            base_event.event_type(0));
   EXPECT_EQ(media::cast::proto::VIDEO_PACKET_SENT_TO_NETWORK,
+            base_event.event_type(0));
+  EXPECT_EQ(media::cast::proto::VIDEO_PACKET_RETRANSMITTED,
             base_event.event_type(1));
   ASSERT_EQ(2, base_event.event_timestamp_ms_size());
   EXPECT_EQ(InMilliseconds(now1), base_event.event_timestamp_ms(0));
@@ -392,7 +392,7 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForFrame) {
   int packet_id_2 = 3;
   int size = 100;
   cast_environment_->Logging()->InsertPacketEvent(now1,
-                                                  kVideoPacketSentToPacer,
+                                                  kVideoPacketSentToNetwork,
                                                   rtp_timestamp,
                                                   /*frame_id*/ 0,
                                                   packet_id_1,
@@ -424,7 +424,7 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForFrame) {
   const BasePacketEvent& base_event = event->base_packet_event(0);
   EXPECT_EQ(packet_id_1, base_event.packet_id());
   ASSERT_EQ(1, base_event.event_type_size());
-  EXPECT_EQ(media::cast::proto::VIDEO_PACKET_SENT_TO_PACER,
+  EXPECT_EQ(media::cast::proto::VIDEO_PACKET_SENT_TO_NETWORK,
             base_event.event_type(0));
   ASSERT_EQ(1, base_event.event_timestamp_ms_size());
   EXPECT_EQ(InMilliseconds(now1), base_event.event_timestamp_ms(0));
@@ -447,7 +447,7 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEvents) {
   int packet_id_2 = 3;
   int size = 100;
   cast_environment_->Logging()->InsertPacketEvent(now1,
-                                                  kVideoPacketSentToPacer,
+                                                  kVideoPacketSentToNetwork,
                                                   rtp_timestamp_1,
                                                   /*frame_id*/ 0,
                                                   packet_id_1,
@@ -479,7 +479,7 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEvents) {
   const BasePacketEvent& base_event = event->base_packet_event(0);
   EXPECT_EQ(packet_id_1, base_event.packet_id());
   ASSERT_EQ(1, base_event.event_type_size());
-  EXPECT_EQ(media::cast::proto::VIDEO_PACKET_SENT_TO_PACER,
+  EXPECT_EQ(media::cast::proto::VIDEO_PACKET_SENT_TO_NETWORK,
             base_event.event_type(0));
   ASSERT_EQ(1, base_event.event_timestamp_ms_size());
   EXPECT_EQ(InMilliseconds(now1), base_event.event_timestamp_ms(0));
diff --git a/media/cast/logging/logging_defines.cc b/media/cast/logging/logging_defines.cc
index e86f02b..4452d99 100644
--- a/media/cast/logging/logging_defines.cc
+++ b/media/cast/logging/logging_defines.cc
@@ -36,8 +36,6 @@ const char* CastLoggingToString(CastLoggingEvent event) {
     ENUM_TO_STRING(VideoFrameEncoded);
     ENUM_TO_STRING(VideoFrameDecoded);
     ENUM_TO_STRING(VideoRenderDelay);
-    ENUM_TO_STRING(AudioPacketSentToPacer);
-    ENUM_TO_STRING(VideoPacketSentToPacer);
     ENUM_TO_STRING(AudioPacketSentToNetwork);
     ENUM_TO_STRING(VideoPacketSentToNetwork);
     ENUM_TO_STRING(AudioPacketRetransmitted);
@@ -65,7 +63,6 @@ EventMediaType GetEventMediaType(CastLoggingEvent event) {
     case kAudioFrameEncoded:
     case kAudioPlayoutDelay:
     case kAudioFrameDecoded:
-    case kAudioPacketSentToPacer:
     case kAudioPacketSentToNetwork:
     case kAudioPacketRetransmitted:
     case kAudioPacketReceived:
@@ -79,7 +76,6 @@ EventMediaType GetEventMediaType(CastLoggingEvent event) {
     case kVideoFrameEncoded:
     case kVideoFrameDecoded:
     case kVideoRenderDelay:
-    case kVideoPacketSentToPacer:
     case kVideoPacketSentToNetwork:
     case kVideoPacketRetransmitted:
     case kVideoPacketReceived:
diff --git a/media/cast/logging/logging_defines.h b/media/cast/logging/logging_defines.h
index a87d2d5..3acf6f9 100644
--- a/media/cast/logging/logging_defines.h
+++ b/media/cast/logging/logging_defines.h
@@ -45,8 +45,6 @@ enum CastLoggingEvent {
   kVideoFrameDecoded,
   kVideoRenderDelay,
   // Send-side packet events.
-  kAudioPacketSentToPacer,
-  kVideoPacketSentToPacer,
   kAudioPacketSentToNetwork,
   kVideoPacketSentToNetwork,
   kAudioPacketRetransmitted,
diff --git a/media/cast/logging/proto/proto_utils.cc b/media/cast/logging/proto/proto_utils.cc
index 3d5b0cd..6ca194b 100644
--- a/media/cast/logging/proto/proto_utils.cc
+++ b/media/cast/logging/proto/proto_utils.cc
@@ -34,8 +34,6 @@ media::cast::proto::EventType ToProtoEventType(CastLoggingEvent event) {
     TO_PROTO_ENUM(kVideoFrameEncoded, VIDEO_FRAME_ENCODED);
     TO_PROTO_ENUM(kVideoFrameDecoded, VIDEO_FRAME_DECODED);
     TO_PROTO_ENUM(kVideoRenderDelay, VIDEO_RENDER_DELAY);
-    TO_PROTO_ENUM(kAudioPacketSentToPacer, AUDIO_PACKET_SENT_TO_PACER);
-    TO_PROTO_ENUM(kVideoPacketSentToPacer, VIDEO_PACKET_SENT_TO_PACER);
     TO_PROTO_ENUM(kAudioPacketSentToNetwork, AUDIO_PACKET_SENT_TO_NETWORK);
     TO_PROTO_ENUM(kVideoPacketSentToNetwork, VIDEO_PACKET_SENT_TO_NETWORK);
     TO_PROTO_ENUM(kAudioPacketRetransmitted, AUDIO_PACKET_RETRANSMITTED);
diff --git a/media/cast/logging/proto/raw_events.proto b/media/cast/logging/proto/raw_events.proto
index 6d15bbe..dbd259d 100644
--- a/media/cast/logging/proto/raw_events.proto
+++ b/media/cast/logging/proto/raw_events.proto
@@ -40,8 +40,8 @@ enum EventType {
   VIDEO_FRAME_DECODED = 17;
   VIDEO_RENDER_DELAY = 18;
   // Send-side packet events.
-  AUDIO_PACKET_SENT_TO_PACER = 19;
-  VIDEO_PACKET_SENT_TO_PACER = 20;
+  // AUDIO_PACKET_SENT_TO_PACER = 19;  // Deprecated
+  // VIDEO_PACKET_SENT_TO_PACER = 20;  // Deprecated
   AUDIO_PACKET_SENT_TO_NETWORK = 21;
   VIDEO_PACKET_SENT_TO_NETWORK = 22;
   AUDIO_PACKET_RETRANSMITTED = 23;
diff --git a/media/cast/logging/serialize_deserialize_test.cc b/media/cast/logging/serialize_deserialize_test.cc
index 8844727..d1d7a4a 100644
--- a/media/cast/logging/serialize_deserialize_test.cc
+++ b/media/cast/logging/serialize_deserialize_test.cc
@@ -25,7 +25,6 @@ const media::cast::CastLoggingEvent kVideoFrameEvents[] = {
     media::cast::kVideoFrameDecoded,       media::cast::kVideoRenderDelay};
 
 const media::cast::CastLoggingEvent kVideoPacketEvents[] = {
-    media::cast::kVideoPacketSentToPacer,
     media::cast::kVideoPacketSentToNetwork, media::cast::kVideoPacketReceived};
 
 // The frame event fields cycle through these numbers.
diff --git a/media/cast/transport/cast_transport_sender_impl.cc b/media/cast/transport/cast_transport_sender_impl.cc
index ba97a96..6a60347 100644
--- a/media/cast/transport/cast_transport_sender_impl.cc
+++ b/media/cast/transport/cast_transport_sender_impl.cc
@@ -76,7 +76,7 @@ void CastTransportSenderImpl::InitializeAudio(
     const CastTransportAudioConfig& config) {
   pacer_.RegisterAudioSsrc(config.base.ssrc);
   audio_sender_.reset(new TransportAudioSender(
-      config, clock_, &logging_, transport_task_runner_, &pacer_));
+      config, clock_, transport_task_runner_, &pacer_));
   if (audio_sender_->initialized())
     status_callback_.Run(TRANSPORT_AUDIO_INITIALIZED);
   else
@@ -87,7 +87,7 @@ void CastTransportSenderImpl::InitializeVideo(
     const CastTransportVideoConfig& config) {
   pacer_.RegisterVideoSsrc(config.base.ssrc);
   video_sender_.reset(new TransportVideoSender(
-      config, clock_, &logging_, transport_task_runner_, &pacer_));
+      config, clock_, transport_task_runner_, &pacer_));
   if (video_sender_->initialized())
     status_callback_.Run(TRANSPORT_VIDEO_INITIALIZED);
   else
diff --git a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
index 0acb575..3a72faf 100644
--- a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
+++ b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc
@@ -31,14 +31,10 @@ RtpPacketizerConfig::~RtpPacketizerConfig() {}
 
 RtpPacketizer::RtpPacketizer(PacedSender* const transport,
                              PacketStorage* packet_storage,
-                             RtpPacketizerConfig rtp_packetizer_config,
-                             base::TickClock* clock,
-                             LoggingImpl* logging)
+                             RtpPacketizerConfig rtp_packetizer_config)
     : config_(rtp_packetizer_config),
       transport_(transport),
       packet_storage_(packet_storage),
-      clock_(clock),
-      logging_(logging),
       sequence_number_(config_.sequence_number),
       rtp_timestamp_(0),
       packet_id_(0),
@@ -112,7 +108,6 @@ void RtpPacketizer::Cast(bool is_key,
   DCHECK_LE(payload_length, max_length) << "Invalid argument";
 
   SendPacketVector packets;
-  PacketList packets_for_logging;
 
   size_t remaining_size = data.size();
   std::string::const_iterator data_iter = data.begin();
@@ -155,15 +150,9 @@ void RtpPacketizer::Cast(bool is_key,
     ++send_packets_count_;
     send_octet_count_ += payload_length;
     packets.push_back(make_pair(key, packet));
-    packets_for_logging.push_back(packet);
   }
   DCHECK(packet_id_ == num_packets) << "Invalid state";
 
-  logging_->InsertPacketListEvent(
-      clock_->NowTicks(),
-      config_.audio ? kAudioPacketSentToPacer : kVideoPacketSentToPacer,
-      packets_for_logging);
-
   // Send to network.
   transport_->SendPackets(packets);
 
diff --git a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h
index fb7293a..2b90638 100644
--- a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h
+++ b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h
@@ -13,15 +13,12 @@
 #include "media/cast/transport/rtp_sender/packet_storage/packet_storage.h"
 
 namespace base {
-
 class TickClock;
 }
 
 namespace media {
 namespace cast {
 
-class LoggingImpl;
-
 namespace transport {
 
 class PacedSender;
@@ -55,9 +52,7 @@ class RtpPacketizer {
  public:
   RtpPacketizer(PacedSender* const transport,
                 PacketStorage* packet_storage,
-                RtpPacketizerConfig rtp_packetizer_config,
-                base::TickClock* clock,
-                LoggingImpl* logging);
+                RtpPacketizerConfig rtp_packetizer_config);
   ~RtpPacketizer();
 
   // The video_frame objects ownership is handled by the main cast thread.
@@ -92,8 +87,6 @@ class RtpPacketizer {
   RtpPacketizerConfig config_;
   PacedSender* const transport_;  // Not owned by this class.
   PacketStorage* packet_storage_;
-  base::TickClock* const clock_;  // Not owned by this class.
-  LoggingImpl* const logging_;    // Not owned by this class.
 
   base::TimeTicks time_last_sent_rtp_timestamp_;
   uint16 sequence_number_;
diff --git a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc
index 40dddde..1a51b89 100644
--- a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc
+++ b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc
@@ -103,7 +103,6 @@ class RtpPacketizerTest : public ::testing::Test {
       : task_runner_(new test::FakeSingleThreadTaskRunner(&testing_clock_)),
         video_frame_(),
         packet_storage_(&testing_clock_, kMaxPacketStorageTimeMs) {
-    logging_.AddRawEventSubscriber(&subscriber_);
     config_.sequence_number = kSeqNum;
     config_.ssrc = kSsrc;
     config_.payload_type = kPayload;
@@ -113,7 +112,7 @@ class RtpPacketizerTest : public ::testing::Test {
         &testing_clock_, &logging_, transport_.get(), task_runner_));
     pacer_->RegisterVideoSsrc(config_.ssrc);
     rtp_packetizer_.reset(new RtpPacketizer(
-        pacer_.get(), &packet_storage_, config_, &testing_clock_, &logging_));
+        pacer_.get(), &packet_storage_, config_));
     video_frame_.key_frame = false;
     video_frame_.frame_id = 0;
     video_frame_.last_referenced_frame_id = kStartFrameId;
@@ -122,10 +121,6 @@ class RtpPacketizerTest : public ::testing::Test {
         GetVideoRtpTimestamp(testing_clock_.NowTicks());
   }
 
-  virtual ~RtpPacketizerTest() {
-    logging_.RemoveRawEventSubscriber(&subscriber_);
-  }
-
   void RunTasks(int during_ms) {
     for (int i = 0; i < during_ms; ++i) {
       // Call process the timers every 1 ms.
@@ -141,7 +136,6 @@ class RtpPacketizerTest : public ::testing::Test {
   RtpPacketizerConfig config_;
   scoped_ptr<TestRtpPacketTransport> transport_;
   LoggingImpl logging_;
-  SimpleEventSubscriber subscriber_;
   scoped_ptr<PacedSender> pacer_;
   scoped_ptr<RtpPacketizer> rtp_packetizer_;
 
@@ -158,18 +152,6 @@ TEST_F(RtpPacketizerTest, SendStandardPackets) {
   rtp_packetizer_->IncomingEncodedVideoFrame(&video_frame_, time);
   RunTasks(33 + 1);
   EXPECT_EQ(expected_num_of_packets, transport_->number_of_packets_received());
-  std::vector<PacketEvent> packet_events;
-  subscriber_.GetPacketEventsAndReset(&packet_events);
-  int expected_num_video_sent_to_pacer_count = expected_num_of_packets;
-  int num_video_sent_to_pacer_count = 0;
-  for (std::vector<PacketEvent>::iterator it = packet_events.begin();
-       it != packet_events.end();
-       ++it) {
-    if (it->type == kVideoPacketSentToPacer)
-      num_video_sent_to_pacer_count++;
-  }
-  EXPECT_EQ(expected_num_video_sent_to_pacer_count,
-            num_video_sent_to_pacer_count);
 }
 
 TEST_F(RtpPacketizerTest, Stats) {
diff --git a/media/cast/transport/rtp_sender/rtp_sender.cc b/media/cast/transport/rtp_sender/rtp_sender.cc
index 9f89119..41bb97e 100644
--- a/media/cast/transport/rtp_sender/rtp_sender.cc
+++ b/media/cast/transport/rtp_sender/rtp_sender.cc
@@ -20,11 +20,9 @@ static const int kStatsCallbackIntervalMs = 33;
 
 RtpSender::RtpSender(
     base::TickClock* clock,
-    LoggingImpl* logging,
     const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner,
     PacedSender* const transport)
     : clock_(clock),
-      logging_(logging),
       transport_(transport),
       stats_callback_(),
       transport_task_runner_(transport_task_runner),
@@ -43,7 +41,7 @@ void RtpSender::InitializeAudio(const CastTransportAudioConfig& config) {
   config_.frequency = config.frequency;
   config_.audio_codec = config.codec;
   packetizer_.reset(
-      new RtpPacketizer(transport_, storage_.get(), config_, clock_, logging_));
+      new RtpPacketizer(transport_, storage_.get(), config_));
 }
 
 void RtpSender::InitializeVideo(const CastTransportVideoConfig& config) {
@@ -54,7 +52,7 @@ void RtpSender::InitializeVideo(const CastTransportVideoConfig& config) {
   config_.frequency = kVideoFrequency;
   config_.video_codec = config.codec;
   packetizer_.reset(
-      new RtpPacketizer(transport_, storage_.get(), config_, clock_, logging_));
+      new RtpPacketizer(transport_, storage_.get(), config_));
 }
 
 void RtpSender::IncomingEncodedVideoFrame(const EncodedVideoFrame* video_frame,
diff --git a/media/cast/transport/rtp_sender/rtp_sender.h b/media/cast/transport/rtp_sender/rtp_sender.h
index 761ed16..171ffe2 100644
--- a/media/cast/transport/rtp_sender/rtp_sender.h
+++ b/media/cast/transport/rtp_sender/rtp_sender.h
@@ -25,8 +25,6 @@
 namespace media {
 namespace cast {
 
-class LoggingImpl;
-
 namespace transport {
 
 // This object is only called from the main cast thread.
@@ -37,7 +35,6 @@ class RtpSender {
  public:
   RtpSender(
       base::TickClock* clock,
-      LoggingImpl* logging,
       const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner,
       PacedSender* const transport);
 
@@ -72,7 +69,6 @@ class RtpSender {
   void UpdateSequenceNumber(Packet* packet);
 
   base::TickClock* clock_;  // Not owned by this class.
-  LoggingImpl* logging_;    // Not owned by this class.
   RtpPacketizerConfig config_;
   scoped_ptr<RtpPacketizer> packetizer_;
   scoped_ptr<PacketStorage> storage_;
diff --git a/media/cast/transport/transport_audio_sender.cc b/media/cast/transport/transport_audio_sender.cc
index f7ef774..b704e23 100644
--- a/media/cast/transport/transport_audio_sender.cc
+++ b/media/cast/transport/transport_audio_sender.cc
@@ -16,10 +16,9 @@ namespace transport {
 TransportAudioSender::TransportAudioSender(
     const CastTransportAudioConfig& config,
     base::TickClock* clock,
-    LoggingImpl* logging,
     const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner,
     PacedSender* const paced_packet_sender)
-    : rtp_sender_(clock, logging, transport_task_runner, paced_packet_sender),
+    : rtp_sender_(clock, transport_task_runner, paced_packet_sender),
       encryptor_() {
   rtp_sender_.InitializeAudio(config);
   initialized_ =
diff --git a/media/cast/transport/transport_audio_sender.h b/media/cast/transport/transport_audio_sender.h
index 1fe0f16..33108e0 100644
--- a/media/cast/transport/transport_audio_sender.h
+++ b/media/cast/transport/transport_audio_sender.h
@@ -15,8 +15,6 @@
 namespace media {
 namespace cast {
 
-class LoggingImpl;
-
 namespace transport {
 
 class PacedSender;
@@ -27,7 +25,6 @@ class TransportAudioSender : public base::NonThreadSafe {
   TransportAudioSender(
       const CastTransportAudioConfig& config,
       base::TickClock* clock,
-      LoggingImpl* logging,
       const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner,
       PacedSender* const paced_packet_sender);
 
diff --git a/media/cast/transport/transport_video_sender.cc b/media/cast/transport/transport_video_sender.cc
index 7bfbb74..1862458 100644
--- a/media/cast/transport/transport_video_sender.cc
+++ b/media/cast/transport/transport_video_sender.cc
@@ -19,13 +19,12 @@ namespace transport {
 TransportVideoSender::TransportVideoSender(
     const CastTransportVideoConfig& config,
     base::TickClock* clock,
-    LoggingImpl* logging,
     const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner,
     PacedSender* const paced_packet_sender)
     : rtp_max_delay_(base::TimeDelta::FromMilliseconds(
           config.base.rtp_config.max_delay_ms)),
       encryptor_(),
-      rtp_sender_(clock, logging, transport_task_runner, paced_packet_sender) {
+      rtp_sender_(clock, transport_task_runner, paced_packet_sender) {
   rtp_sender_.InitializeVideo(config);
   initialized_ =
       encryptor_.Initialize(config.base.aes_key, config.base.aes_iv_mask);
diff --git a/media/cast/transport/transport_video_sender.h b/media/cast/transport/transport_video_sender.h
index be3dae8..9bb2267 100644
--- a/media/cast/transport/transport_video_sender.h
+++ b/media/cast/transport/transport_video_sender.h
@@ -18,7 +18,6 @@ namespace media {
 class VideoFrame;
 
 namespace cast {
-class LoggingImpl;
 
 namespace transport {
 class PacedSender;
@@ -31,7 +30,6 @@ class TransportVideoSender : public base::NonThreadSafe {
   TransportVideoSender(
       const CastTransportVideoConfig& config,
       base::TickClock* clock,
-      LoggingImpl* logging,
       const scoped_refptr<base::SingleThreadTaskRunner>& transport_task_runner,
       PacedSender* const paced_packet_sender);