gst/typefind/gsttypefindfunctions.c: When typefinding an MP3 in push-based mode,...

Original commit message from CVS:
* gst/typefind/gsttypefindfunctions.c: (mp3_type_find_at_offset),
(mpeg_ts_probe_headers), (mpeg_ts_type_find):
When typefinding an MP3 in push-based mode, don't penalise the
probability down to 74% when we found 5 valid frames just because we
can't peek the end of the file.
Make the probability for detecting MPEG Transport Streams based on the
number of sequential headers we successfully detected.

diff --git a/ChangeLog b/ChangeLog
index 2d727e4ae3482e1a0eee4a199d23610c926a6e17..903600fa4509b4735519012ec88761108efd4e4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-05-03  Jan Schmidt  <thaytan@mad.scientist.com>
+
+       * gst/typefind/gsttypefindfunctions.c: (mp3_type_find_at_offset),
+       (mpeg_ts_probe_headers), (mpeg_ts_type_find):
+
+       When typefinding an MP3 in push-based mode, don't penalise the
+       probability down to 74% when we found 5 valid frames just because we
+       can't peek the end of the file.
+
+       Make the probability for detecting MPEG Transport Streams based on the
+       number of sequential headers we successfully detected.
+
 2006-05-03  Wim Taymans  <wim@fluendo.com>
 
        * ext/vorbis/vorbisdec.c: (vorbis_dec_sink_event),

diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c
index addcbdef59a9c3f0dcae99bb9e24e8fc2f98371d..b146275ff65c7e323f650277ff7119a2f1769199 100644 (file)
--- a/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@ -692,9 +692,7 @@ mp3_type_find_at_offset (GstTypeFind * tf, guint64 start_off,
             GST_MP3_TYPEFIND_TRY_SYNC);
         /* make sure we're not id3 tagged */
         head_data = gst_type_find_peek (tf, -128, 3);
-        if (!head_data) {
-          probability = probability * 4 / 5;
-        } else if (memcmp (head_data, "TAG", 3) == 0) {
+        if (head_data && (memcmp (head_data, "TAG", 3) == 0)) {
           probability = 0;
         }
         g_assert (probability <= GST_TYPE_FIND_MAXIMUM);
@@ -1091,11 +1089,13 @@ static GstStaticCaps mpegts_caps = GST_STATIC_CAPS ("video/mpegts, "
     "systemstream = (boolean) true, packetsize = (int) [ 188, 208 ]");
 #define MPEGTS_CAPS gst_static_caps_get(&mpegts_caps)
 
-#define GST_MPEGTS_TYPEFIND_TRY_HEADERS 4
+#define GST_MPEGTS_TYPEFIND_MIN_HEADERS 4
+#define GST_MPEGTS_TYPEFIND_MAX_HEADERS 10
 #define GST_MPEGTS_MAX_PACKET_SIZE 204
-#define GST_MPEGTS_TYPEFIND_MAX_SYNC (10 * GST_MPEGTS_MAX_PACKET_SIZE)
 #define GST_MPEGTS_TYPEFIND_SYNC_SIZE \
-            (GST_MPEGTS_TYPEFIND_TRY_HEADERS * GST_MPEGTS_MAX_PACKET_SIZE)
+            (GST_MPEGTS_TYPEFIND_MIN_HEADERS * GST_MPEGTS_MAX_PACKET_SIZE)
+#define GST_MPEGTS_TYPEFIND_MAX_SYNC \
+            (GST_MPEGTS_TYPEFIND_MAX_HEADERS * GST_MPEGTS_MAX_PACKET_SIZE)
 
 #define MPEGTS_HDR_SIZE 4
 #define IS_MPEGTS_HEADER(data) (((data)[0] == 0x47) && \
@@ -1111,7 +1111,7 @@ mpeg_ts_probe_headers (GstTypeFind * tf, guint64 offset, gint packet_size)
   gint found = 1;
   guint8 *data = NULL;
 
-  while (found < GST_MPEGTS_TYPEFIND_TRY_HEADERS) {
+  while (found < GST_MPEGTS_TYPEFIND_MAX_HEADERS) {
     offset += packet_size;
 
     data = gst_type_find_peek (tf, offset, MPEGTS_HDR_SIZE);
@@ -1151,14 +1151,24 @@ mpeg_ts_type_find (GstTypeFind * tf, gpointer unused)
       gint p;
 
       for (p = 0; p < n_pack_sizes; p++) {
+        gint found;
+
         /* Probe ahead at size pack_sizes[p] */
-        if (mpeg_ts_probe_headers (tf, skipped, pack_sizes[p]) >=
-            GST_MPEGTS_TYPEFIND_TRY_HEADERS) {
+        found = mpeg_ts_probe_headers (tf, skipped, pack_sizes[p]);
+        if (found >= GST_MPEGTS_TYPEFIND_MIN_HEADERS) {
+          gint probability;
           GstCaps *caps = gst_caps_copy (MPEGTS_CAPS);
 
           gst_structure_set (gst_caps_get_structure (caps, 0), "packetsize",
               G_TYPE_INT, pack_sizes[p], NULL);
-          gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM - 1, caps);
+
+          /* found at least 4 headers. 10 headers = MAXIMUM probability. 
+           * Arbitrarily, I assigned 10% probability for each header we
+           * found, 40% -> 100% */
+
+          probability = 10 * MIN (found, 10);
+
+          gst_type_find_suggest (tf, probability, caps);
           gst_caps_unref (caps);
           return;
         }