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

Side by Side Diff: third_party/WebKit/Source/core/html/track/TrackEvent.cpp

Issue 1659653002: Pass MSE media track info from ChunkDemuxer to blink::SourceBuffer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-media-tracks-in-media
Patch Set: nit Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 11 matching lines...) Expand all
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "core/html/track/TrackEvent.h" 26 #include "core/html/track/TrackEvent.h"
27 27
28 #include "bindings/core/v8/UnionTypesCore.h" 28 #include "bindings/core/v8/UnionTypesCore.h"
29 #include "core/html/track/AudioTrack.h" 29 #include "core/html/track/AudioTrack.h"
30 #include "core/html/track/TextTrack.h" 30 #include "core/html/track/TextTrack.h"
31 #include "core/html/track/VideoTrack.h" 31 #include "core/html/track/VideoTrack.h"
32 #include "public/platform/WebMediaPlayer.h"
32 33
33 namespace blink { 34 namespace blink {
34 35
35 TrackEvent::TrackEvent() 36 TrackEvent::TrackEvent()
36 { 37 {
37 } 38 }
38 39
39 TrackEvent::TrackEvent(const AtomicString& type, const TrackEventInit& initializ er) 40 TrackEvent::TrackEvent(const AtomicString& type, const TrackEventInit& initializ er)
40 : Event(type, initializer) 41 : Event(type, initializer)
41 { 42 {
(...skipping 19 matching lines...) Expand all
61 { 62 {
62 return EventNames::TrackEvent; 63 return EventNames::TrackEvent;
63 } 64 }
64 65
65 void TrackEvent::track(VideoTrackOrAudioTrackOrTextTrack& returnValue) 66 void TrackEvent::track(VideoTrackOrAudioTrackOrTextTrack& returnValue)
66 { 67 {
67 if (!m_track) 68 if (!m_track)
68 return; 69 return;
69 70
70 switch (m_track->type()) { 71 switch (m_track->type()) {
71 case TrackBase::TextTrack: 72 case WebMediaPlayer::TextTrack:
72 returnValue.setTextTrack(toTextTrack(m_track.get())); 73 returnValue.setTextTrack(toTextTrack(m_track.get()));
73 break; 74 break;
74 case TrackBase::AudioTrack: 75 case WebMediaPlayer::AudioTrack:
75 returnValue.setAudioTrack(toAudioTrack(m_track.get())); 76 returnValue.setAudioTrack(toAudioTrack(m_track.get()));
76 break; 77 break;
77 case TrackBase::VideoTrack: 78 case WebMediaPlayer::VideoTrack:
78 returnValue.setVideoTrack(toVideoTrack(m_track.get())); 79 returnValue.setVideoTrack(toVideoTrack(m_track.get()));
79 break; 80 break;
80 default: 81 default:
81 ASSERT_NOT_REACHED(); 82 ASSERT_NOT_REACHED();
82 } 83 }
83 } 84 }
84 85
85 DEFINE_TRACE(TrackEvent) 86 DEFINE_TRACE(TrackEvent)
86 { 87 {
87 visitor->trace(m_track); 88 visitor->trace(m_track);
88 Event::trace(visitor); 89 Event::trace(visitor);
89 } 90 }
90 91
91 } // namespace blink 92 } // namespace blink
92 93
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698