Add (hacky) check for webm audio files
authorMark Holmquist <mholmquist@wikimedia.org>
Mon, 10 Jul 2017 17:39:36 +0000 (12:39 -0500)
committerMark Holmquist <mholmquist@wikimedia.org>
Tue, 11 Jul 2017 19:06:19 +0000 (14:06 -0500)
If there is no video track in a webm file, it's supposed to be audio/webm,
but since we assume every webm file is video/webm, that's never worked.
This should slightly improve searching for audio files.

Bug: T156135
Change-Id: Iac749233e87b3622ff416ad503aedef3df0d0f1d

includes/libs/mime/MimeAnalyzer.php

index 0083e4b..631bb17 100644 (file)
@@ -709,8 +709,17 @@ EOT;
                                        $this->logger->info( __METHOD__ . ": recognized file as video/x-matroska\n" );
                                        return "video/x-matroska";
                                } elseif ( strncmp( $data, "webm", 4 ) == 0 ) {
-                                       $this->logger->info( __METHOD__ . ": recognized file as video/webm\n" );
-                                       return "video/webm";
+                                       // XXX HACK look for a video track, if we don't find it, this is an audio file
+                                       $videotrack = strpos( $head, "\x86\x85V_VP" );
+
+                                       if ( $videotrack ) {
+                                               // There is a video track, so this is a video file.
+                                               $this->logger->info( __METHOD__ . ": recognized file as video/webm\n" );
+                                               return "video/webm";
+                                       }
+
+                                       $this->logger->info( __METHOD__ . ": recognized file as audio/webm\n" );
+                                       return "audio/webm";
                                }
                        }
                        $this->logger->info( __METHOD__ . ": unknown EBML file\n" );