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

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

Issue 19724003: Revert "Transition modules/** to use ExceptionState" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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
« no previous file with comments | « Source/modules/webaudio/AudioBuffer.h ('k') | Source/modules/webaudio/AudioContext.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 14 matching lines...) Expand all
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 "config.h" 29 #include "config.h"
30 30
31 #if ENABLE(WEB_AUDIO) 31 #if ENABLE(WEB_AUDIO)
32 32
33 #include "modules/webaudio/AudioBuffer.h" 33 #include "modules/webaudio/AudioBuffer.h"
34 34
35 #include "bindings/v8/ExceptionState.h"
36 #include "core/dom/ExceptionCode.h" 35 #include "core/dom/ExceptionCode.h"
37 #include "core/platform/audio/AudioBus.h" 36 #include "core/platform/audio/AudioBus.h"
38 #include "core/platform/audio/AudioFileReader.h" 37 #include "core/platform/audio/AudioFileReader.h"
39 #include "modules/webaudio/AudioContext.h" 38 #include "modules/webaudio/AudioContext.h"
40 39
41 namespace WebCore { 40 namespace WebCore {
42 41
43 PassRefPtr<AudioBuffer> AudioBuffer::create(unsigned numberOfChannels, size_t nu mberOfFrames, float sampleRate) 42 PassRefPtr<AudioBuffer> AudioBuffer::create(unsigned numberOfChannels, size_t nu mberOfFrames, float sampleRate)
44 { 43 {
45 if (sampleRate < 22050 || sampleRate > 96000 || numberOfChannels > AudioCont ext::maxNumberOfChannels() || !numberOfFrames) 44 if (sampleRate < 22050 || sampleRate > 96000 || numberOfChannels > AudioCont ext::maxNumberOfChannels() || !numberOfFrames)
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 channelDataArray->setRange(bus->channel(i)->data(), m_length, 0); 86 channelDataArray->setRange(bus->channel(i)->data(), m_length, 0);
88 m_channels.append(channelDataArray); 87 m_channels.append(channelDataArray);
89 } 88 }
90 } 89 }
91 90
92 void AudioBuffer::releaseMemory() 91 void AudioBuffer::releaseMemory()
93 { 92 {
94 m_channels.clear(); 93 m_channels.clear();
95 } 94 }
96 95
97 PassRefPtr<Float32Array> AudioBuffer::getChannelData(unsigned channelIndex, Exce ptionState& es) 96 PassRefPtr<Float32Array> AudioBuffer::getChannelData(unsigned channelIndex, Exce ptionCode& ec)
98 { 97 {
99 if (channelIndex >= m_channels.size()) { 98 if (channelIndex >= m_channels.size()) {
100 es.throwDOMException(SyntaxError); 99 ec = SyntaxError;
101 return 0; 100 return 0;
102 } 101 }
103 102
104 Float32Array* channelData = m_channels[channelIndex].get(); 103 Float32Array* channelData = m_channels[channelIndex].get();
105 return Float32Array::create(channelData->buffer(), channelData->byteOffset() , channelData->length()); 104 return Float32Array::create(channelData->buffer(), channelData->byteOffset() , channelData->length());
106 } 105 }
107 106
108 Float32Array* AudioBuffer::getChannelData(unsigned channelIndex) 107 Float32Array* AudioBuffer::getChannelData(unsigned channelIndex)
109 { 108 {
110 if (channelIndex >= m_channels.size()) 109 if (channelIndex >= m_channels.size())
111 return 0; 110 return 0;
112 111
113 return m_channels[channelIndex].get(); 112 return m_channels[channelIndex].get();
114 } 113 }
115 114
116 void AudioBuffer::zero() 115 void AudioBuffer::zero()
117 { 116 {
118 for (unsigned i = 0; i < m_channels.size(); ++i) { 117 for (unsigned i = 0; i < m_channels.size(); ++i) {
119 if (getChannelData(i)) 118 if (getChannelData(i))
120 getChannelData(i)->zeroRange(0, length()); 119 getChannelData(i)->zeroRange(0, length());
121 } 120 }
122 } 121 }
123 122
124 } // namespace WebCore 123 } // namespace WebCore
125 124
126 #endif // ENABLE(WEB_AUDIO) 125 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/modules/webaudio/AudioBuffer.h ('k') | Source/modules/webaudio/AudioContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698