- Revision
- 202845
- Author
- [email protected]
- Date
- 2016-07-05 21:11:44 -0700 (Tue, 05 Jul 2016)
Log Message
Throw exceptions for invalid number of channels for ConvolverNode
<https://webkit.org/b/159238>
Patch by David Kilzer <[email protected]> on 2016-07-05
Reviewed by Brent Fulgham.
Source/WebCore:
Fix based on a Blink change (patch by <[email protected]>):
<https://chromium.googlesource.com/chromium/src.git/+/0cc26bbb7175aec77910d0b47faf9f8c8a640fe5>
Also includes a related fix for ReverbConvolverStage (patch by <[email protected]>):
<https://src.chromium.org/viewvc/blink?revision=157832&view=revision>
Test: webaudio/convolver-channels.html
* Modules/webaudio/ConvolverNode.cpp:
(WebCore::ConvolverNode::setBuffer): Throw an exception for
anything but 1, 2 or 4 channels.
* platform/audio/ReverbConvolverStage.cpp:
(WebCore::ReverbConvolverStage::ReverbConvolverStage): Don't read past the end of
the impulseResponse array.
LayoutTests:
Test based on a Blink change (patch by <[email protected]>):
<https://chromium.googlesource.com/chromium/src.git/+/0cc26bbb7175aec77910d0b47faf9f8c8a640fe5>
compatibility.js based on a Blink change (patch by <[email protected]>):
<https://chromium.googlesource.com/chromium/src.git/+/f846f5a461d1fcdbe5152898576c125058079ed1>
* webaudio/convolver-channels-expected.txt: Added.
* webaudio/convolver-channels.html: Added.
* webaudio/resources/compatibility.js: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (202844 => 202845)
--- trunk/LayoutTests/ChangeLog 2016-07-06 02:50:33 UTC (rev 202844)
+++ trunk/LayoutTests/ChangeLog 2016-07-06 04:11:44 UTC (rev 202845)
@@ -1,3 +1,20 @@
+2016-07-05 David Kilzer <[email protected]>
+
+ Throw exceptions for invalid number of channels for ConvolverNode
+ <https://webkit.org/b/159238>
+
+ Reviewed by Brent Fulgham.
+
+ Test based on a Blink change (patch by <[email protected]>):
+ <https://chromium.googlesource.com/chromium/src.git/+/0cc26bbb7175aec77910d0b47faf9f8c8a640fe5>
+
+ compatibility.js based on a Blink change (patch by <[email protected]>):
+ <https://chromium.googlesource.com/chromium/src.git/+/f846f5a461d1fcdbe5152898576c125058079ed1>
+
+ * webaudio/convolver-channels-expected.txt: Added.
+ * webaudio/convolver-channels.html: Added.
+ * webaudio/resources/compatibility.js: Added.
+
2016-07-05 Johan K. Jensen <[email protected]>
Web Inspector: Sending XHR with UTF8 encoded data shows garbled data in Resource sidebar
Added: trunk/LayoutTests/webaudio/convolver-channels-expected.txt (0 => 202845)
--- trunk/LayoutTests/webaudio/convolver-channels-expected.txt (rev 0)
+++ trunk/LayoutTests/webaudio/convolver-channels-expected.txt 2016-07-06 04:11:44 UTC (rev 202845)
@@ -0,0 +1,41 @@
+Test Supported Number of Channels for ConvolverNode
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS ConvolverNode with buffer of 1 channels did not throw exception.
+PASS ConvolverNode with buffer of 2 channels did not throw exception.
+PASS ConvolverNode with buffer of 3 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 4 channels did not throw exception.
+PASS ConvolverNode with buffer of 5 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 6 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 7 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 8 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 9 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 10 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 11 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 12 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 13 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 14 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 15 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 16 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 17 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 18 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 19 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 20 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 21 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 22 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 23 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 24 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 25 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 26 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 27 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 28 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 29 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 30 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 31 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS ConvolverNode with buffer of 32 channels threw exception Error: NotSupportedError: DOM Exception 9.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/webaudio/convolver-channels.html (0 => 202845)
--- trunk/LayoutTests/webaudio/convolver-channels.html (rev 0)
+++ trunk/LayoutTests/webaudio/convolver-channels.html 2016-07-06 04:11:44 UTC (rev 202845)
@@ -0,0 +1,42 @@
+<!doctype html>
+<html>
+<head>
+<script src=""
+<script src=""
+<script src=""
+<title>Test Supported Number of Channels for ConvolverNode</title>
+</head>
+<body>
+<script>
+description("Test Supported Number of Channels for ConvolverNode");
+window.jsTestIsAsync = true;
+
+function runTest() {
+ // Just need a context to create nodes on, so any allowed length and rate is ok.
+ var context = new OfflineAudioContext(1, 1, 48000);
+
+ for (var count = 1; count <= 32; ++count) {
+ var convolver = context.createConvolver();
+ var buffer = context.createBuffer(count, 1, context.sampleRate);
+ var message = "ConvolverNode with buffer of " + count + " channels";
+
+ if (count == 1 || count == 2 || count == 4) {
+ // These are the only valid channel counts for the buffer.
+ shouldNotThrow(function () {
+ convolver.buffer = buffer;
+ }, message);
+ } else {
+ shouldThrow(function() {
+ convolver.buffer = buffer;
+ }, "'Error: NotSupportedError: DOM Exception 9'", message);
+ }
+ }
+
+ finishJSTest();
+}
+
+runTest();
+successfullyParsed = true;
+</script>
+</body>
+</html>
Added: trunk/LayoutTests/webaudio/resources/compatibility.js (0 => 202845)
--- trunk/LayoutTests/webaudio/resources/compatibility.js (rev 0)
+++ trunk/LayoutTests/webaudio/resources/compatibility.js 2016-07-06 04:11:44 UTC (rev 202845)
@@ -0,0 +1,8 @@
+// This will prevent work to update tests to use unprefixed objects in
+// the future. It wll also make it possible to bisect builds using
+// a WebKit that only supports prefixed objects.
+
+if (window.hasOwnProperty('webkitAudioContext') && !window.hasOwnProperty('AudioContext')) {
+ window.AudioContext = webkitAudioContext;
+ window.OfflineAudioContext = webkitOfflineAudioContext;
+}
Modified: trunk/Source/WebCore/ChangeLog (202844 => 202845)
--- trunk/Source/WebCore/ChangeLog 2016-07-06 02:50:33 UTC (rev 202844)
+++ trunk/Source/WebCore/ChangeLog 2016-07-06 04:11:44 UTC (rev 202845)
@@ -1,3 +1,25 @@
+2016-07-05 David Kilzer <[email protected]>
+
+ Throw exceptions for invalid number of channels for ConvolverNode
+ <https://webkit.org/b/159238>
+
+ Reviewed by Brent Fulgham.
+
+ Fix based on a Blink change (patch by <[email protected]>):
+ <https://chromium.googlesource.com/chromium/src.git/+/0cc26bbb7175aec77910d0b47faf9f8c8a640fe5>
+
+ Also includes a related fix for ReverbConvolverStage (patch by <[email protected]>):
+ <https://src.chromium.org/viewvc/blink?revision=157832&view=revision>
+
+ Test: webaudio/convolver-channels.html
+
+ * Modules/webaudio/ConvolverNode.cpp:
+ (WebCore::ConvolverNode::setBuffer): Throw an exception for
+ anything but 1, 2 or 4 channels.
+ * platform/audio/ReverbConvolverStage.cpp:
+ (WebCore::ReverbConvolverStage::ReverbConvolverStage): Don't read past the end of
+ the impulseResponse array.
+
2016-07-05 Johan K. Jensen <[email protected]>
Web Inspector: Sending XHR with UTF8 encoded data shows garbled data in Resource sidebar
Modified: trunk/Source/WebCore/Modules/webaudio/ConvolverNode.cpp (202844 => 202845)
--- trunk/Source/WebCore/Modules/webaudio/ConvolverNode.cpp 2016-07-06 02:50:33 UTC (rev 202844)
+++ trunk/Source/WebCore/Modules/webaudio/ConvolverNode.cpp 2016-07-06 04:11:44 UTC (rev 202845)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2010, Google Inc. All rights reserved.
+ * Copyright (C) 2016, Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -131,11 +132,14 @@
unsigned numberOfChannels = buffer->numberOfChannels();
size_t bufferLength = buffer->length();
- // The current implementation supports up to four channel impulse responses, which are interpreted as true-stereo (see Reverb class).
- bool isBufferGood = numberOfChannels > 0 && numberOfChannels <= 4 && bufferLength;
- ASSERT(isBufferGood);
- if (!isBufferGood)
+ // The current implementation supports only 1-, 2-, or 4-channel impulse responses, with the
+ // 4-channel response being interpreted as true-stereo (see Reverb class).
+ bool isChannelCountGood = (numberOfChannels == 1 || numberOfChannels == 2 || numberOfChannels == 4) && bufferLength;
+
+ if (!isChannelCountGood) {
+ ec = NOT_SUPPORTED_ERR;
return;
+ }
// Wrap the AudioBuffer by an AudioBus. It's an efficient pointer set and not a memcpy().
// This memory is simply used in the Reverb constructor and no reference to it is kept for later use in that class.
Modified: trunk/Source/WebCore/platform/audio/ReverbConvolverStage.cpp (202844 => 202845)
--- trunk/Source/WebCore/platform/audio/ReverbConvolverStage.cpp 2016-07-06 02:50:33 UTC (rev 202844)
+++ trunk/Source/WebCore/platform/audio/ReverbConvolverStage.cpp 2016-07-06 04:11:44 UTC (rev 202845)
@@ -57,8 +57,11 @@
m_fftKernel->doPaddedFFT(impulseResponse + stageOffset, stageLength);
m_fftConvolver = std::make_unique<FFTConvolver>(fftSize);
} else {
+ ASSERT(!stageOffset);
+ ASSERT(stageLength <= fftSize / 2);
+
m_directKernel = std::make_unique<AudioFloatArray>(fftSize / 2);
- m_directKernel->copyToRange(impulseResponse + stageOffset, 0, fftSize / 2);
+ m_directKernel->copyToRange(impulseResponse, 0, stageLength);
m_directConvolver = std::make_unique<DirectConvolver>(renderSliceSize);
}
m_temporaryBuffer.allocate(renderSliceSize);
