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

Side by Side Diff: Source/modules/mediastream/MediaStream.cpp

Issue 545933002: Implement HTMLMediaElement::srcObject. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed sofs easy comments. Created 6 years, 3 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 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * Copyright (C) 2011, 2012 Ericsson AB. All rights reserved. 3 * Copyright (C) 2011, 2012 Ericsson AB. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 14 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 17 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
21 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
23 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "modules/mediastream/MediaStream.h" 27 #include "modules/mediastream/MediaStream.h"
28 28
29 #include "bindings/core/v8/ExceptionState.h" 29 #include "bindings/core/v8/ExceptionState.h"
30 #include "bindings/core/v8/ScriptValue.h"
31 #include "bindings/modules/v8/V8MediaStream.h"
32 #include "core/dom/DOMURL.h"
30 #include "core/dom/ExceptionCode.h" 33 #include "core/dom/ExceptionCode.h"
31 #include "modules/mediastream/MediaStreamRegistry.h" 34 #include "modules/mediastream/MediaStreamRegistry.h"
32 #include "modules/mediastream/MediaStreamTrackEvent.h" 35 #include "modules/mediastream/MediaStreamTrackEvent.h"
33 #include "platform/mediastream/MediaStreamCenter.h" 36 #include "platform/mediastream/MediaStreamCenter.h"
34 #include "platform/mediastream/MediaStreamSource.h" 37 #include "platform/mediastream/MediaStreamSource.h"
35 38
36 namespace blink { 39 namespace blink {
37 40
38 static bool containsSource(MediaStreamTrackVector& trackVector, MediaStreamSourc e* source) 41 static bool containsSource(MediaStreamTrackVector& trackVector, MediaStreamSourc e* source)
39 { 42 {
40 for (size_t i = 0; i < trackVector.size(); ++i) { 43 for (size_t i = 0; i < trackVector.size(); ++i) {
41 if (source->id() == trackVector[i]->component()->source()->id()) 44 if (source->id() == trackVector[i]->component()->source()->id())
42 return true; 45 return true;
43 } 46 }
44 return false; 47 return false;
45 } 48 }
46 49
47 static void processTrack(MediaStreamTrack* track, MediaStreamTrackVector& trackV ector) 50 static void processTrack(MediaStreamTrack* track, MediaStreamTrackVector& trackV ector)
48 { 51 {
49 if (track->ended()) 52 if (track->ended())
50 return; 53 return;
51 54
52 MediaStreamSource* source = track->component()->source(); 55 MediaStreamSource* source = track->component()->source();
53 if (!containsSource(trackVector, source)) 56 if (!containsSource(trackVector, source))
54 trackVector.append(track); 57 trackVector.append(track);
55 } 58 }
56 59
60 static MediaProvider* MediaProviderConverter(const ScriptValue& value)
61 {
62 v8::Handle<v8::Value> v8Value(value.v8Value());
63 return V8MediaStream::toImplWithTypeCheck(value.isolate(), v8Value);
haraken 2014/09/20 08:52:20 Hmm, I'm not really happy with writing this kind o
perkj_chrome 2014/09/24 11:39:39 But can bindings/core/v8/V8HTMLMediaElementCustom
64 }
65
57 MediaStream* MediaStream::create(ExecutionContext* context) 66 MediaStream* MediaStream::create(ExecutionContext* context)
58 { 67 {
59 MediaStreamTrackVector audioTracks; 68 MediaStreamTrackVector audioTracks;
60 MediaStreamTrackVector videoTracks; 69 MediaStreamTrackVector videoTracks;
61 70
62 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, au dioTracks, videoTracks)); 71 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, au dioTracks, videoTracks));
63 } 72 }
64 73
65 MediaStream* MediaStream::create(ExecutionContext* context, MediaStream* stream) 74 MediaStream* MediaStream::create(ExecutionContext* context, MediaStream* stream)
66 { 75 {
(...skipping 21 matching lines...) Expand all
88 97
89 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, au dioTracks, videoTracks)); 98 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, au dioTracks, videoTracks));
90 } 99 }
91 100
92 MediaStream* MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStre amDescriptor> streamDescriptor) 101 MediaStream* MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStre amDescriptor> streamDescriptor)
93 { 102 {
94 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, st reamDescriptor)); 103 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, st reamDescriptor));
95 } 104 }
96 105
97 MediaStream::MediaStream(ExecutionContext* context, PassRefPtr<MediaStreamDescri ptor> streamDescriptor) 106 MediaStream::MediaStream(ExecutionContext* context, PassRefPtr<MediaStreamDescri ptor> streamDescriptor)
98 : ContextLifecycleObserver(context) 107 : MediaProvider(EventTargetNames::MediaStream, bind<const ScriptValue&>(Medi aProviderConverter))
108 , ContextLifecycleObserver(context)
99 , m_stopped(false) 109 , m_stopped(false)
100 , m_descriptor(streamDescriptor) 110 , m_descriptor(streamDescriptor)
101 , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired) 111 , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired)
102 { 112 {
103 m_descriptor->setClient(this); 113 m_descriptor->setClient(this);
104 114
105 size_t numberOfAudioTracks = m_descriptor->numberOfAudioComponents(); 115 size_t numberOfAudioTracks = m_descriptor->numberOfAudioComponents();
106 m_audioTracks.reserveCapacity(numberOfAudioTracks); 116 m_audioTracks.reserveCapacity(numberOfAudioTracks);
107 for (size_t i = 0; i < numberOfAudioTracks; i++) { 117 for (size_t i = 0; i < numberOfAudioTracks; i++) {
108 MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descrip tor->audioComponent(i)); 118 MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descrip tor->audioComponent(i));
109 newTrack->registerMediaStream(this); 119 newTrack->registerMediaStream(this);
110 m_audioTracks.append(newTrack); 120 m_audioTracks.append(newTrack);
111 } 121 }
112 122
113 size_t numberOfVideoTracks = m_descriptor->numberOfVideoComponents(); 123 size_t numberOfVideoTracks = m_descriptor->numberOfVideoComponents();
114 m_videoTracks.reserveCapacity(numberOfVideoTracks); 124 m_videoTracks.reserveCapacity(numberOfVideoTracks);
115 for (size_t i = 0; i < numberOfVideoTracks; i++) { 125 for (size_t i = 0; i < numberOfVideoTracks; i++) {
116 MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descrip tor->videoComponent(i)); 126 MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descrip tor->videoComponent(i));
117 newTrack->registerMediaStream(this); 127 newTrack->registerMediaStream(this);
118 m_videoTracks.append(newTrack); 128 m_videoTracks.append(newTrack);
119 } 129 }
120 } 130 }
121 131
122 MediaStream::MediaStream(ExecutionContext* context, const MediaStreamTrackVector & audioTracks, const MediaStreamTrackVector& videoTracks) 132 MediaStream::MediaStream(ExecutionContext* context, const MediaStreamTrackVector & audioTracks, const MediaStreamTrackVector& videoTracks)
123 : ContextLifecycleObserver(context) 133 : MediaProvider(EventTargetNames::MediaStream, bind<const ScriptValue&>(Medi aProviderConverter))
134 , ContextLifecycleObserver(context)
124 , m_stopped(false) 135 , m_stopped(false)
125 , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired) 136 , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired)
126 { 137 {
127 MediaStreamComponentVector audioComponents; 138 MediaStreamComponentVector audioComponents;
128 MediaStreamComponentVector videoComponents; 139 MediaStreamComponentVector videoComponents;
129 140
130 MediaStreamTrackVector::const_iterator iter; 141 MediaStreamTrackVector::const_iterator iter;
131 for (iter = audioTracks.begin(); iter != audioTracks.end(); ++iter) { 142 for (iter = audioTracks.begin(); iter != audioTracks.end(); ++iter) {
132 (*iter)->registerMediaStream(this); 143 (*iter)->registerMediaStream(this);
133 audioComponents.append((*iter)->component()); 144 audioComponents.append((*iter)->component());
134 } 145 }
135 for (iter = videoTracks.begin(); iter != videoTracks.end(); ++iter) { 146 for (iter = videoTracks.begin(); iter != videoTracks.end(); ++iter) {
136 (*iter)->registerMediaStream(this); 147 (*iter)->registerMediaStream(this);
137 videoComponents.append((*iter)->component()); 148 videoComponents.append((*iter)->component());
138 } 149 }
139 150
140 m_descriptor = MediaStreamDescriptor::create(audioComponents, videoComponent s); 151 m_descriptor = MediaStreamDescriptor::create(audioComponents, videoComponent s);
141 m_descriptor->setClient(this); 152 m_descriptor->setClient(this);
142 MediaStreamCenter::instance().didCreateMediaStream(m_descriptor.get()); 153 MediaStreamCenter::instance().didCreateMediaStream(m_descriptor.get());
143 154
144 m_audioTracks = audioTracks; 155 m_audioTracks = audioTracks;
145 m_videoTracks = videoTracks; 156 m_videoTracks = videoTracks;
146 } 157 }
147 158
148 MediaStream::~MediaStream() 159 MediaStream::~MediaStream()
149 { 160 {
161 if (!m_objectUrl.isEmpty())
162 DOMURL::revokeObjectURL(executionContext(), m_objectUrl);
150 m_descriptor->setClient(0); 163 m_descriptor->setClient(0);
151 } 164 }
152 165
153 bool MediaStream::ended() const 166 bool MediaStream::ended() const
154 { 167 {
155 return m_stopped || m_descriptor->ended(); 168 return m_stopped || m_descriptor->ended();
156 } 169 }
157 170
158 MediaStreamTrackVector MediaStream::getTracks() 171 MediaStreamTrackVector MediaStream::getTracks()
159 { 172 {
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 dispatchEvent((*it).release()); 393 dispatchEvent((*it).release());
381 394
382 events.clear(); 395 events.clear();
383 } 396 }
384 397
385 URLRegistry& MediaStream::registry() const 398 URLRegistry& MediaStream::registry() const
386 { 399 {
387 return MediaStreamRegistry::registry(); 400 return MediaStreamRegistry::registry();
388 } 401 }
389 402
403 const String& MediaStream::getObjectUrl()
404 {
405 if (m_objectUrl.isEmpty())
406 m_objectUrl = DOMURL::createPublicURL(executionContext(), this);
407 return m_objectUrl;
408 }
409
390 void MediaStream::trace(Visitor* visitor) 410 void MediaStream::trace(Visitor* visitor)
391 { 411 {
392 visitor->trace(m_audioTracks); 412 visitor->trace(m_audioTracks);
393 visitor->trace(m_videoTracks); 413 visitor->trace(m_videoTracks);
394 visitor->trace(m_scheduledEvents); 414 visitor->trace(m_scheduledEvents);
415 MediaProvider::trace(visitor);
395 EventTargetWithInlineData::trace(visitor); 416 EventTargetWithInlineData::trace(visitor);
396 } 417 }
397 418
398 } // namespace blink 419 } // namespace blink
OLDNEW
« Source/core/html/MediaProvider.cpp ('K') | « Source/modules/mediastream/MediaStream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698