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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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"
26 #include "core/dom/CrossThreadTask.h" 25 #include "core/dom/CrossThreadTask.h"
27 #include "core/html/HTMLMediaElement.h" 26 #include "core/html/HTMLMediaElement.h"
28 #include "core/inspector/ConsoleMessage.h" 27 #include "core/inspector/ConsoleMessage.h"
29 #include "modules/webaudio/AbstractAudioContext.h" 28 #include "modules/webaudio/AbstractAudioContext.h"
30 #include "modules/webaudio/AudioNodeOutput.h" 29 #include "modules/webaudio/AudioNodeOutput.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 36
36 namespace blink { 37 namespace blink {
37 38
38 MediaElementAudioSourceHandler::MediaElementAudioSourceHandler(AudioNode& node, HTMLMediaElement& mediaElement) 39 MediaElementAudioSourceHandler::MediaElementAudioSourceHandler(AudioNode& node, HTMLMediaElement& mediaElement)
39 : AudioHandler(NodeTypeMediaElementAudioSource, node, node.context()->sample Rate()) 40 : AudioHandler(NodeTypeMediaElementAudioSource, node, node.context()->sample Rate())
40 , m_mediaElement(mediaElement) 41 , m_mediaElement(mediaElement)
41 , m_sourceNumberOfChannels(0) 42 , m_sourceNumberOfChannels(0)
42 , m_sourceSampleRate(0) 43 , m_sourceSampleRate(0)
43 , m_passesCurrentSrcCORSAccessCheck(passesCurrentSrcCORSAccessCheck(mediaEle ment.currentSrc())) 44 , m_passesCurrentSrcCORSAccessCheck(passesCurrentSrcCORSAccessCheck(mediaEle ment.currentSrc()))
44 , m_maybePrintCORSMessage(!m_passesCurrentSrcCORSAccessCheck) 45 , m_maybePrintCORSMessage(!m_passesCurrentSrcCORSAccessCheck)
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 84
84 // Synchronize with process() to protect m_sourceNumberOfChannels, 85 // Synchronize with process() to protect m_sourceNumberOfChannels,
85 // m_sourceSampleRate, and m_multiChannelResampler. 86 // m_sourceSampleRate, and m_multiChannelResampler.
86 Locker<MediaElementAudioSourceHandler> locker(*this); 87 Locker<MediaElementAudioSourceHandler> locker(*this);
87 88
88 m_sourceNumberOfChannels = numberOfChannels; 89 m_sourceNumberOfChannels = numberOfChannels;
89 m_sourceSampleRate = sourceSampleRate; 90 m_sourceSampleRate = sourceSampleRate;
90 91
91 if (sourceSampleRate != sampleRate()) { 92 if (sourceSampleRate != sampleRate()) {
92 double scaleFactor = sourceSampleRate / sampleRate(); 93 double scaleFactor = sourceSampleRate / sampleRate();
93 m_multiChannelResampler = adoptPtr(new MultiChannelResampler(scaleFa ctor, numberOfChannels)); 94 m_multiChannelResampler = wrapUnique(new MultiChannelResampler(scale Factor, numberOfChannels));
94 } else { 95 } else {
95 // Bypass resampling. 96 // Bypass resampling.
96 m_multiChannelResampler.reset(); 97 m_multiChannelResampler.reset();
97 } 98 }
98 99
99 { 100 {
100 // 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.
101 AbstractAudioContext::AutoLocker contextLocker(context()); 102 AbstractAudioContext::AutoLocker contextLocker(context());
102 103
103 // 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.
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 mediaElementAudioSourceHandler().lock(); 266 mediaElementAudioSourceHandler().lock();
266 } 267 }
267 268
268 void MediaElementAudioSourceNode::unlock() 269 void MediaElementAudioSourceNode::unlock()
269 { 270 {
270 mediaElementAudioSourceHandler().unlock(); 271 mediaElementAudioSourceHandler().unlock();
271 } 272 }
272 273
273 } // namespace blink 274 } // namespace blink
274 275
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698