From 7ab1a757edee34e89262edb6e828b50590701e9f Mon Sep 17 00:00:00 2001 From: Paul Adenot Date: Fri, 7 Sep 2012 16:14:05 -0700 Subject: [PATCH] Bug 789077 - Remove sniffing for mp3 without ID3 because of false positives. r=cpearce --- content/media/test/manifest.js | 2 -- toolkit/components/mediasniffer/nsMediaSniffer.cpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/content/media/test/manifest.js b/content/media/test/manifest.js index de6e9ad0ed7b..6a5ae63628ed 100644 --- a/content/media/test/manifest.js +++ b/content/media/test/manifest.js @@ -162,8 +162,6 @@ var gSnifferTests = [ { name:"320x240.ogv", type:"video/ogg", width:320, height:240, duration:0.233, size:28942 }, { name:"seek.webm", type:"video/webm", duration:3.966, size:215529 }, { name:"short.mp4", type:"video/mp4", duration:0.2, size:29435}, - // A mp3 file without id3 tags. - { name:"notags.mp3", type:"audio/mpeg", duration:0.28, size:2506}, // A mp3 file with id3 tags. { name:"id3tags.mp3", type:"audio/mpeg", duration:0.28, size:3530}, { name:"bogus.duh", type:"bogus/duh" } diff --git a/toolkit/components/mediasniffer/nsMediaSniffer.cpp b/toolkit/components/mediasniffer/nsMediaSniffer.cpp index 0c15513f197a..c2dd6716adda 100644 --- a/toolkit/components/mediasniffer/nsMediaSniffer.cpp +++ b/toolkit/components/mediasniffer/nsMediaSniffer.cpp @@ -27,8 +27,6 @@ nsMediaSniffer::nsMediaSnifferEntry nsMediaSniffer::sSnifferEntries[] = { PATTERN_ENTRY("\xFF\xFF\xFF\xFF\x00\x00\x00\x00\xFF\xFF\xFF\xFF", "RIFF\x00\x00\x00\x00WAVE", AUDIO_WAV), // WebM PATTERN_ENTRY("\xFF\xFF\xFF\xFF", "\x1A\x45\xDF\xA3", VIDEO_WEBM), - // mp3 without ID3 tags. - PATTERN_ENTRY("\xFF\xFB", "\xFF\xFA", AUDIO_MP3), // mp3 with ID3 tags, the string "ID3". PATTERN_ENTRY("\xFF\xFF\xFF", "ID3", AUDIO_MP3) };