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

Unified Diff: Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp

Issue 12217152: Merge 140879 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp
===================================================================
--- Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp (revision 142675)
+++ Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp (working copy)
@@ -117,7 +117,11 @@
ASSERT(isSafe);
if (isSafe) {
- nonSilentFramesToProcess -= framesToZero;
+ if (framesToZero > nonSilentFramesToProcess)
+ nonSilentFramesToProcess = 0;
+ else
+ nonSilentFramesToProcess -= framesToZero;
+
for (unsigned i = 0; i < outputBus->numberOfChannels(); ++i)
memset(outputBus->channel(i)->mutableData() + zeroStartFrame, 0, sizeof(float) * framesToZero);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698