Backed out changeset 2154b98caca7 (bug 1924925) for causing build bustages. CLOSED TREE

dom/media/flac/FlacDemuxer.cpp

@@ -618,10 +618,12 @@ bool FlacTrackDemuxer::Init() {
   do {
     uint32_t read = 0;
     nsresult ret = mSource.ReadAt(offset, buffer, BUFFER_SIZE, &read);
-    if (NS_FAILED(ret)) {
+    if (NS_FAILED(ret) || read < BUFFER_SIZE) {
+      // Assume that if we can't read that many bytes while parsing the header,
+      // that something is wrong.
       return false;
     }
-    if (!mParser->IsHeaderBlock(ubuffer, read)) {
+    if (!mParser->IsHeaderBlock(ubuffer, BUFFER_SIZE)) {
       // Not a header and we haven't reached the end of the metadata blocks.
       // Will fall back to using the frames header instead.
       break;

dom/media/webaudio/test/mochitest.toml

@@ -84,7 +84,6 @@ support-files = [
   "8ch-s16.wav",
   "../../webrtc/tests/mochitests/mediaStreamPlayback.js",
   "../../webrtc/tests/mochitests/head.js",
-  "0-frame.flac"
 ]
 
 ["test_OfflineAudioContext.html"]

dom/media/webaudio/test/test_decoderDelay.html

@@ -91,13 +91,6 @@
         "samplerate": 8000,
         "frameCount": 8192,
         "fuzz" : {}
-      },
-      {
-        // Bug 1924925 - Valid flac file that is very small.
-        "path": "tiny.flac",
-        "samplerate": 22500,
-        "frameCount": 2271,
-        "fuzz" : {}
       }
     ];