| 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 "core/dom/DOMURL.h" |
| 30 #include "core/dom/ExceptionCode.h" | 31 #include "core/dom/ExceptionCode.h" |
| 32 #include "modules/mediastream/MediaStreamMediaProviderConverter.h" |
| 31 #include "modules/mediastream/MediaStreamRegistry.h" | 33 #include "modules/mediastream/MediaStreamRegistry.h" |
| 32 #include "modules/mediastream/MediaStreamTrackEvent.h" | 34 #include "modules/mediastream/MediaStreamTrackEvent.h" |
| 33 #include "platform/mediastream/MediaStreamCenter.h" | 35 #include "platform/mediastream/MediaStreamCenter.h" |
| 34 #include "platform/mediastream/MediaStreamSource.h" | 36 #include "platform/mediastream/MediaStreamSource.h" |
| 35 | 37 |
| 36 namespace blink { | 38 namespace blink { |
| 37 | 39 |
| 38 static bool containsSource(MediaStreamTrackVector& trackVector, MediaStreamSourc
e* source) | 40 static bool containsSource(MediaStreamTrackVector& trackVector, MediaStreamSourc
e* source) |
| 39 { | 41 { |
| 40 for (size_t i = 0; i < trackVector.size(); ++i) { | 42 for (size_t i = 0; i < trackVector.size(); ++i) { |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 | 90 |
| 89 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, au
dioTracks, videoTracks)); | 91 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, au
dioTracks, videoTracks)); |
| 90 } | 92 } |
| 91 | 93 |
| 92 MediaStream* MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStre
amDescriptor> streamDescriptor) | 94 MediaStream* MediaStream::create(ExecutionContext* context, PassRefPtr<MediaStre
amDescriptor> streamDescriptor) |
| 93 { | 95 { |
| 94 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, st
reamDescriptor)); | 96 return adoptRefCountedGarbageCollectedWillBeNoop(new MediaStream(context, st
reamDescriptor)); |
| 95 } | 97 } |
| 96 | 98 |
| 97 MediaStream::MediaStream(ExecutionContext* context, PassRefPtr<MediaStreamDescri
ptor> streamDescriptor) | 99 MediaStream::MediaStream(ExecutionContext* context, PassRefPtr<MediaStreamDescri
ptor> streamDescriptor) |
| 98 : ContextLifecycleObserver(context) | 100 : MediaProvider(MediaStreamMediaProviderConverter::converter()) |
| 101 , ContextLifecycleObserver(context) |
| 99 , m_stopped(false) | 102 , m_stopped(false) |
| 100 , m_descriptor(streamDescriptor) | 103 , m_descriptor(streamDescriptor) |
| 101 , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired) | 104 , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired) |
| 102 { | 105 { |
| 103 ScriptWrappable::init(this); | 106 ScriptWrappable::init(this); |
| 104 m_descriptor->setClient(this); | 107 m_descriptor->setClient(this); |
| 105 | 108 |
| 106 size_t numberOfAudioTracks = m_descriptor->numberOfAudioComponents(); | 109 size_t numberOfAudioTracks = m_descriptor->numberOfAudioComponents(); |
| 107 m_audioTracks.reserveCapacity(numberOfAudioTracks); | 110 m_audioTracks.reserveCapacity(numberOfAudioTracks); |
| 108 for (size_t i = 0; i < numberOfAudioTracks; i++) { | 111 for (size_t i = 0; i < numberOfAudioTracks; i++) { |
| 109 MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descrip
tor->audioComponent(i)); | 112 MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descrip
tor->audioComponent(i)); |
| 110 newTrack->registerMediaStream(this); | 113 newTrack->registerMediaStream(this); |
| 111 m_audioTracks.append(newTrack); | 114 m_audioTracks.append(newTrack); |
| 112 } | 115 } |
| 113 | 116 |
| 114 size_t numberOfVideoTracks = m_descriptor->numberOfVideoComponents(); | 117 size_t numberOfVideoTracks = m_descriptor->numberOfVideoComponents(); |
| 115 m_videoTracks.reserveCapacity(numberOfVideoTracks); | 118 m_videoTracks.reserveCapacity(numberOfVideoTracks); |
| 116 for (size_t i = 0; i < numberOfVideoTracks; i++) { | 119 for (size_t i = 0; i < numberOfVideoTracks; i++) { |
| 117 MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descrip
tor->videoComponent(i)); | 120 MediaStreamTrack* newTrack = MediaStreamTrack::create(context, m_descrip
tor->videoComponent(i)); |
| 118 newTrack->registerMediaStream(this); | 121 newTrack->registerMediaStream(this); |
| 119 m_videoTracks.append(newTrack); | 122 m_videoTracks.append(newTrack); |
| 120 } | 123 } |
| 121 } | 124 } |
| 122 | 125 |
| 123 MediaStream::MediaStream(ExecutionContext* context, const MediaStreamTrackVector
& audioTracks, const MediaStreamTrackVector& videoTracks) | 126 MediaStream::MediaStream(ExecutionContext* context, const MediaStreamTrackVector
& audioTracks, const MediaStreamTrackVector& videoTracks) |
| 124 : ContextLifecycleObserver(context) | 127 : MediaProvider(MediaStreamMediaProviderConverter::converter()) |
| 128 , ContextLifecycleObserver(context) |
| 125 , m_stopped(false) | 129 , m_stopped(false) |
| 126 , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired) | 130 , m_scheduledEventTimer(this, &MediaStream::scheduledEventTimerFired) |
| 127 { | 131 { |
| 128 ScriptWrappable::init(this); | 132 ScriptWrappable::init(this); |
| 129 | 133 |
| 130 MediaStreamComponentVector audioComponents; | 134 MediaStreamComponentVector audioComponents; |
| 131 MediaStreamComponentVector videoComponents; | 135 MediaStreamComponentVector videoComponents; |
| 132 | 136 |
| 133 MediaStreamTrackVector::const_iterator iter; | 137 MediaStreamTrackVector::const_iterator iter; |
| 134 for (iter = audioTracks.begin(); iter != audioTracks.end(); ++iter) { | 138 for (iter = audioTracks.begin(); iter != audioTracks.end(); ++iter) { |
| 135 (*iter)->registerMediaStream(this); | 139 (*iter)->registerMediaStream(this); |
| 136 audioComponents.append((*iter)->component()); | 140 audioComponents.append((*iter)->component()); |
| 137 } | 141 } |
| 138 for (iter = videoTracks.begin(); iter != videoTracks.end(); ++iter) { | 142 for (iter = videoTracks.begin(); iter != videoTracks.end(); ++iter) { |
| 139 (*iter)->registerMediaStream(this); | 143 (*iter)->registerMediaStream(this); |
| 140 videoComponents.append((*iter)->component()); | 144 videoComponents.append((*iter)->component()); |
| 141 } | 145 } |
| 142 | 146 |
| 143 m_descriptor = MediaStreamDescriptor::create(audioComponents, videoComponent
s); | 147 m_descriptor = MediaStreamDescriptor::create(audioComponents, videoComponent
s); |
| 144 m_descriptor->setClient(this); | 148 m_descriptor->setClient(this); |
| 145 MediaStreamCenter::instance().didCreateMediaStream(m_descriptor.get()); | 149 MediaStreamCenter::instance().didCreateMediaStream(m_descriptor.get()); |
| 146 | 150 |
| 147 m_audioTracks = audioTracks; | 151 m_audioTracks = audioTracks; |
| 148 m_videoTracks = videoTracks; | 152 m_videoTracks = videoTracks; |
| 149 } | 153 } |
| 150 | 154 |
| 151 MediaStream::~MediaStream() | 155 MediaStream::~MediaStream() |
| 152 { | 156 { |
| 157 if (!m_objectUrl.isEmpty()) |
| 158 DOMURL::revokeObjectURL(executionContext(), m_objectUrl); |
| 153 m_descriptor->setClient(0); | 159 m_descriptor->setClient(0); |
| 154 } | 160 } |
| 155 | 161 |
| 156 bool MediaStream::ended() const | 162 bool MediaStream::ended() const |
| 157 { | 163 { |
| 158 return m_stopped || m_descriptor->ended(); | 164 return m_stopped || m_descriptor->ended(); |
| 159 } | 165 } |
| 160 | 166 |
| 161 MediaStreamTrackVector MediaStream::getTracks() | 167 MediaStreamTrackVector MediaStream::getTracks() |
| 162 { | 168 { |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 dispatchEvent((*it).release()); | 389 dispatchEvent((*it).release()); |
| 384 | 390 |
| 385 events.clear(); | 391 events.clear(); |
| 386 } | 392 } |
| 387 | 393 |
| 388 URLRegistry& MediaStream::registry() const | 394 URLRegistry& MediaStream::registry() const |
| 389 { | 395 { |
| 390 return MediaStreamRegistry::registry(); | 396 return MediaStreamRegistry::registry(); |
| 391 } | 397 } |
| 392 | 398 |
| 399 const String& MediaStream::getObjectUrl() |
| 400 { |
| 401 if (m_objectUrl.isEmpty()) |
| 402 m_objectUrl = m_objectUrl = DOMURL::createPublicURL(executionContext(),
this); |
| 403 return m_objectUrl; |
| 404 } |
| 405 |
| 393 void MediaStream::trace(Visitor* visitor) | 406 void MediaStream::trace(Visitor* visitor) |
| 394 { | 407 { |
| 395 visitor->trace(m_audioTracks); | 408 visitor->trace(m_audioTracks); |
| 396 visitor->trace(m_videoTracks); | 409 visitor->trace(m_videoTracks); |
| 397 visitor->trace(m_scheduledEvents); | 410 visitor->trace(m_scheduledEvents); |
| 398 EventTargetWithInlineData::trace(visitor); | 411 EventTargetWithInlineData::trace(visitor); |
| 399 } | 412 } |
| 400 | 413 |
| 401 } // namespace blink | 414 } // namespace blink |
| OLD | NEW |