Provide valuable diagnostics for seek events control by the GST_SEEK debug category.

Original commit message from CVS:
Provide valuable diagnostics for seek events control by the GST_SEEK
debug category.

diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 7c4d1e5..0c5c030 100644 (file)
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -22,6 +22,8 @@
 #endif
 #include <gst/gst.h>
 
+GST_DEBUG_CATEGORY_EXTERN (GST_CAT_SEEK);
+
 #include <string.h>
 #include <mad.h>
 #include "id3tag.h"
@@ -613,6 +615,13 @@ index_seek (GstMad *mad, GstPad *pad, GstEvent *event)
     if (gst_index_entry_assoc_map (entry, *try_formats, &value)) {
       /* lookup succeeded, create the seek */
 
+      GST_CAT_DEBUG (GST_CAT_SEEK, "index %s %" G_GINT64_FORMAT
+                    " -> %s %" G_GINT64_FORMAT,
+                    gst_format_get_details (GST_EVENT_SEEK_FORMAT (event))->nick,
+                    GST_EVENT_SEEK_OFFSET (event),
+                    gst_format_get_details (*try_formats)->nick,
+                    value);
+
       GstEvent *seek_event =
        gst_event_new_seek (*try_formats |
                            GST_SEEK_METHOD_SET |

diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c
index 522c6ac..4bdaa06 100644 (file)
--- a/ext/mpeg2dec/gstmpeg2dec.c
+++ b/ext/mpeg2dec/gstmpeg2dec.c
@@ -26,6 +26,8 @@
 
 #include "gstmpeg2dec.h"
 
+GST_DEBUG_CATEGORY_EXTERN (GST_CAT_SEEK);
+
 /* elementfactory information */
 static GstElementDetails gst_mpeg2dec_details = {
   "mpeg1 and mpeg2 video decoder",
@@ -931,6 +933,13 @@ index_seek (GstPad *pad, GstEvent *event)
       if (gst_index_entry_assoc_map (entry, *try_formats, &value)) {
         GstEvent *seek_event;
 
+       GST_CAT_DEBUG (GST_CAT_SEEK, "index %s %" G_GINT64_FORMAT
+                      " -> %s %" G_GINT64_FORMAT,
+                      gst_format_get_details (GST_EVENT_SEEK_FORMAT (event))->nick,
+                      GST_EVENT_SEEK_OFFSET (event),
+                      gst_format_get_details (*try_formats)->nick,
+                      value);
+
         /* lookup succeeded, create the seek */
         seek_event = gst_event_new_seek (*try_formats | GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH, value);
         /* do the seekk */

diff --git a/gst/mpegstream/gstmpegdemux.c b/gst/mpegstream/gstmpegdemux.c
index b15d343..b5123de 100644 (file)
--- a/gst/mpegstream/gstmpegdemux.c
+++ b/gst/mpegstream/gstmpegdemux.c
@@ -24,6 +24,8 @@
 #endif
 #include <gstmpegdemux.h>
 
+GST_DEBUG_CATEGORY_EXTERN (GST_CAT_SEEK);
+
 /* elementfactory information */
 static GstElementDetails mpeg_demux_details = {
   "MPEG Demuxer",
@@ -330,6 +332,23 @@ gst_mpeg_demux_parse_packhead (GstMPEGParse *mpeg_parse, GstBuffer *buffer)
   return TRUE;
 }
 
+static gint
+_demux_get_writer_id (GstIndex *index, GstPad *pad)
+{
+  gint id;
+  if (!gst_index_get_writer_id (index, GST_OBJECT (pad), &id)) {
+    GST_CAT_WARNING_OBJECT (GST_CAT_SEEK, index,
+                           "can't get index id for %s:%s",
+                           GST_DEBUG_PAD_NAME (pad));
+    return -1;
+  } else {
+    GST_CAT_LOG_OBJECT (GST_CAT_SEEK, index,
+                        "got index id %d for %s:%s",
+                       id, GST_DEBUG_PAD_NAME (pad));
+    return id;
+  }
+}
+
 static gboolean
 gst_mpeg_demux_parse_syshead (GstMPEGParse *mpeg_parse, GstBuffer *buffer)
 {
@@ -458,10 +477,9 @@ gst_mpeg_demux_parse_syshead (GstMPEGParse *mpeg_parse, GstBuffer *buffer)
        (*outstream)->size_bound = buf_byte_size_bound;
        mpeg_demux->total_size_bound += buf_byte_size_bound;
 
-       if (mpeg_demux->index) {
-          gst_index_get_writer_id (mpeg_demux->index, GST_OBJECT (*outpad),
-                           &(*outstream)->index_id);
-       }
+       if (mpeg_demux->index)
+         (*outstream)->index_id =
+           _demux_get_writer_id (mpeg_demux->index, *outpad);
 
        if (GST_PAD_IS_USABLE (*outpad)) {
           GstEvent *event;
@@ -903,10 +921,9 @@ gst_mpeg_demux_parse_pes (GstMPEGParse *mpeg_parse, GstBuffer *buffer)
       gst_element_add_pad(GST_ELEMENT(mpeg_demux), *outpad);
       gst_pad_set_element_private (*outpad, *outstream);
 
-      if (mpeg_demux->index) {
-        gst_index_get_writer_id (mpeg_demux->index, GST_OBJECT (*outpad),
-                                 &(*outstream)->index_id);
-      }
+      if (mpeg_demux->index)
+       (*outstream)->index_id =
+         _demux_get_writer_id (mpeg_demux->index, *outpad);
     }
     else {
       g_warning ("cannot create pad %s, no template for %02x", name, id);
@@ -1050,10 +1067,22 @@ index_seek (GstPad *pad, GstEvent *event, gint64 *offset)
                                      GST_INDEX_LOOKUP_BEFORE, 0,
                                      GST_EVENT_SEEK_FORMAT (event),
                                      GST_EVENT_SEEK_OFFSET (event));
-  if (!entry)
+  if (!entry) {
+    GST_CAT_WARNING (GST_CAT_SEEK, "%s:%s index %s %" G_GINT64_FORMAT
+                    " -> failed",
+                    GST_DEBUG_PAD_NAME (pad),
+                    gst_format_get_details (GST_EVENT_SEEK_FORMAT (event))->nick,
+                    GST_EVENT_SEEK_OFFSET (event));
     return FALSE;
+  }
 
   if (gst_index_entry_assoc_map (entry, GST_FORMAT_BYTES, offset)) {
+    GST_CAT_DEBUG (GST_CAT_SEEK, "%s:%s index %s %" G_GINT64_FORMAT
+                  " -> %" G_GINT64_FORMAT " bytes",
+                  GST_DEBUG_PAD_NAME (pad),
+                  gst_format_get_details (GST_EVENT_SEEK_FORMAT (event))->nick,
+                  GST_EVENT_SEEK_OFFSET (event),
+                  *offset);
     return TRUE;
   }
   return FALSE;
@@ -1072,11 +1101,19 @@ normal_seek (GstPad *pad, GstEvent *event, gint64 *offset)
   res = gst_pad_convert (pad, GST_FORMAT_BYTES, mpeg_demux->total_size_bound,
                         &format, &adjust);
 
-  GST_DEBUG ("seek adjusted from %" G_GINT64_FORMAT " bytes to %" G_GINT64_FORMAT "\n", mpeg_demux->total_size_bound, adjust);
-
-  if (res) 
+  if (res) {
     *offset = MAX (GST_EVENT_SEEK_OFFSET (event) - adjust, 0);
 
+    GST_CAT_DEBUG (GST_CAT_SEEK, "%s:%s guestimate %" G_GINT64_FORMAT
+                  " %s -> %" G_GINT64_FORMAT
+                  " (total_size_bound = %" G_GINT64_FORMAT ")",
+                  GST_DEBUG_PAD_NAME (pad),
+                  GST_EVENT_SEEK_OFFSET (event),
+                  gst_format_get_details (GST_EVENT_SEEK_FORMAT (event))->nick,
+                  *offset,
+                  mpeg_demux->total_size_bound);
+  }
+
    return res;
 }
 

diff --git a/gst/mpegstream/gstmpegparse.c b/gst/mpegstream/gstmpegparse.c
index cd3ab78..85041f3 100644 (file)
--- a/gst/mpegstream/gstmpegparse.c
+++ b/gst/mpegstream/gstmpegparse.c
@@ -27,6 +27,8 @@
 
 static GstFormat scr_format;
 
+GST_DEBUG_CATEGORY_EXTERN (GST_CAT_SEEK);
+
 /* elementfactory information */
 static GstElementDetails mpeg_parse_details = {
   "MPEG System Parser",
@@ -712,6 +714,12 @@ index_seek (GstPad *pad, GstEvent *event, guint64 *offset, gint64 *scr)
     if (gst_index_entry_assoc_map (entry, GST_FORMAT_TIME, &time)) {
       *scr = GSTTIME_TO_MPEGTIME (time);
     }
+    GST_CAT_DEBUG (GST_CAT_SEEK, "%s:%s index %s %" G_GINT64_FORMAT
+                  " -> %" G_GINT64_FORMAT " bytes, scr=%" G_GINT64_FORMAT,
+                  GST_DEBUG_PAD_NAME (pad),
+                  gst_format_get_details (GST_EVENT_SEEK_FORMAT (event))->nick,
+                  GST_EVENT_SEEK_OFFSET (event),
+                  *offset, *scr);
     return TRUE;
   }
   return FALSE;