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

Unified Diff: media/cast/transport/pacing/paced_sender.cc

Issue 270493003: Cast: Deduplicate event types in cast library. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 7 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/test/end2end_unittest.cc ('k') | media/cast/transport/pacing/paced_sender_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/transport/pacing/paced_sender.cc
diff --git a/media/cast/transport/pacing/paced_sender.cc b/media/cast/transport/pacing/paced_sender.cc
index d4b502119baa8390382a31e749f51662aa510ffd..a401817ae8f7cf30b535ee3a7aa71a5c821a3e56 100644
--- a/media/cast/transport/pacing/paced_sender.cc
+++ b/media/cast/transport/pacing/paced_sender.cc
@@ -21,21 +21,9 @@ static const size_t kPacingMaxBurstsPerFrame = 3;
static const size_t kTargetBurstSize = 10;
static const size_t kMaxBurstSize = 20;
-using media::cast::CastLoggingEvent;
-
-CastLoggingEvent GetLoggingEvent(bool is_audio, bool retransmit) {
- if (retransmit) {
- return is_audio ? media::cast::kAudioPacketRetransmitted
- : media::cast::kVideoPacketRetransmitted;
- } else {
- return is_audio ? media::cast::kAudioPacketSentToNetwork
- : media::cast::kVideoPacketSentToNetwork;
- }
-}
-
} // namespace
-
+// static
PacketKey PacedPacketSender::MakePacketKey(const base::TimeTicks& ticks,
uint32 ssrc,
uint16 packet_id) {
@@ -232,9 +220,11 @@ void PacedSender::LogPacketEvent(const Packet& packet, bool retransmit) {
return;
}
- CastLoggingEvent event = GetLoggingEvent(is_audio, retransmit);
-
- logging_->InsertSinglePacketEvent(clock_->NowTicks(), event, packet);
+ CastLoggingEvent event = retransmit ?
+ PACKET_RETRANSMITTED : PACKET_SENT_TO_NETWORK;
+ EventMediaType media_type = is_audio ? AUDIO_EVENT : VIDEO_EVENT;
+ logging_->InsertSinglePacketEvent(clock_->NowTicks(), event, media_type,
+ packet);
}
} // namespace transport
« no previous file with comments | « media/cast/test/end2end_unittest.cc ('k') | media/cast/transport/pacing/paced_sender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698