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

Unified Diff: media/cast/rtcp/sender_rtcp_event_subscriber.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/rtcp/rtcp_utility.cc ('k') | media/cast/rtcp/sender_rtcp_event_subscriber_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/rtcp/sender_rtcp_event_subscriber.cc
diff --git a/media/cast/rtcp/sender_rtcp_event_subscriber.cc b/media/cast/rtcp/sender_rtcp_event_subscriber.cc
index 05bcf3b7a86380b33a32a51b386a34be32152124..6a44b339065da13baf61519aeaa6198b8d6eb125 100644
--- a/media/cast/rtcp/sender_rtcp_event_subscriber.cc
+++ b/media/cast/rtcp/sender_rtcp_event_subscriber.cc
@@ -25,9 +25,10 @@ SenderRtcpEventSubscriber::~SenderRtcpEventSubscriber() {
void SenderRtcpEventSubscriber::OnReceiveFrameEvent(
const FrameEvent& frame_event) {
DCHECK(thread_checker_.CalledOnValidThread());
- if (frame_event.type != kVideoFrameCaptureBegin &&
- frame_event.type != kVideoFrameSentToEncoder &&
- frame_event.type != kVideoFrameEncoded) {
+ if (frame_event.media_type != VIDEO_EVENT)
+ return;
+ if (frame_event.type != FRAME_CAPTURE_BEGIN &&
+ frame_event.type != FRAME_ENCODED) {
// Not interested in other events.
return;
}
@@ -48,11 +49,11 @@ void SenderRtcpEventSubscriber::OnReceiveFrameEvent(
// We already have this frame (RTP timestamp) in our map.
// Only update events that are later in the chain.
// This is due to that events can be reordered on the wire.
- if (frame_event.type == kVideoFrameCaptureBegin) {
+ if (frame_event.type == FRAME_CAPTURE_BEGIN) {
return; // First event in chain can not be late by definition.
}
- if (it->second.type == kVideoFrameEncoded) {
+ if (it->second.type == FRAME_ENCODED) {
return; // Last event in chain should not be updated.
}
« no previous file with comments | « media/cast/rtcp/rtcp_utility.cc ('k') | media/cast/rtcp/sender_rtcp_event_subscriber_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698