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

Side by Side Diff: third_party/WebKit/Source/modules/webaudio/BiquadProcessor.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) 2010, Google Inc. All rights reserved. 2 * Copyright (C) 2010, 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/BiquadDSPKernel.h"
25 #include "modules/webaudio/BiquadProcessor.h" 26 #include "modules/webaudio/BiquadProcessor.h"
26 #include "modules/webaudio/BiquadDSPKernel.h" 27 #include "wtf/PtrUtil.h"
28 #include <memory>
27 29
28 namespace blink { 30 namespace blink {
29 31
30 BiquadProcessor::BiquadProcessor(float sampleRate, size_t numberOfChannels, Audi oParamHandler& frequency, AudioParamHandler& q, AudioParamHandler& gain, AudioPa ramHandler& detune) 32 BiquadProcessor::BiquadProcessor(float sampleRate, size_t numberOfChannels, Audi oParamHandler& frequency, AudioParamHandler& q, AudioParamHandler& gain, AudioPa ramHandler& detune)
31 : AudioDSPKernelProcessor(sampleRate, numberOfChannels) 33 : AudioDSPKernelProcessor(sampleRate, numberOfChannels)
32 , m_type(LowPass) 34 , m_type(LowPass)
33 , m_parameter1(frequency) 35 , m_parameter1(frequency)
34 , m_parameter2(q) 36 , m_parameter2(q)
35 , m_parameter3(gain) 37 , m_parameter3(gain)
36 , m_parameter4(detune) 38 , m_parameter4(detune)
37 , m_filterCoefficientsDirty(true) 39 , m_filterCoefficientsDirty(true)
38 , m_hasSampleAccurateValues(false) 40 , m_hasSampleAccurateValues(false)
39 { 41 {
40 } 42 }
41 43
42 BiquadProcessor::~BiquadProcessor() 44 BiquadProcessor::~BiquadProcessor()
43 { 45 {
44 if (isInitialized()) 46 if (isInitialized())
45 uninitialize(); 47 uninitialize();
46 } 48 }
47 49
48 PassOwnPtr<AudioDSPKernel> BiquadProcessor::createKernel() 50 std::unique_ptr<AudioDSPKernel> BiquadProcessor::createKernel()
49 { 51 {
50 return adoptPtr(new BiquadDSPKernel(this)); 52 return wrapUnique(new BiquadDSPKernel(this));
51 } 53 }
52 54
53 void BiquadProcessor::checkForDirtyCoefficients() 55 void BiquadProcessor::checkForDirtyCoefficients()
54 { 56 {
55 // Deal with smoothing / de-zippering. Start out assuming filter parameters are not changing. 57 // Deal with smoothing / de-zippering. Start out assuming filter parameters are not changing.
56 58
57 // The BiquadDSPKernel objects rely on this value to see if they need to re- compute their internal filter coefficients. 59 // The BiquadDSPKernel objects rely on this value to see if they need to re- compute their internal filter coefficients.
58 m_filterCoefficientsDirty = false; 60 m_filterCoefficientsDirty = false;
59 m_hasSampleAccurateValues = false; 61 m_hasSampleAccurateValues = false;
60 62
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 reset(); // The filter state must be reset only if the type has changed. 105 reset(); // The filter state must be reset only if the type has changed.
104 } 106 }
105 } 107 }
106 108
107 void BiquadProcessor::getFrequencyResponse(int nFrequencies, const float* freque ncyHz, float* magResponse, float* phaseResponse) 109 void BiquadProcessor::getFrequencyResponse(int nFrequencies, const float* freque ncyHz, float* magResponse, float* phaseResponse)
108 { 110 {
109 // Compute the frequency response on a separate temporary kernel 111 // Compute the frequency response on a separate temporary kernel
110 // to avoid interfering with the processing running in the audio 112 // to avoid interfering with the processing running in the audio
111 // thread on the main kernels. 113 // thread on the main kernels.
112 114
113 OwnPtr<BiquadDSPKernel> responseKernel = adoptPtr(new BiquadDSPKernel(this)) ; 115 std::unique_ptr<BiquadDSPKernel> responseKernel = wrapUnique(new BiquadDSPKe rnel(this));
114 responseKernel->getFrequencyResponse(nFrequencies, frequencyHz, magResponse, phaseResponse); 116 responseKernel->getFrequencyResponse(nFrequencies, frequencyHz, magResponse, phaseResponse);
115 } 117 }
116 118
117 } // namespace blink 119 } // namespace blink
118 120
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698