diff options
| author | imcheng@chromium.org <imcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 00:14:12 +0000 |
|---|---|---|
| committer | imcheng@chromium.org <imcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 00:14:12 +0000 |
| commit | fb569a21367118278c4f01eed436ce1f913f48be (patch) | |
| tree | 34668b5012c3a936551060be317a8f039014e353 /media/cast/logging | |
| parent | 5b80944b7b87f1f0f105711198d731d5ec3b692e (diff) | |
| download | chromium_src-fb569a21367118278c4f01eed436ce1f913f48be.zip chromium_src-fb569a21367118278c4f01eed436ce1f913f48be.tar.gz chromium_src-fb569a21367118278c4f01eed436ce1f913f48be.tar.bz2 | |
Cast: Add missing enum and PacketEvent field to cast_messages.
Due to the event type refactoring landed earlier, an enum field
EventMediaType was added to PacketEvent. PacketEvent is transmitted
via IPC from browser to renderer so we need to add them to the IPC
definition as well.
Also fix compile in cast_sender_app.
Review URL: https://codereview.chromium.org/279833003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270262 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cast/logging')
| -rw-r--r-- | media/cast/logging/encoding_event_subscriber.cc | 1 | ||||
| -rw-r--r-- | media/cast/logging/logging_defines.h | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/media/cast/logging/encoding_event_subscriber.cc b/media/cast/logging/encoding_event_subscriber.cc index 4940465..48cc911 100644 --- a/media/cast/logging/encoding_event_subscriber.cc +++ b/media/cast/logging/encoding_event_subscriber.cc @@ -116,6 +116,7 @@ void EncodingEventSubscriber::OnReceivePacketEvent( if (event_media_type_ != packet_event.media_type) return; + RtpTimestamp relative_rtp_timestamp = GetRelativeRtpTimestamp(packet_event.rtp_timestamp); PacketEventMap::iterator it = diff --git a/media/cast/logging/logging_defines.h b/media/cast/logging/logging_defines.h index 2af95d6..b3f3841 100644 --- a/media/cast/logging/logging_defines.h +++ b/media/cast/logging/logging_defines.h @@ -40,7 +40,12 @@ enum CastLoggingEvent { const char* CastLoggingToString(CastLoggingEvent event); // CastLoggingEvent are classified into one of three following types. -enum EventMediaType { AUDIO_EVENT, VIDEO_EVENT, UNKNOWN_EVENT }; +enum EventMediaType { + AUDIO_EVENT, + VIDEO_EVENT, + UNKNOWN_EVENT, + EVENT_MEDIA_TYPE_LAST = UNKNOWN_EVENT +}; struct FrameEvent { FrameEvent(); |