Backed out changesets 5447d49a2c6f and ab9c9d0819a2 (bug 867089) for mochitest failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 30 Apr 2013 11:16:55 -0400
changeset 130344 4b68073547c02a96f65e7794fd8e4875edda049f
parent 130343 ca037d3e866fd6151666ea4ce9cad257e0d6056d
child 130346 93bc6ed05bc66e33928e919f1c5c43461ce96cf5
push id27318
push userryanvm@gmail.com
push dateTue, 30 Apr 2013 15:16:53 +0000
treeherdermozilla-inbound@4b68073547c0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs867089
milestone23.0a1
backs out5447d49a2c6fcc4fe725676e0553ba66fe5a4f8d
ab9c9d0819a2b62feb9dd6c2ac9d9fd29fa08f75
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changesets 5447d49a2c6f and ab9c9d0819a2 (bug 867089) for mochitest failures. CLOSED TREE
content/media/webaudio/AudioBufferSourceNode.cpp
content/media/webaudio/test/Makefile.in
content/media/webaudio/test/test_bug867089.html
--- a/content/media/webaudio/AudioBufferSourceNode.cpp
+++ b/content/media/webaudio/AudioBufferSourceNode.cpp
@@ -307,21 +307,16 @@ public:
   void UpdateSampleRateIfNeeded(AudioNodeStream* aStream)
   {
     if (mPlaybackRateTimeline.HasSimpleValue()) {
       mPlaybackRate = mPlaybackRateTimeline.GetValue();
     } else {
       mPlaybackRate = mPlaybackRateTimeline.GetValueAtTime<TrackTicks>(aStream->GetCurrentPosition());
     }
 
-    // Make sure the playback rate if something our resampler can work with.
-    if (mPlaybackRate <= 0.0 || mPlaybackRate >= 1024) {
-      mPlaybackRate = 1.0;
-    }
-
     uint32_t currentOutSampleRate, currentInSampleRate;
     if (ShouldResample()) {
       SpeexResamplerState* resampler = Resampler(mChannels);
       speex_resampler_get_rate(resampler, &currentInSampleRate, &currentOutSampleRate);
       uint32_t finalSampleRate = ComputeFinalOutSampleRate();
       if (currentOutSampleRate != finalSampleRate) {
         speex_resampler_set_rate(resampler, currentInSampleRate, finalSampleRate);
       }
--- a/content/media/webaudio/test/Makefile.in
+++ b/content/media/webaudio/test/Makefile.in
@@ -14,17 +14,16 @@ MOCHITEST_FILES := \
   webaudio.js \
   test_bug808374.html \
   test_bug827541.html \
   test_bug839753.html \
   test_bug845960.html \
   test_bug856771.html \
   test_bug866570.html \
   test_bug866737.html \
-  test_bug867089.html \
   test_analyserNode.html \
   test_AudioBuffer.html \
   test_AudioContext.html \
   test_AudioListener.html \
   test_AudioParam.html \
   test_audioBufferSourceNode.html \
   test_audioBufferSourceNodeLoop.html \
   test_audioBufferSourceNodeLoopStartEnd.html \
deleted file mode 100644
--- a/content/media/webaudio/test/test_bug867089.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Crashtest for bug 867089</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-SpecialPowers.setBoolPref("media.webaudio.enabled", true);
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(function() {
-  var ctx = new AudioContext();
-
-  // Test invalid playbackRate values for AudioBufferSourceNode.
-  var source = ctx.createBufferSource();
-  var buffer = ctx.createBuffer(2, 2048, 8000);
-  source.buffer = buffer;
-  source.playbackRate.value = 0.0;
-  source.connect(ctx.destination);
-  source.start(0);
-
-  var source2 = ctx.createBufferSource();
-  source2.buffer = buffer;
-  source2.playbackRate.value = -1.0;
-  source2.connect(ctx.destination);
-  source2.start(0);
-
-  var source2 = ctx.createBufferSource();
-  source3.buffer = buffer;
-  source3.playbackRate.value = 3000000.0;
-  source3.connect(ctx.destination);
-  source3.start(0);
-  ok(true, "We did not crash.");
-  SpecialPowers.clearUserPref("media.webaudio.enabled");
-  SimpleTest.finish();
-});
-
-
-</script>
-</pre>
-</body>
-</html>