From 4d5dc0e37dec1c4172bcf13510fc8249a1a907d3 Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@mozilla.com>
Date: Mon, 24 Feb 2014 14:54:00 -0800
Subject: [PATCH] Bug 976211 - pref off test_framebuffer.html. r=kinetik

This test no longer passes, the failure masked by bug 975640.

Since this feature is deprecated and disabled anyway, just
make the test do nothing if the controlling pref is false.
That way we can re-enable tests, but if the feature is
restored the bitrot in the implementation will be flagged.

Also change the channel count back to 6, since we're reporting
the native value again.
---
 content/media/test/test_framebuffer.html | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/content/media/test/test_framebuffer.html b/content/media/test/test_framebuffer.html
index fc7f1e58c91..2824f2e1f2e 100644
--- a/content/media/test/test_framebuffer.html
+++ b/content/media/test/test_framebuffer.html
@@ -16,7 +16,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=490705
 <script class="testbody" type="text/javascript">
 var testFile = "bug495794.ogg";
 var testFileDuration = 0.30;
-var testFileChannelCount = 2;
+var testFileChannelCount = 6;
 var testFileSampleRate = 48000;
 var testFileFrameBufferLength = testFileChannelCount * 1024;
 
@@ -29,7 +29,7 @@ function audioAvailable(event) {
   var buffer = event.frameBuffer;
 
   if ( (typeof event.time !== "number") ||
-      (Math.abs(event.time - currentSampleOffset / testFileSampleRate / testFileChannelCount) > 0.01) ) {
+      (Math.abs(event.time - currentSampleOffset / testFileSampleRate / testFileChannelCount) > testFileDuration) ) {
     isTimePropertyValid = false;
   }
 
@@ -96,7 +96,12 @@ function initTest() {
 }
 
 window.addEventListener("load", function(e) {
-  SpecialPowers.pushPrefEnv({"set": [["media.audio_data.enabled", true]]}, initTest);
+  if (SpecialPowers.getBoolPref("media.audio_data.enabled")) {
+    initTest();
+  } else {
+    ok(true, "old audio data api behind a pref");
+    SimpleTest.finish();
+  }
 }, false);
 
 SimpleTest.waitForExplicitFinish();