Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(702)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cast/logging/encoding_event_subscriber_unittest.cc

Issue 178073004: Cast: IPC from browser to renderer to send packet events from transport to cast library. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/cast_receiver_impl.cc ('k') | media/cast/logging/logging.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/logging/encoding_event_subscriber_unittest.cc
diff --git a/media/cast/logging/encoding_event_subscriber_unittest.cc b/media/cast/logging/encoding_event_subscriber_unittest.cc
index 3b4583758ace9a3fe3cc86146c2a02df9be2a704..e670695065340226222e57a559daa1f4500cd271 100644
--- a/media/cast/logging/encoding_event_subscriber_unittest.cc
+++ b/media/cast/logging/encoding_event_subscriber_unittest.cc
@@ -325,20 +325,28 @@ TEST_F(EncodingEventSubscriberTest, PacketEvent) {
}
TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForPacket) {
- Init(OTHER_EVENT);
+ Init(VIDEO_EVENT);
base::TimeTicks now1(testing_clock_->NowTicks());
RtpTimestamp rtp_timestamp = 100;
int packet_id = 2;
int size = 100;
- cast_environment_->Logging()->InsertPacketEvent(
- now1, kPacketSentToPacer, rtp_timestamp, /*frame_id*/ 0, packet_id,
- /*max_packet_id*/ 10, size);
+ cast_environment_->Logging()->InsertPacketEvent(now1,
+ kVideoPacketSentToPacer,
+ rtp_timestamp,
+ /*frame_id*/ 0,
+ packet_id,
+ /*max_packet_id*/ 10,
+ size);
testing_clock_->Advance(base::TimeDelta::FromMilliseconds(20));
base::TimeTicks now2(testing_clock_->NowTicks());
- cast_environment_->Logging()->InsertPacketEvent(
- now2, kPacketSentToNetwork, rtp_timestamp, /*frame_id*/ 0, packet_id,
- /*max_packet_id*/ 10, size);
+ cast_environment_->Logging()->InsertPacketEvent(now2,
+ kVideoPacketSentToNetwork,
+ rtp_timestamp,
+ /*frame_id*/ 0,
+ packet_id,
+ /*max_packet_id*/ 10,
+ size);
GetEventsAndReset();
@@ -356,8 +364,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::PACKET_SENT_TO_PACER, base_event.event_type(0));
- EXPECT_EQ(media::cast::proto::PACKET_SENT_TO_NETWORK,
+ 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(1));
ASSERT_EQ(2, base_event.event_timestamp_micros_size());
EXPECT_EQ(now1.ToInternalValue(), base_event.event_timestamp_micros(0));
@@ -365,21 +374,29 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForPacket) {
}
TEST_F(EncodingEventSubscriberTest, MultiplePacketEventsForFrame) {
- Init(OTHER_EVENT);
+ Init(VIDEO_EVENT);
base::TimeTicks now1(testing_clock_->NowTicks());
RtpTimestamp rtp_timestamp = 100;
int packet_id_1 = 2;
int packet_id_2 = 3;
int size = 100;
- cast_environment_->Logging()->InsertPacketEvent(
- now1, kPacketSentToPacer, rtp_timestamp, /*frame_id*/ 0, packet_id_1,
- /*max_packet_id*/ 10, size);
+ cast_environment_->Logging()->InsertPacketEvent(now1,
+ kVideoPacketSentToPacer,
+ rtp_timestamp,
+ /*frame_id*/ 0,
+ packet_id_1,
+ /*max_packet_id*/ 10,
+ size);
testing_clock_->Advance(base::TimeDelta::FromMilliseconds(20));
base::TimeTicks now2(testing_clock_->NowTicks());
- cast_environment_->Logging()->InsertPacketEvent(
- now2, kPacketRetransmitted, rtp_timestamp, /*frame_id*/ 0, packet_id_2,
- /*max_packet_id*/ 10, size);
+ cast_environment_->Logging()->InsertPacketEvent(now2,
+ kVideoPacketRetransmitted,
+ rtp_timestamp,
+ /*frame_id*/ 0,
+ packet_id_2,
+ /*max_packet_id*/ 10,
+ size);
GetEventsAndReset();
@@ -397,36 +414,45 @@ 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::PACKET_SENT_TO_PACER, base_event.event_type(0));
+ EXPECT_EQ(media::cast::proto::VIDEO_PACKET_SENT_TO_PACER,
+ base_event.event_type(0));
ASSERT_EQ(1, base_event.event_timestamp_micros_size());
EXPECT_EQ(now1.ToInternalValue(), base_event.event_timestamp_micros(0));
const BasePacketEvent& base_event_2 = event->base_packet_event(1);
EXPECT_EQ(packet_id_2, base_event_2.packet_id());
ASSERT_EQ(1, base_event_2.event_type_size());
- EXPECT_EQ(media::cast::proto::PACKET_RETRANSMITTED,
+ EXPECT_EQ(media::cast::proto::VIDEO_PACKET_RETRANSMITTED,
base_event_2.event_type(0));
ASSERT_EQ(1, base_event_2.event_timestamp_micros_size());
EXPECT_EQ(now2.ToInternalValue(), base_event_2.event_timestamp_micros(0));
}
TEST_F(EncodingEventSubscriberTest, MultiplePacketEvents) {
- Init(OTHER_EVENT);
+ Init(VIDEO_EVENT);
base::TimeTicks now1(testing_clock_->NowTicks());
RtpTimestamp rtp_timestamp_1 = 100;
RtpTimestamp rtp_timestamp_2 = 200;
int packet_id_1 = 2;
int packet_id_2 = 3;
int size = 100;
- cast_environment_->Logging()->InsertPacketEvent(
- now1, kPacketSentToPacer, rtp_timestamp_1, /*frame_id*/ 0, packet_id_1,
- /*max_packet_id*/ 10, size);
+ cast_environment_->Logging()->InsertPacketEvent(now1,
+ kVideoPacketSentToPacer,
+ rtp_timestamp_1,
+ /*frame_id*/ 0,
+ packet_id_1,
+ /*max_packet_id*/ 10,
+ size);
testing_clock_->Advance(base::TimeDelta::FromMilliseconds(20));
base::TimeTicks now2(testing_clock_->NowTicks());
- cast_environment_->Logging()->InsertPacketEvent(
- now2, kPacketRetransmitted, rtp_timestamp_2, /*frame_id*/ 0, packet_id_2,
- /*max_packet_id*/ 10, size);
+ cast_environment_->Logging()->InsertPacketEvent(now2,
+ kVideoPacketRetransmitted,
+ rtp_timestamp_2,
+ /*frame_id*/ 0,
+ packet_id_2,
+ /*max_packet_id*/ 10,
+ size);
GetEventsAndReset();
@@ -444,7 +470,8 @@ 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::PACKET_SENT_TO_PACER, base_event.event_type(0));
+ EXPECT_EQ(media::cast::proto::VIDEO_PACKET_SENT_TO_PACER,
+ base_event.event_type(0));
ASSERT_EQ(1, base_event.event_timestamp_micros_size());
EXPECT_EQ(now1.ToInternalValue(), base_event.event_timestamp_micros(0));
@@ -460,7 +487,7 @@ TEST_F(EncodingEventSubscriberTest, MultiplePacketEvents) {
const BasePacketEvent& base_event_2 = event->base_packet_event(0);
EXPECT_EQ(packet_id_2, base_event_2.packet_id());
ASSERT_EQ(1, base_event_2.event_type_size());
- EXPECT_EQ(media::cast::proto::PACKET_RETRANSMITTED,
+ EXPECT_EQ(media::cast::proto::VIDEO_PACKET_RETRANSMITTED,
base_event_2.event_type(0));
ASSERT_EQ(1, base_event_2.event_timestamp_micros_size());
EXPECT_EQ(now2.ToInternalValue(), base_event_2.event_timestamp_micros(0));
« no previous file with comments | « media/cast/cast_receiver_impl.cc ('k') | media/cast/logging/logging.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698