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

Side by Side Diff: Source/modules/webaudio/WaveShaperNode.cpp

Issue 15619003: Add support for WaveShaperNode.oversample (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: thread-safety Created 7 years, 7 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 | Annotate | Revision Log
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 "config.h" 25 #include "config.h"
26 26
27 #if ENABLE(WEB_AUDIO) 27 #if ENABLE(WEB_AUDIO)
28 28
29 #include "modules/webaudio/WaveShaperNode.h" 29 #include "modules/webaudio/WaveShaperNode.h"
30
31 #include "core/dom/ExceptionCode.h"
30 #include "wtf/MainThread.h" 32 #include "wtf/MainThread.h"
31 33
32 namespace WebCore { 34 namespace WebCore {
33 35
34 WaveShaperNode::WaveShaperNode(AudioContext* context) 36 WaveShaperNode::WaveShaperNode(AudioContext* context)
35 : AudioBasicProcessorNode(context, context->sampleRate()) 37 : AudioBasicProcessorNode(context, context->sampleRate())
36 { 38 {
37 ScriptWrappable::init(this); 39 ScriptWrappable::init(this);
38 m_processor = adoptPtr(new WaveShaperProcessor(context->sampleRate(), 1)); 40 m_processor = adoptPtr(new WaveShaperProcessor(context->sampleRate(), 1));
39 setNodeType(NodeTypeWaveShaper); 41 setNodeType(NodeTypeWaveShaper);
42
43 initialize();
40 } 44 }
41 45
42 void WaveShaperNode::setCurve(Float32Array* curve) 46 void WaveShaperNode::setCurve(Float32Array* curve)
43 { 47 {
44 ASSERT(isMainThread()); 48 ASSERT(isMainThread());
45 waveShaperProcessor()->setCurve(curve); 49 waveShaperProcessor()->setCurve(curve);
46 } 50 }
47 51
48 Float32Array* WaveShaperNode::curve() 52 Float32Array* WaveShaperNode::curve()
49 { 53 {
50 return waveShaperProcessor()->curve(); 54 return waveShaperProcessor()->curve();
51 } 55 }
52 56
57 void WaveShaperNode::setOversample(const String& type, ExceptionCode& ec)
58 {
59 if (type == "none")
60 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSampleNone );
61 else if (type == "2x")
62 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSample2x);
63 else if (type == "4x")
64 waveShaperProcessor()->setOversample(WaveShaperProcessor::OverSample4x);
65 else
66 ec = INVALID_STATE_ERR;
67 }
68
69 String WaveShaperNode::oversample() const
70 {
71 switch (const_cast<WaveShaperNode*>(this)->waveShaperProcessor()->oversample ()) {
72 case WaveShaperProcessor::OverSampleNone:
73 return "none";
74 case WaveShaperProcessor::OverSample2x:
75 return "2x";
76 case WaveShaperProcessor::OverSample4x:
77 return "4x";
78 default:
79 ASSERT_NOT_REACHED();
80 return "none";
81 }
82 }
83
53 } // namespace WebCore 84 } // namespace WebCore
54 85
55 #endif // ENABLE(WEB_AUDIO) 86 #endif // ENABLE(WEB_AUDIO)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698