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

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

Issue 1865583002: Implement BaseAudioContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 "modules/webaudio/MediaElementAudioSourceNode.h" 25 #include "modules/webaudio/MediaElementAudioSourceNode.h"
26 #include "core/dom/CrossThreadTask.h" 26 #include "core/dom/CrossThreadTask.h"
27 #include "core/frame/ConsoleTypes.h" 27 #include "core/frame/ConsoleTypes.h"
28 #include "core/html/HTMLMediaElement.h" 28 #include "core/html/HTMLMediaElement.h"
29 #include "core/inspector/ConsoleMessage.h" 29 #include "core/inspector/ConsoleMessage.h"
30 #include "modules/webaudio/AbstractAudioContext.h"
31 #include "modules/webaudio/AudioNodeOutput.h" 30 #include "modules/webaudio/AudioNodeOutput.h"
31 #include "modules/webaudio/BaseAudioContext.h"
32 #include "platform/Logging.h" 32 #include "platform/Logging.h"
33 #include "platform/audio/AudioUtilities.h" 33 #include "platform/audio/AudioUtilities.h"
34 #include "platform/weborigin/SecurityOrigin.h" 34 #include "platform/weborigin/SecurityOrigin.h"
35 #include "wtf/Locker.h" 35 #include "wtf/Locker.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)
40 : AudioHandler(NodeTypeMediaElementAudioSource, node, node.context()->sample Rate()) 40 : AudioHandler(NodeTypeMediaElementAudioSource, node, node.context()->sample Rate())
41 , m_mediaElement(mediaElement) 41 , m_mediaElement(mediaElement)
(...skipping 23 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 WTF_LOG(Media, "MediaElementAudioSourceNode::setFormat(%u, %f) - unh andled format change", static_cast<unsigned>(numberOfChannels), sourceSampleRate ); 77 WTF_LOG(Media, "MediaElementAudioSourceNode::setFormat(%u, %f) - unh andled format change", static_cast<unsigned>(numberOfChannels), sourceSampleRate );
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 = adoptPtr(new MultiChannelResampler(scaleFa ctor, numberOfChannels)); 94 m_multiChannelResampler = adoptPtr(new MultiChannelResampler(scaleFa ctor, numberOfChannels));
95 } else { 95 } else {
96 // Bypass resampling. 96 // Bypass resampling.
97 m_multiChannelResampler.clear(); 97 m_multiChannelResampler.clear();
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 m_processLock.lock(); 196 m_processLock.lock();
197 } 197 }
198 198
199 void MediaElementAudioSourceHandler::unlock() 199 void MediaElementAudioSourceHandler::unlock()
200 { 200 {
201 m_processLock.unlock(); 201 m_processLock.unlock();
202 } 202 }
203 203
204 // ---------------------------------------------------------------- 204 // ----------------------------------------------------------------
205 205
206 MediaElementAudioSourceNode::MediaElementAudioSourceNode(AbstractAudioContext& c ontext, HTMLMediaElement& mediaElement) 206 MediaElementAudioSourceNode::MediaElementAudioSourceNode(BaseAudioContext& conte xt, HTMLMediaElement& mediaElement)
207 : AudioSourceNode(context) 207 : AudioSourceNode(context)
208 { 208 {
209 setHandler(MediaElementAudioSourceHandler::create(*this, mediaElement)); 209 setHandler(MediaElementAudioSourceHandler::create(*this, mediaElement));
210 } 210 }
211 211
212 MediaElementAudioSourceNode* MediaElementAudioSourceNode::create(AbstractAudioCo ntext& context, HTMLMediaElement& mediaElement) 212 MediaElementAudioSourceNode* MediaElementAudioSourceNode::create(BaseAudioContex t& context, HTMLMediaElement& mediaElement)
213 { 213 {
214 return new MediaElementAudioSourceNode(context, mediaElement); 214 return new MediaElementAudioSourceNode(context, mediaElement);
215 } 215 }
216 216
217 DEFINE_TRACE(MediaElementAudioSourceNode) 217 DEFINE_TRACE(MediaElementAudioSourceNode)
218 { 218 {
219 AudioSourceProviderClient::trace(visitor); 219 AudioSourceProviderClient::trace(visitor);
220 AudioSourceNode::trace(visitor); 220 AudioSourceNode::trace(visitor);
221 } 221 }
222 222
(...skipping 22 matching lines...) Expand all
245 mediaElementAudioSourceHandler().lock(); 245 mediaElementAudioSourceHandler().lock();
246 } 246 }
247 247
248 void MediaElementAudioSourceNode::unlock() 248 void MediaElementAudioSourceNode::unlock()
249 { 249 {
250 mediaElementAudioSourceHandler().unlock(); 250 mediaElementAudioSourceHandler().unlock();
251 } 251 }
252 252
253 } // namespace blink 253 } // namespace blink
254 254
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698