Title: [96843] trunk/Source/WebCore
- Revision
- 96843
- Author
- crog...@google.com
- Date
- 2011-10-06 12:07:34 -0700 (Thu, 06 Oct 2011)
Log Message
Make sure OfflineAudioContext can not be created with a sample-rate less than 44.1KHz
https://bugs.webkit.org/show_bug.cgi?id=69483
Reviewed by Kenneth Russell.
No new tests.
* webaudio/AudioBuffer.cpp:
(WebCore::AudioBuffer::create):
* webaudio/AudioContext.cpp:
(WebCore::AudioContext::createBuffer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (96842 => 96843)
--- trunk/Source/WebCore/ChangeLog 2011-10-06 19:03:46 UTC (rev 96842)
+++ trunk/Source/WebCore/ChangeLog 2011-10-06 19:07:34 UTC (rev 96843)
@@ -1,3 +1,17 @@
+2011-10-06 Chris Rogers <crog...@google.com>
+
+ Make sure OfflineAudioContext can not be created with a sample-rate less than 44.1KHz
+ https://bugs.webkit.org/show_bug.cgi?id=69483
+
+ Reviewed by Kenneth Russell.
+
+ No new tests.
+
+ * webaudio/AudioBuffer.cpp:
+ (WebCore::AudioBuffer::create):
+ * webaudio/AudioContext.cpp:
+ (WebCore::AudioContext::createBuffer):
+
2011-10-06 David Hyatt <hy...@apple.com>
https://bugs.webkit.org/show_bug.cgi?id=69544
Modified: trunk/Source/WebCore/webaudio/AudioBuffer.cpp (96842 => 96843)
--- trunk/Source/WebCore/webaudio/AudioBuffer.cpp 2011-10-06 19:03:46 UTC (rev 96842)
+++ trunk/Source/WebCore/webaudio/AudioBuffer.cpp 2011-10-06 19:07:34 UTC (rev 96843)
@@ -41,6 +41,9 @@
PassRefPtr<AudioBuffer> AudioBuffer::create(unsigned numberOfChannels, size_t numberOfFrames, float sampleRate)
{
+ if (sampleRate < 22050 || sampleRate > 96000 || numberOfChannels > 10 || !numberOfFrames)
+ return 0;
+
return adoptRef(new AudioBuffer(numberOfChannels, numberOfFrames, sampleRate));
}
Modified: trunk/Source/WebCore/webaudio/AudioContext.cpp (96842 => 96843)
--- trunk/Source/WebCore/webaudio/AudioContext.cpp 2011-10-06 19:03:46 UTC (rev 96842)
+++ trunk/Source/WebCore/webaudio/AudioContext.cpp 2011-10-06 19:07:34 UTC (rev 96843)
@@ -84,7 +84,9 @@
bool isSampleRateRangeGood(float sampleRate)
{
- return sampleRate >= 22050 && sampleRate <= 96000;
+ // FIXME: It would be nice if the minimum sample-rate could be less than 44.1KHz,
+ // but that will require some fixes in HRTFPanner::fftSizeForSampleRate(), and some testing there.
+ return sampleRate >= 44100 && sampleRate <= 96000;
}
}
@@ -296,9 +298,6 @@
PassRefPtr<AudioBuffer> AudioContext::createBuffer(unsigned numberOfChannels, size_t numberOfFrames, float sampleRate)
{
- if (!isSampleRateRangeGood(sampleRate) || numberOfChannels > 10 || !numberOfFrames)
- return 0;
-
return AudioBuffer::create(numberOfChannels, numberOfFrames, sampleRate);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
