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

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

Issue 24877002: Add more informative messages for DOM exceptions. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Upload again Created 7 years, 2 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.cpp » ('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/ExceptionMessages.h"
35 #include "bindings/v8/ExceptionState.h" 36 #include "bindings/v8/ExceptionState.h"
36 #include "core/dom/ExceptionCode.h" 37 #include "core/dom/ExceptionCode.h"
37 #include "core/platform/audio/AudioBus.h" 38 #include "core/platform/audio/AudioBus.h"
38 #include "core/platform/audio/AudioFileReader.h" 39 #include "core/platform/audio/AudioFileReader.h"
39 #include "modules/webaudio/AudioContext.h" 40 #include "modules/webaudio/AudioContext.h"
40 41
41 namespace WebCore { 42 namespace WebCore {
42 43
44 float AudioBuffer::minAllowedSampleRate()
45 {
46 return 22050;
47 }
48
49 float AudioBuffer::maxAllowedSampleRate()
50 {
51 return 96000;
52 }
53
43 PassRefPtr<AudioBuffer> AudioBuffer::create(unsigned numberOfChannels, size_t nu mberOfFrames, float sampleRate) 54 PassRefPtr<AudioBuffer> AudioBuffer::create(unsigned numberOfChannels, size_t nu mberOfFrames, float sampleRate)
44 { 55 {
45 if (sampleRate < 22050 || sampleRate > 96000 || numberOfChannels > AudioCont ext::maxNumberOfChannels() || !numberOfFrames) 56 if (sampleRate < minAllowedSampleRate() || sampleRate > maxAllowedSampleRate () || numberOfChannels > AudioContext::maxNumberOfChannels() || !numberOfFrames)
46 return 0; 57 return 0;
47 58
48 return adoptRef(new AudioBuffer(numberOfChannels, numberOfFrames, sampleRate )); 59 return adoptRef(new AudioBuffer(numberOfChannels, numberOfFrames, sampleRate ));
49 } 60 }
50 61
51 PassRefPtr<AudioBuffer> AudioBuffer::createFromAudioFileData(const void* data, s ize_t dataSize, bool mixToMono, float sampleRate) 62 PassRefPtr<AudioBuffer> AudioBuffer::createFromAudioFileData(const void* data, s ize_t dataSize, bool mixToMono, float sampleRate)
52 { 63 {
53 RefPtr<AudioBus> bus = createBusFromInMemoryAudioFile(data, dataSize, mixToM ono, sampleRate); 64 RefPtr<AudioBus> bus = createBusFromInMemoryAudioFile(data, dataSize, mixToM ono, sampleRate);
54 if (bus.get()) 65 if (bus.get())
55 return adoptRef(new AudioBuffer(bus.get())); 66 return adoptRef(new AudioBuffer(bus.get()));
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 } 101 }
91 102
92 void AudioBuffer::releaseMemory() 103 void AudioBuffer::releaseMemory()
93 { 104 {
94 m_channels.clear(); 105 m_channels.clear();
95 } 106 }
96 107
97 PassRefPtr<Float32Array> AudioBuffer::getChannelData(unsigned channelIndex, Exce ptionState& es) 108 PassRefPtr<Float32Array> AudioBuffer::getChannelData(unsigned channelIndex, Exce ptionState& es)
98 { 109 {
99 if (channelIndex >= m_channels.size()) { 110 if (channelIndex >= m_channels.size()) {
100 es.throwUninformativeAndGenericDOMException(SyntaxError); 111 es.throwDOMException(
112 SyntaxError,
113 ExceptionMessages::failedToExecute(
114 "getChannelData",
115 "AudioBuffer",
116 "channel index (" + String::number(channelIndex) + ") exceeds nu mber of channels (" + String::number(m_channels.size()) + ")"));
101 return 0; 117 return 0;
102 } 118 }
103 119
104 Float32Array* channelData = m_channels[channelIndex].get(); 120 Float32Array* channelData = m_channels[channelIndex].get();
105 return Float32Array::create(channelData->buffer(), channelData->byteOffset() , channelData->length()); 121 return Float32Array::create(channelData->buffer(), channelData->byteOffset() , channelData->length());
106 } 122 }
107 123
108 Float32Array* AudioBuffer::getChannelData(unsigned channelIndex) 124 Float32Array* AudioBuffer::getChannelData(unsigned channelIndex)
109 { 125 {
110 if (channelIndex >= m_channels.size()) 126 if (channelIndex >= m_channels.size())
111 return 0; 127 return 0;
112 128
113 return m_channels[channelIndex].get(); 129 return m_channels[channelIndex].get();
114 } 130 }
115 131
116 void AudioBuffer::zero() 132 void AudioBuffer::zero()
117 { 133 {
118 for (unsigned i = 0; i < m_channels.size(); ++i) { 134 for (unsigned i = 0; i < m_channels.size(); ++i) {
119 if (getChannelData(i)) 135 if (getChannelData(i))
120 getChannelData(i)->zeroRange(0, length()); 136 getChannelData(i)->zeroRange(0, length());
121 } 137 }
122 } 138 }
123 139
124 } // namespace WebCore 140 } // namespace WebCore
125 141
126 #endif // ENABLE(WEB_AUDIO) 142 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « Source/modules/webaudio/AudioBuffer.h ('k') | Source/modules/webaudio/AudioContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698