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

6 files changed, 10 insertions, 19 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.