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

Side by Side Diff: third_party/WebKit/Source/platform/audio/AudioResampler.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 "platform/audio/AudioResampler.h" 25 #include "platform/audio/AudioResampler.h"
26 #include "wtf/MathExtras.h"
27 #include "wtf/PtrUtil.h"
26 #include <algorithm> 28 #include <algorithm>
27 #include "wtf/MathExtras.h"
28 29
29 namespace blink { 30 namespace blink {
30 31
31 const double AudioResampler::MaxRate = 8.0; 32 const double AudioResampler::MaxRate = 8.0;
32 33
33 AudioResampler::AudioResampler() 34 AudioResampler::AudioResampler()
34 : m_rate(1.0) 35 : m_rate(1.0)
35 { 36 {
36 m_kernels.append(adoptPtr(new AudioResamplerKernel(this))); 37 m_kernels.append(wrapUnique(new AudioResamplerKernel(this)));
37 m_sourceBus = AudioBus::create(1, 0, false); 38 m_sourceBus = AudioBus::create(1, 0, false);
38 } 39 }
39 40
40 AudioResampler::AudioResampler(unsigned numberOfChannels) 41 AudioResampler::AudioResampler(unsigned numberOfChannels)
41 : m_rate(1.0) 42 : m_rate(1.0)
42 { 43 {
43 for (unsigned i = 0; i < numberOfChannels; ++i) 44 for (unsigned i = 0; i < numberOfChannels; ++i)
44 m_kernels.append(adoptPtr(new AudioResamplerKernel(this))); 45 m_kernels.append(wrapUnique(new AudioResamplerKernel(this)));
45 46
46 m_sourceBus = AudioBus::create(numberOfChannels, 0, false); 47 m_sourceBus = AudioBus::create(numberOfChannels, 0, false);
47 } 48 }
48 49
49 void AudioResampler::configureChannels(unsigned numberOfChannels) 50 void AudioResampler::configureChannels(unsigned numberOfChannels)
50 { 51 {
51 unsigned currentSize = m_kernels.size(); 52 unsigned currentSize = m_kernels.size();
52 if (numberOfChannels == currentSize) 53 if (numberOfChannels == currentSize)
53 return; // already setup 54 return; // already setup
54 55
55 // First deal with adding or removing kernels. 56 // First deal with adding or removing kernels.
56 if (numberOfChannels > currentSize) { 57 if (numberOfChannels > currentSize) {
57 for (unsigned i = currentSize; i < numberOfChannels; ++i) 58 for (unsigned i = currentSize; i < numberOfChannels; ++i)
58 m_kernels.append(adoptPtr(new AudioResamplerKernel(this))); 59 m_kernels.append(wrapUnique(new AudioResamplerKernel(this)));
59 } else 60 } else
60 m_kernels.resize(numberOfChannels); 61 m_kernels.resize(numberOfChannels);
61 62
62 // Reconfigure our source bus to the new channel size. 63 // Reconfigure our source bus to the new channel size.
63 m_sourceBus = AudioBus::create(numberOfChannels, 0, false); 64 m_sourceBus = AudioBus::create(numberOfChannels, 0, false);
64 } 65 }
65 66
66 void AudioResampler::process(AudioSourceProvider* provider, AudioBus* destinatio nBus, size_t framesToProcess) 67 void AudioResampler::process(AudioSourceProvider* provider, AudioBus* destinatio nBus, size_t framesToProcess)
67 { 68 {
68 ASSERT(provider); 69 ASSERT(provider);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 111
111 void AudioResampler::reset() 112 void AudioResampler::reset()
112 { 113 {
113 unsigned numberOfChannels = m_kernels.size(); 114 unsigned numberOfChannels = m_kernels.size();
114 for (unsigned i = 0; i < numberOfChannels; ++i) 115 for (unsigned i = 0; i < numberOfChannels; ++i)
115 m_kernels[i]->reset(); 116 m_kernels[i]->reset();
116 } 117 }
117 118
118 } // namespace blink 119 } // namespace blink
119 120
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698