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

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: rebase Created 4 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 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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"
wolenetz 2016/03/23 19:34:13 nit: include the webmediaplayer.h explicitly now?
servolk 2016/03/24 01:31:56 Done.
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 32
33 namespace blink { 33 namespace blink {
34 34
35 TrackEvent::TrackEvent() 35 TrackEvent::TrackEvent()
36 { 36 {
37 } 37 }
38 38
39 TrackEvent::TrackEvent(const AtomicString& type, const TrackEventInit& initializ er) 39 TrackEvent::TrackEvent(const AtomicString& type, const TrackEventInit& initializ er)
(...skipping 21 matching lines...) Expand all
61 { 61 {
62 return EventNames::TrackEvent; 62 return EventNames::TrackEvent;
63 } 63 }
64 64
65 void TrackEvent::track(VideoTrackOrAudioTrackOrTextTrack& returnValue) 65 void TrackEvent::track(VideoTrackOrAudioTrackOrTextTrack& returnValue)
66 { 66 {
67 if (!m_track) 67 if (!m_track)
68 return; 68 return;
69 69
70 switch (m_track->type()) { 70 switch (m_track->type()) {
71 case TrackBase::TextTrack: 71 case WebMediaPlayer::TextTrack:
72 returnValue.setTextTrack(toTextTrack(m_track.get())); 72 returnValue.setTextTrack(toTextTrack(m_track.get()));
73 break; 73 break;
74 case TrackBase::AudioTrack: 74 case WebMediaPlayer::AudioTrack:
75 returnValue.setAudioTrack(toAudioTrack(m_track.get())); 75 returnValue.setAudioTrack(toAudioTrack(m_track.get()));
76 break; 76 break;
77 case TrackBase::VideoTrack: 77 case WebMediaPlayer::VideoTrack:
78 returnValue.setVideoTrack(toVideoTrack(m_track.get())); 78 returnValue.setVideoTrack(toVideoTrack(m_track.get()));
79 break; 79 break;
80 default: 80 default:
81 ASSERT_NOT_REACHED(); 81 ASSERT_NOT_REACHED();
82 } 82 }
83 } 83 }
84 84
85 DEFINE_TRACE(TrackEvent) 85 DEFINE_TRACE(TrackEvent)
86 { 86 {
87 visitor->trace(m_track); 87 visitor->trace(m_track);
88 Event::trace(visitor); 88 Event::trace(visitor);
89 } 89 }
90 90
91 } // namespace blink 91 } // namespace blink
92 92
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698