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

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

Issue 2103043007: Rename AbstractAudioContext to BaseAudioContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use ASSERT(isGraphOwner()) instead of DCHECK Created 4 years, 5 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 * 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 "core/dom/CrossThreadTask.h" 25 #include "core/dom/CrossThreadTask.h"
26 #include "core/html/HTMLMediaElement.h" 26 #include "core/html/HTMLMediaElement.h"
27 #include "core/inspector/ConsoleMessage.h" 27 #include "core/inspector/ConsoleMessage.h"
28 #include "modules/webaudio/AbstractAudioContext.h"
29 #include "modules/webaudio/AudioNodeOutput.h" 28 #include "modules/webaudio/AudioNodeOutput.h"
29 #include "modules/webaudio/BaseAudioContext.h"
30 #include "modules/webaudio/MediaElementAudioSourceNode.h" 30 #include "modules/webaudio/MediaElementAudioSourceNode.h"
31 #include "platform/Logging.h" 31 #include "platform/Logging.h"
32 #include "platform/audio/AudioUtilities.h" 32 #include "platform/audio/AudioUtilities.h"
33 #include "platform/weborigin/SecurityOrigin.h" 33 #include "platform/weborigin/SecurityOrigin.h"
34 #include "wtf/Locker.h" 34 #include "wtf/Locker.h"
35 #include "wtf/PtrUtil.h" 35 #include "wtf/PtrUtil.h"
36 36
37 namespace blink { 37 namespace blink {
38 38
39 MediaElementAudioSourceHandler::MediaElementAudioSourceHandler(AudioNode& node, HTMLMediaElement& mediaElement) 39 MediaElementAudioSourceHandler::MediaElementAudioSourceHandler(AudioNode& node, HTMLMediaElement& mediaElement)
(...skipping 25 matching lines...) Expand all
65 65
66 void MediaElementAudioSourceHandler::dispose() 66 void MediaElementAudioSourceHandler::dispose()
67 { 67 {
68 m_mediaElement->setAudioSourceNode(nullptr); 68 m_mediaElement->setAudioSourceNode(nullptr);
69 AudioHandler::dispose(); 69 AudioHandler::dispose();
70 } 70 }
71 71
72 void MediaElementAudioSourceHandler::setFormat(size_t numberOfChannels, float so urceSampleRate) 72 void MediaElementAudioSourceHandler::setFormat(size_t numberOfChannels, float so urceSampleRate)
73 { 73 {
74 if (numberOfChannels != m_sourceNumberOfChannels || sourceSampleRate != m_so urceSampleRate) { 74 if (numberOfChannels != m_sourceNumberOfChannels || sourceSampleRate != m_so urceSampleRate) {
75 if (!numberOfChannels || numberOfChannels > AbstractAudioContext::maxNum berOfChannels() || !AudioUtilities::isValidAudioBufferSampleRate(sourceSampleRat e)) { 75 if (!numberOfChannels || numberOfChannels > BaseAudioContext::maxNumberO fChannels() || !AudioUtilities::isValidAudioBufferSampleRate(sourceSampleRate)) {
76 // process() will generate silence for these uninitialized values. 76 // process() will generate silence for these uninitialized values.
77 DLOG(ERROR) << "setFormat(" << numberOfChannels << ", " << sourceSam pleRate << ") - unhandled format change"; 77 DLOG(ERROR) << "setFormat(" << numberOfChannels << ", " << sourceSam pleRate << ") - unhandled format change";
78 // Synchronize with process(). 78 // Synchronize with process().
79 Locker<MediaElementAudioSourceHandler> locker(*this); 79 Locker<MediaElementAudioSourceHandler> locker(*this);
80 m_sourceNumberOfChannels = 0; 80 m_sourceNumberOfChannels = 0;
81 m_sourceSampleRate = 0; 81 m_sourceSampleRate = 0;
82 return; 82 return;
83 } 83 }
84 84
85 // Synchronize with process() to protect m_sourceNumberOfChannels, 85 // Synchronize with process() to protect m_sourceNumberOfChannels,
86 // m_sourceSampleRate, and m_multiChannelResampler. 86 // m_sourceSampleRate, and m_multiChannelResampler.
87 Locker<MediaElementAudioSourceHandler> locker(*this); 87 Locker<MediaElementAudioSourceHandler> locker(*this);
88 88
89 m_sourceNumberOfChannels = numberOfChannels; 89 m_sourceNumberOfChannels = numberOfChannels;
90 m_sourceSampleRate = sourceSampleRate; 90 m_sourceSampleRate = sourceSampleRate;
91 91
92 if (sourceSampleRate != sampleRate()) { 92 if (sourceSampleRate != sampleRate()) {
93 double scaleFactor = sourceSampleRate / sampleRate(); 93 double scaleFactor = sourceSampleRate / sampleRate();
94 m_multiChannelResampler = wrapUnique(new MultiChannelResampler(scale Factor, numberOfChannels)); 94 m_multiChannelResampler = wrapUnique(new MultiChannelResampler(scale Factor, numberOfChannels));
95 } else { 95 } else {
96 // Bypass resampling. 96 // Bypass resampling.
97 m_multiChannelResampler.reset(); 97 m_multiChannelResampler.reset();
98 } 98 }
99 99
100 { 100 {
101 // The context must be locked when changing the number of output cha nnels. 101 // The context must be locked when changing the number of output cha nnels.
102 AbstractAudioContext::AutoLocker contextLocker(context()); 102 BaseAudioContext::AutoLocker contextLocker(context());
103 103
104 // Do any necesssary re-configuration to the output's number of chan nels. 104 // Do any necesssary re-configuration to the output's number of chan nels.
105 output(0).setNumberOfChannels(numberOfChannels); 105 output(0).setNumberOfChannels(numberOfChannels);
106 } 106 }
107 } 107 }
108 } 108 }
109 109
110 bool MediaElementAudioSourceHandler::passesCORSAccessCheck() 110 bool MediaElementAudioSourceHandler::passesCORSAccessCheck()
111 { 111 {
112 ASSERT(mediaElement()); 112 ASSERT(mediaElement());
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 m_processLock.lock(); 194 m_processLock.lock();
195 } 195 }
196 196
197 void MediaElementAudioSourceHandler::unlock() 197 void MediaElementAudioSourceHandler::unlock()
198 { 198 {
199 m_processLock.unlock(); 199 m_processLock.unlock();
200 } 200 }
201 201
202 // ---------------------------------------------------------------- 202 // ----------------------------------------------------------------
203 203
204 MediaElementAudioSourceNode::MediaElementAudioSourceNode(AbstractAudioContext& c ontext, HTMLMediaElement& mediaElement) 204 MediaElementAudioSourceNode::MediaElementAudioSourceNode(BaseAudioContext& conte xt, HTMLMediaElement& mediaElement)
205 : AudioSourceNode(context) 205 : AudioSourceNode(context)
206 { 206 {
207 setHandler(MediaElementAudioSourceHandler::create(*this, mediaElement)); 207 setHandler(MediaElementAudioSourceHandler::create(*this, mediaElement));
208 } 208 }
209 209
210 MediaElementAudioSourceNode* MediaElementAudioSourceNode::create(AbstractAudioCo ntext& context, HTMLMediaElement& mediaElement, ExceptionState& exceptionState) 210 MediaElementAudioSourceNode* MediaElementAudioSourceNode::create(BaseAudioContex t& context, HTMLMediaElement& mediaElement, ExceptionState& exceptionState)
211 { 211 {
212 DCHECK(isMainThread()); 212 DCHECK(isMainThread());
213 213
214 if (context.isContextClosed()) { 214 if (context.isContextClosed()) {
215 context.throwExceptionForClosedState(exceptionState); 215 context.throwExceptionForClosedState(exceptionState);
216 return nullptr; 216 return nullptr;
217 } 217 }
218 218
219 // First check if this media element already has a source node. 219 // First check if this media element already has a source node.
220 if (mediaElement.audioSourceNode()) { 220 if (mediaElement.audioSourceNode()) {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 mediaElementAudioSourceHandler().lock(); 266 mediaElementAudioSourceHandler().lock();
267 } 267 }
268 268
269 void MediaElementAudioSourceNode::unlock() 269 void MediaElementAudioSourceNode::unlock()
270 { 270 {
271 mediaElementAudioSourceHandler().unlock(); 271 mediaElementAudioSourceHandler().unlock();
272 } 272 }
273 273
274 } // namespace blink 274 } // namespace blink
275 275
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698