diff options
author | Edward Hervey <edward@centricular.com> | 2018-01-03 15:31:04 +0100 |
---|---|---|
committer | Edward Hervey <bilboed@bilboed.com> | 2018-01-03 15:51:34 +0100 |
commit | 384d27002c9d3fc69c97451a5f12e2212cd550d4 (patch) | |
tree | 7ec68223e71c0bda75581e7a155dd8c97eb5e8aa | |
parent | 7cc1431a56193c291554ea8bf90c565d4aa3782b (diff) |
typefind: Fix mp3 typefinding with multiple different headers
(yes, this has never worked since it was introduced, don't worry)
If we want to actually detect layer/channels/samplerate changes,
it would be better to:
* not reset the various prev_* variables at every iteration.
* and actually store the values when they change
CID #206079
CID #206080
CID #206081
-rw-r--r-- | gst/typefind/gsttypefindfunctions.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c index 9d8005c14..c0fd0ebd8 100644 --- a/gst/typefind/gsttypefindfunctions.c +++ b/gst/typefind/gsttypefindfunctions.c @@ -1443,12 +1443,12 @@ mp3_type_find_at_offset (GstTypeFind * tf, guint64 start_off, guint found = 0; /* number of valid headers found */ guint64 offset = skipped; gboolean changed = FALSE; + guint prev_layer = 0; + guint prev_channels = 0, prev_samplerate = 0; while (found < GST_MP3_TYPEFIND_TRY_HEADERS) { guint32 head; guint length; - guint prev_layer = 0; - guint prev_channels = 0, prev_samplerate = 0; gboolean free = FALSE; if ((gint64) (offset - skipped + 4) >= 0 && @@ -1495,15 +1495,16 @@ mp3_type_find_at_offset (GstTypeFind * tf, guint64 start_off, * this header*/ if (prev_layer) changed = TRUE; - prev_layer = layer; - prev_channels = channels; - prev_samplerate = samplerate; } else { found++; GST_LOG ("found %d. header at offset %" G_GUINT64_FORMAT " (0x%" G_GINT64_MODIFIER "X)", found, start_off + offset, start_off + offset); } + prev_layer = layer; + prev_channels = channels; + prev_samplerate = samplerate; + offset += length; } g_assert (found <= GST_MP3_TYPEFIND_TRY_HEADERS); |