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

Side by Side Diff: third_party/WebKit/Source/platform/audio/HRTFKernel.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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of 13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
14 * its contributors may be used to endorse or promote products derived 14 * its contributors may be used to endorse or promote products derived
15 * from this software without specific prior written permission. 15 * from this software without specific prior written permission.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "platform/FloatConversion.h"
30 #include "platform/audio/AudioChannel.h"
29 #include "platform/audio/HRTFKernel.h" 31 #include "platform/audio/HRTFKernel.h"
30 #include "platform/audio/AudioChannel.h"
31 #include "platform/FloatConversion.h"
32 #include "wtf/MathExtras.h" 32 #include "wtf/MathExtras.h"
33 #include "wtf/PtrUtil.h"
33 #include <algorithm> 34 #include <algorithm>
35 #include <memory>
34 36
35 namespace blink { 37 namespace blink {
36 38
37 // Takes the input AudioChannel as an input impulse response and calculates the average group delay. 39 // Takes the input AudioChannel as an input impulse response and calculates the average group delay.
38 // This represents the initial delay before the most energetic part of the impul se response. 40 // This represents the initial delay before the most energetic part of the impul se response.
39 // The sample-frame delay is removed from the impulseP impulse response, and thi s value is returned. 41 // The sample-frame delay is removed from the impulseP impulse response, and thi s value is returned.
40 // the length of the passed in AudioChannel must be a power of 2. 42 // the length of the passed in AudioChannel must be a power of 2.
41 static float extractAverageGroupDelay(AudioChannel* channel, size_t analysisFFTS ize) 43 static float extractAverageGroupDelay(AudioChannel* channel, size_t analysisFFTS ize)
42 { 44 {
43 ASSERT(channel); 45 ASSERT(channel);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 // Quick fade-out (apply window) at truncation point 81 // Quick fade-out (apply window) at truncation point
80 unsigned numberOfFadeOutFrames = static_cast<unsigned>(sampleRate / 4410); / / 10 sample-frames @44.1KHz sample-rate 82 unsigned numberOfFadeOutFrames = static_cast<unsigned>(sampleRate / 4410); / / 10 sample-frames @44.1KHz sample-rate
81 ASSERT(numberOfFadeOutFrames < truncatedResponseLength); 83 ASSERT(numberOfFadeOutFrames < truncatedResponseLength);
82 if (numberOfFadeOutFrames < truncatedResponseLength) { 84 if (numberOfFadeOutFrames < truncatedResponseLength) {
83 for (unsigned i = truncatedResponseLength - numberOfFadeOutFrames; i < t runcatedResponseLength; ++i) { 85 for (unsigned i = truncatedResponseLength - numberOfFadeOutFrames; i < t runcatedResponseLength; ++i) {
84 float x = 1.0f - static_cast<float>(i - (truncatedResponseLength - n umberOfFadeOutFrames)) / numberOfFadeOutFrames; 86 float x = 1.0f - static_cast<float>(i - (truncatedResponseLength - n umberOfFadeOutFrames)) / numberOfFadeOutFrames;
85 impulseResponse[i] *= x; 87 impulseResponse[i] *= x;
86 } 88 }
87 } 89 }
88 90
89 m_fftFrame = adoptPtr(new FFTFrame(fftSize)); 91 m_fftFrame = wrapUnique(new FFTFrame(fftSize));
90 m_fftFrame->doPaddedFFT(impulseResponse, truncatedResponseLength); 92 m_fftFrame->doPaddedFFT(impulseResponse, truncatedResponseLength);
91 } 93 }
92 94
93 PassOwnPtr<AudioChannel> HRTFKernel::createImpulseResponse() 95 std::unique_ptr<AudioChannel> HRTFKernel::createImpulseResponse()
94 { 96 {
95 OwnPtr<AudioChannel> channel = adoptPtr(new AudioChannel(fftSize())); 97 std::unique_ptr<AudioChannel> channel = wrapUnique(new AudioChannel(fftSize( )));
96 FFTFrame fftFrame(*m_fftFrame); 98 FFTFrame fftFrame(*m_fftFrame);
97 99
98 // Add leading delay back in. 100 // Add leading delay back in.
99 fftFrame.addConstantGroupDelay(m_frameDelay); 101 fftFrame.addConstantGroupDelay(m_frameDelay);
100 fftFrame.doInverseFFT(channel->mutableData()); 102 fftFrame.doInverseFFT(channel->mutableData());
101 103
102 return channel; 104 return channel;
103 } 105 }
104 106
105 // Interpolates two kernels with x: 0 -> 1 and returns the result. 107 // Interpolates two kernels with x: 0 -> 1 and returns the result.
106 PassOwnPtr<HRTFKernel> HRTFKernel::createInterpolatedKernel(HRTFKernel* kernel1, HRTFKernel* kernel2, float x) 108 std::unique_ptr<HRTFKernel> HRTFKernel::createInterpolatedKernel(HRTFKernel* ker nel1, HRTFKernel* kernel2, float x)
107 { 109 {
108 ASSERT(kernel1 && kernel2); 110 ASSERT(kernel1 && kernel2);
109 if (!kernel1 || !kernel2) 111 if (!kernel1 || !kernel2)
110 return nullptr; 112 return nullptr;
111 113
112 ASSERT(x >= 0.0 && x < 1.0); 114 ASSERT(x >= 0.0 && x < 1.0);
113 x = clampTo(x, 0.0f, 1.0f); 115 x = clampTo(x, 0.0f, 1.0f);
114 116
115 float sampleRate1 = kernel1->sampleRate(); 117 float sampleRate1 = kernel1->sampleRate();
116 float sampleRate2 = kernel2->sampleRate(); 118 float sampleRate2 = kernel2->sampleRate();
117 ASSERT(sampleRate1 == sampleRate2); 119 ASSERT(sampleRate1 == sampleRate2);
118 if (sampleRate1 != sampleRate2) 120 if (sampleRate1 != sampleRate2)
119 return nullptr; 121 return nullptr;
120 122
121 float frameDelay = (1 - x) * kernel1->frameDelay() + x * kernel2->frameDelay (); 123 float frameDelay = (1 - x) * kernel1->frameDelay() + x * kernel2->frameDelay ();
122 124
123 OwnPtr<FFTFrame> interpolatedFrame = FFTFrame::createInterpolatedFrame(*kern el1->fftFrame(), *kernel2->fftFrame(), x); 125 std::unique_ptr<FFTFrame> interpolatedFrame = FFTFrame::createInterpolatedFr ame(*kernel1->fftFrame(), *kernel2->fftFrame(), x);
124 return HRTFKernel::create(std::move(interpolatedFrame), frameDelay, sampleRa te1); 126 return HRTFKernel::create(std::move(interpolatedFrame), frameDelay, sampleRa te1);
125 } 127 }
126 128
127 } // namespace blink 129 } // namespace blink
128 130
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698