OLD | NEW |
---|---|
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 MediaStream* stream = V8MediaStream::toImplWithTypeCheck(value.isolate(), v8 Value); | |
sof
2014/09/19 06:26:23
return V8MediaStream::toImplWithTypeCheck(value.is
perkj_chrome
2014/09/19 10:48:06
Done.
| |
64 return stream; | |
65 } | |
66 | |
57 MediaStream* MediaStream::create(ExecutionContext* context) | 67 MediaStream* MediaStream::create(ExecutionContext* context) |
58 { | 68 { |
59 MediaStreamTrackVector audioTracks; | 69 MediaStreamTrackVector audioTracks; |
60 MediaStreamTrackVector videoTracks; | 70 MediaStreamTrackVector videoTracks; |
61 | 71 |
62 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, au dioTracks, videoTracks)); | 72 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, au dioTracks, videoTracks)); |
63 } | 73 } |
64 | 74 |
65 MediaStream* MediaStream::create(ExecutionContext* context, MediaStream* stream) | 75 MediaStream* MediaStream::create(ExecutionContext* context, MediaStream* stream) |
66 { | 76 { |
(...skipping 21 matching lines...) Expand all Loading... | |
88 | 98 |
89 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, au dioTracks, videoTracks)); | 99 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, au dioTracks, videoTracks)); |
90 } | 100 } |
91 | 101 |
92 MediaStream* MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStre amDescriptor> streamDescriptor) | 102 MediaStream* MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStre amDescriptor> streamDescriptor) |
93 { | 103 { |
94 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, st reamDescriptor)); | 104 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, st reamDescriptor)); |
95 } | 105 } |
96 | 106 |
97 MediaStream::MediaStream(ExecutionContext* context, PassRefPtr<MediaStreamDescri ptor> streamDescriptor) | 107 MediaStream::MediaStream(ExecutionContext* context, PassRefPtr<MediaStreamDescri ptor> streamDescriptor) |
98 : ContextLifecycleObserver(context) | 108 : MediaProvider(EventTargetNames::MediaStream, bind<const ScriptValue&>(Medi aProviderConverter)) |
109 , ContextLifecycleObserver(context) | |
99 , m_stopped(false) | 110 , m_stopped(false) |
100 , m_descriptor(streamDescriptor) | 111 , m_descriptor(streamDescriptor) |
101 , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired) | 112 , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired) |
102 { | 113 { |
103 m_descriptor->setClient(this); | 114 m_descriptor->setClient(this); |
104 | 115 |
105 size_t numberOfAudioTracks = m_descriptor->numberOfAudioComponents(); | 116 size_t numberOfAudioTracks = m_descriptor->numberOfAudioComponents(); |
106 m_audioTracks.reserveCapacity(numberOfAudioTracks); | 117 m_audioTracks.reserveCapacity(numberOfAudioTracks); |
107 for (size_t i = 0; i < numberOfAudioTracks; i++) { | 118 for (size_t i = 0; i < numberOfAudioTracks; i++) { |
108 MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descrip tor->audioComponent(i)); | 119 MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descrip tor->audioComponent(i)); |
109 newTrack->registerMediaStream(this); | 120 newTrack->registerMediaStream(this); |
110 m_audioTracks.append(newTrack); | 121 m_audioTracks.append(newTrack); |
111 } | 122 } |
112 | 123 |
113 size_t numberOfVideoTracks = m_descriptor->numberOfVideoComponents(); | 124 size_t numberOfVideoTracks = m_descriptor->numberOfVideoComponents(); |
114 m_videoTracks.reserveCapacity(numberOfVideoTracks); | 125 m_videoTracks.reserveCapacity(numberOfVideoTracks); |
115 for (size_t i = 0; i < numberOfVideoTracks; i++) { | 126 for (size_t i = 0; i < numberOfVideoTracks; i++) { |
116 MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descrip tor->videoComponent(i)); | 127 MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descrip tor->videoComponent(i)); |
117 newTrack->registerMediaStream(this); | 128 newTrack->registerMediaStream(this); |
118 m_videoTracks.append(newTrack); | 129 m_videoTracks.append(newTrack); |
119 } | 130 } |
120 } | 131 } |
121 | 132 |
122 MediaStream::MediaStream(ExecutionContext* context, const MediaStreamTrackVector & audioTracks, const MediaStreamTrackVector& videoTracks) | 133 MediaStream::MediaStream(ExecutionContext* context, const MediaStreamTrackVector & audioTracks, const MediaStreamTrackVector& videoTracks) |
123 : ContextLifecycleObserver(context) | 134 : MediaProvider(EventTargetNames::MediaStream, bind<const ScriptValue&>(Medi aProviderConverter)) |
135 , ContextLifecycleObserver(context) | |
124 , m_stopped(false) | 136 , m_stopped(false) |
125 , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired) | 137 , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired) |
126 { | 138 { |
127 MediaStreamComponentVector audioComponents; | 139 MediaStreamComponentVector audioComponents; |
128 MediaStreamComponentVector videoComponents; | 140 MediaStreamComponentVector videoComponents; |
129 | 141 |
130 MediaStreamTrackVector::const_iterator iter; | 142 MediaStreamTrackVector::const_iterator iter; |
131 for (iter = audioTracks.begin(); iter != audioTracks.end(); ++iter) { | 143 for (iter = audioTracks.begin(); iter != audioTracks.end(); ++iter) { |
132 (*iter)->registerMediaStream(this); | 144 (*iter)->registerMediaStream(this); |
133 audioComponents.append((*iter)->component()); | 145 audioComponents.append((*iter)->component()); |
134 } | 146 } |
135 for (iter = videoTracks.begin(); iter != videoTracks.end(); ++iter) { | 147 for (iter = videoTracks.begin(); iter != videoTracks.end(); ++iter) { |
136 (*iter)->registerMediaStream(this); | 148 (*iter)->registerMediaStream(this); |
137 videoComponents.append((*iter)->component()); | 149 videoComponents.append((*iter)->component()); |
138 } | 150 } |
139 | 151 |
140 m_descriptor = MediaStreamDescriptor::create(audioComponents, videoComponent s); | 152 m_descriptor = MediaStreamDescriptor::create(audioComponents, videoComponent s); |
141 m_descriptor->setClient(this); | 153 m_descriptor->setClient(this); |
142 MediaStreamCenter::instance().didCreateMediaStream(m_descriptor.get()); | 154 MediaStreamCenter::instance().didCreateMediaStream(m_descriptor.get()); |
143 | 155 |
144 m_audioTracks = audioTracks; | 156 m_audioTracks = audioTracks; |
145 m_videoTracks = videoTracks; | 157 m_videoTracks = videoTracks; |
146 } | 158 } |
147 | 159 |
148 MediaStream::~MediaStream() | 160 MediaStream::~MediaStream() |
149 { | 161 { |
162 if (!m_objectUrl.isEmpty()) | |
163 DOMURL::revokeObjectURL(executionContext(), m_objectUrl); | |
sof
2014/09/19 06:26:23
(It'd be nice to have an auto-revocation public UR
perkj_chrome
2014/09/19 10:48:06
Sure,
Would that make sence even if we refactor M
sof
2014/09/19 13:06:11
Certainly, this wasn't meant as an actionable issu
| |
150 m_descriptor->setClient(0); | 164 m_descriptor->setClient(0); |
151 } | 165 } |
152 | 166 |
153 bool MediaStream::ended() const | 167 bool MediaStream::ended() const |
154 { | 168 { |
155 return m_stopped || m_descriptor->ended(); | 169 return m_stopped || m_descriptor->ended(); |
156 } | 170 } |
157 | 171 |
158 MediaStreamTrackVector MediaStream::getTracks() | 172 MediaStreamTrackVector MediaStream::getTracks() |
159 { | 173 { |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
380 dispatchEvent((*it).release()); | 394 dispatchEvent((*it).release()); |
381 | 395 |
382 events.clear(); | 396 events.clear(); |
383 } | 397 } |
384 | 398 |
385 URLRegistry& MediaStream::registry() const | 399 URLRegistry& MediaStream::registry() const |
386 { | 400 { |
387 return MediaStreamRegistry::registry(); | 401 return MediaStreamRegistry::registry(); |
388 } | 402 } |
389 | 403 |
404 const String& MediaStream::getObjectUrl() | |
405 { | |
406 if (m_objectUrl.isEmpty()) | |
407 m_objectUrl = DOMURL::createPublicURL(executionContext(), this); | |
408 return m_objectUrl; | |
409 } | |
410 | |
390 void MediaStream::trace(Visitor* visitor) | 411 void MediaStream::trace(Visitor* visitor) |
391 { | 412 { |
392 visitor->trace(m_audioTracks); | 413 visitor->trace(m_audioTracks); |
393 visitor->trace(m_videoTracks); | 414 visitor->trace(m_videoTracks); |
394 visitor->trace(m_scheduledEvents); | 415 visitor->trace(m_scheduledEvents); |
416 MediaProvider::trace(visitor); | |
395 EventTargetWithInlineData::trace(visitor); | 417 EventTargetWithInlineData::trace(visitor); |
396 } | 418 } |
397 | 419 |
398 } // namespace blink | 420 } // namespace blink |
OLD | NEW |