Merge pull request #32041 from jimporter/music-check-playability-fix

Bug 1208331 - [music] Fix checkPlayability (again)
mozilla-b2g · Sep 26, 2015 · 5867322 · 5867322
2 parents 3b42b49 + bebd13d
commit 5867322
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/apps/music/js/metadata/core.js b/apps/music/js/metadata/core.js
@@ -137,14 +137,28 @@ var AudioMetadata = (function() {
         var url = URL.createObjectURL(blob);
         player.src = url;
 
-        player.onerror = player.onsuspend = function() {
+        // XXX: There seems to have been a gecko regression, and error events
+        // are no longer being fired when we try to play some invalid audio
+        // files. To work around this, we use a timeout to assume the file is
+        // unplayable if we nave not gotten any events within a reasonable
+        // amount of time. See also bugs 1208331 and 1198169.
+        const CANPLAY_TIMEOUT = 3000;
+        var timeoutId = setTimeout(() => {
+          console.error('No oncanplay or error events seen yet.',
+                        'Assuming file is corrupt:', blob.name);
+          player.onerror();
+        }, CANPLAY_TIMEOUT);
+
+        player.onerror = function() {
+          clearTimeout(timeoutId);
           URL.revokeObjectURL(url);
           player.removeAttribute('src');
           player.load();
           reject('Unplayable music file');
         };
 
         player.oncanplay = function() {
+          clearTimeout(timeoutId);
           URL.revokeObjectURL(url);
           player.removeAttribute('src');
           player.load();

diff --git a/dev_apps/music-nga/js/metadata/core.js b/dev_apps/music-nga/js/metadata/core.js
@@ -137,14 +137,28 @@ var AudioMetadata = (function() {
         var url = URL.createObjectURL(blob);
         player.src = url;
 
-        player.onerror = player.onsuspend = function() {
+        // XXX: There seems to have been a gecko regression, and error events
+        // are no longer being fired when we try to play some invalid audio
+        // files. To work around this, we use a timeout to assume the file is
+        // unplayable if we nave not gotten any events within a reasonable
+        // amount of time. See also bugs 1208331 and 1198169.
+        const CANPLAY_TIMEOUT = 3000;
+        var timeoutId = setTimeout(() => {
+          console.error('No oncanplay or error events seen yet.',
+                        'Assuming file is corrupt:', blob.name);
+          player.onerror();
+        }, CANPLAY_TIMEOUT);
+
+        player.onerror = function() {
+          clearTimeout(timeoutId);
           URL.revokeObjectURL(url);
           player.removeAttribute('src');
           player.load();
           reject('Unplayable music file');
         };
 
         player.oncanplay = function() {
+          clearTimeout(timeoutId);
           URL.revokeObjectURL(url);
           player.removeAttribute('src');
           player.load();