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

Side by Side Diff: third_party/WebKit/Source/modules/webaudio/MediaStreamAudioSourceNode.cpp

Issue 1952793002: Move the exception logic to the AudioNode creator (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move more things to Node::create() Created 4 years, 7 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) 2012, Google Inc. All rights reserved. 2 * Copyright (C) 2012, Google 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 INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #include "modules/webaudio/MediaStreamAudioSourceNode.h" 25 #include "modules/webaudio/MediaStreamAudioSourceNode.h"
26
27 #include "core/dom/ExceptionCode.h"
26 #include "modules/webaudio/AbstractAudioContext.h" 28 #include "modules/webaudio/AbstractAudioContext.h"
27 #include "modules/webaudio/AudioNodeOutput.h" 29 #include "modules/webaudio/AudioNodeOutput.h"
28 #include "platform/Logging.h" 30 #include "platform/Logging.h"
29 #include "wtf/Locker.h" 31 #include "wtf/Locker.h"
30 32
31 namespace blink { 33 namespace blink {
32 34
33 MediaStreamAudioSourceHandler::MediaStreamAudioSourceHandler(AudioNode& node, Me diaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProv ider> audioSourceProvider) 35 MediaStreamAudioSourceHandler::MediaStreamAudioSourceHandler(AudioNode& node, Me diaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSourceProv ider> audioSourceProvider)
34 : AudioHandler(NodeTypeMediaStreamAudioSource, node, node.context()->sampleR ate()) 36 : AudioHandler(NodeTypeMediaStreamAudioSource, node, node.context()->sampleR ate())
35 , m_mediaStream(mediaStream) 37 , m_mediaStream(mediaStream)
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 } 109 }
108 110
109 // ---------------------------------------------------------------- 111 // ----------------------------------------------------------------
110 112
111 MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AbstractAudioContext& con text, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSo urceProvider> audioSourceProvider) 113 MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AbstractAudioContext& con text, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr<AudioSo urceProvider> audioSourceProvider)
112 : AudioSourceNode(context) 114 : AudioSourceNode(context)
113 { 115 {
114 setHandler(MediaStreamAudioSourceHandler::create(*this, mediaStream, audioTr ack, std::move(audioSourceProvider))); 116 setHandler(MediaStreamAudioSourceHandler::create(*this, mediaStream, audioTr ack, std::move(audioSourceProvider)));
115 } 117 }
116 118
117 MediaStreamAudioSourceNode* MediaStreamAudioSourceNode::create(AbstractAudioCont ext& context, MediaStream& mediaStream, MediaStreamTrack* audioTrack, PassOwnPtr <AudioSourceProvider> audioSourceProvider) 119 MediaStreamAudioSourceNode* MediaStreamAudioSourceNode::create(AbstractAudioCont ext& context, MediaStream& mediaStream, ExceptionState& exceptionState)
118 { 120 {
119 return new MediaStreamAudioSourceNode(context, mediaStream, audioTrack, std: :move(audioSourceProvider)); 121 ASSERT(isMainThread());
hongchan 2016/05/13 01:20:12 DCHECK.
Raymond Toy 2016/05/20 23:12:00 Done.
122
123 if (context.isContextClosed()) {
124 context.throwExceptionForClosedState(exceptionState);
125 return nullptr;
126 }
127
128 MediaStreamTrackVector audioTracks = mediaStream.getAudioTracks();
129 if (audioTracks.isEmpty()) {
130 exceptionState.throwDOMException(
131 InvalidStateError,
132 "MediaStream has no audio track");
133 return nullptr;
134 }
135
136 // Use the first audio track in the media stream.
137 MediaStreamTrack* audioTrack = audioTracks[0];
138 OwnPtr<AudioSourceProvider> provider = audioTrack->createWebAudioSource();
139
140 MediaStreamAudioSourceNode* node = new MediaStreamAudioSourceNode(context, m ediaStream, audioTrack, provider.release());
hongchan 2016/05/13 01:20:12 Over 80 cols. Let's wrap these arguments.
141
142 if (node) {
143 // FIXME: Only stereo streams are supported right now. We should be able to accept multi-channel streams.
hongchan 2016/05/13 01:20:12 Over 80 cols. Let's change it to 'TODO'. You can p
Raymond Toy 2016/05/20 23:12:00 Done.
144 node->setFormat(2, context.sampleRate());
145 // context keeps reference until node is disconnected
146 context.notifySourceNodeStartedProcessing(node);
147 }
148
149 return node;
hongchan 2016/05/13 01:20:12 We should return nullptr when |node| is invalid an
120 } 150 }
121 151
122 DEFINE_TRACE(MediaStreamAudioSourceNode) 152 DEFINE_TRACE(MediaStreamAudioSourceNode)
123 { 153 {
124 AudioSourceProviderClient::trace(visitor); 154 AudioSourceProviderClient::trace(visitor);
125 AudioSourceNode::trace(visitor); 155 AudioSourceNode::trace(visitor);
126 } 156 }
127 157
128 MediaStreamAudioSourceHandler& MediaStreamAudioSourceNode::mediaStreamAudioSourc eHandler() const 158 MediaStreamAudioSourceHandler& MediaStreamAudioSourceNode::mediaStreamAudioSourc eHandler() const
129 { 159 {
130 return static_cast<MediaStreamAudioSourceHandler&>(handler()); 160 return static_cast<MediaStreamAudioSourceHandler&>(handler());
131 } 161 }
132 162
133 MediaStream* MediaStreamAudioSourceNode::getMediaStream() const 163 MediaStream* MediaStreamAudioSourceNode::getMediaStream() const
134 { 164 {
135 return mediaStreamAudioSourceHandler().getMediaStream(); 165 return mediaStreamAudioSourceHandler().getMediaStream();
136 } 166 }
137 167
138 void MediaStreamAudioSourceNode::setFormat(size_t numberOfChannels, float source SampleRate) 168 void MediaStreamAudioSourceNode::setFormat(size_t numberOfChannels, float source SampleRate)
139 { 169 {
140 mediaStreamAudioSourceHandler().setFormat(numberOfChannels, sourceSampleRate ); 170 mediaStreamAudioSourceHandler().setFormat(numberOfChannels, sourceSampleRate );
141 } 171 }
142 172
143 } // namespace blink 173 } // namespace blink
144 174
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698