summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorathenian200 <athenian200@outlook.com>2020-05-10 06:45:59 -0500
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-05-20 17:18:39 +0200
commit6e0aee959ecc485297c2da5bc9229d3cff13ccc4 (patch)
tree82fa238c9c4225575757ef33a76efbf91c4af732
parentba5930cc8ee975db4691f8a6d26503a9dae0135c (diff)
downloadUXP-6e0aee959ecc485297c2da5bc9229d3cff13ccc4.tar
UXP-6e0aee959ecc485297c2da5bc9229d3cff13ccc4.tar.gz
UXP-6e0aee959ecc485297c2da5bc9229d3cff13ccc4.tar.lz
UXP-6e0aee959ecc485297c2da5bc9229d3cff13ccc4.tar.xz
UXP-6e0aee959ecc485297c2da5bc9229d3cff13ccc4.zip
Issue #1540 - Stop MP3 demuxer from choking on very small files.
-rw-r--r--dom/media/mp3/MP3Demuxer.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/dom/media/mp3/MP3Demuxer.cpp b/dom/media/mp3/MP3Demuxer.cpp
index 5a98cabfe..ccc515afb 100644
--- a/dom/media/mp3/MP3Demuxer.cpp
+++ b/dom/media/mp3/MP3Demuxer.cpp
@@ -396,7 +396,10 @@ MP3TrackDemuxer::Duration(int64_t aNumFrames) const {
MediaByteRange
MP3TrackDemuxer::FindFirstFrame() {
- static const int MIN_SUCCESSIVE_FRAMES = 4;
+ // This check is meant to avoid invalid frames from broken streams, but
+ // small MP3 files and streams with odd header data can break this. Lowering
+ // the value to 3 seems to help significantly.
+ static const int MIN_SUCCESSIVE_FRAMES = 3;
MediaByteRange candidateFrame = FindNextFrame();
int numSuccFrames = candidateFrame.Length() > 0;