resindvd: Plug a video parser in front of decoder

Seems to make playback both better and worse. The parser needs some
fixing, it seems :-/

diff --git a/ext/resindvd/resindvdbin.c b/ext/resindvd/resindvdbin.c
index 2fda97a15f1656cf4a03167bc2008c6524024d2f..1085e2fa0b6b73c61850a12625fb3705f104a366 100644 (file)
--- a/ext/resindvd/resindvdbin.c
+++ b/ext/resindvd/resindvdbin.c
@@ -337,6 +337,29 @@ _pad_block_destroy_notify (RsnDvdBinPadBlockCtx * ctx)
   g_slice_free (RsnDvdBinPadBlockCtx, ctx);
 }
 
+static gboolean
+try_link_pieces (GstElement * e1, const gchar * pad1, GstElement * e2,
+    const gchar * pad2)
+{
+  GstPad *src = gst_element_get_static_pad (e1, pad1);
+  GstPad *sink = gst_element_get_static_pad (e2, pad2);
+  gboolean ret = FALSE;
+
+  if (src == NULL || sink == NULL)
+    goto done;
+
+  if (GST_PAD_LINK_FAILED (gst_pad_link (src, sink)))
+    goto done;
+
+  ret = TRUE;
+done:
+  if (src)
+    gst_object_unref (src);
+  if (sink)
+    gst_object_unref (sink);
+  return ret;
+}
+
 static gboolean
 create_elements (RsnDvdBin * dvdbin)
 {
@@ -380,6 +403,10 @@ create_elements (RsnDvdBin * dvdbin)
       "max-size-time", (7 * GST_SECOND / 10), "max-size-bytes", 0,
       "max-size-buffers", 0, NULL);
 
+  if (!try_create_piece (dvdbin, DVD_ELEM_VIDPARSE, "mpegvideoparse", 0,
+          "vidparse", "video parser"))
+    return FALSE;
+
   /* Decodebin will throw a missing element message to find an MPEG decoder */
   if (!try_create_piece (dvdbin, DVD_ELEM_VIDDEC, NULL, RSN_TYPE_VIDEODEC,
           "viddec", "video decoder"))
@@ -390,6 +417,10 @@ create_elements (RsnDvdBin * dvdbin)
           "rsnparsetter", "Aspect ratio adjustment"))
     return FALSE;
 
+  if (!try_link_pieces (dvdbin->pieces[DVD_ELEM_VIDPARSE], "src",
+          dvdbin->pieces[DVD_ELEM_VIDDEC], "sink"))
+    goto failed_vidparse_connect;
+
   src = gst_element_get_static_pad (dvdbin->pieces[DVD_ELEM_VIDDEC], "src");
   sink = gst_element_get_static_pad (dvdbin->pieces[DVD_ELEM_PARSET], "sink");
   if (src == NULL || sink == NULL)
@@ -512,6 +543,10 @@ failed_connect:
   GST_ELEMENT_ERROR (dvdbin, CORE, FAILED, (NULL),
       ("Could not connect DVD source and demuxer elements"));
   goto error_out;
+failed_vidparse_connect:
+  GST_ELEMENT_ERROR (dvdbin, CORE, FAILED, (NULL),
+      ("Could not connect DVD video parser and video decoder"));
+  goto error_out;
 failed_viddec_connect:
   GST_ELEMENT_ERROR (dvdbin, CORE, FAILED, (NULL),
       ("Could not connect DVD video decoder and aspect ratio adjuster"));
@@ -674,10 +709,10 @@ demux_pad_added (GstElement * element, GstPad * pad, RsnDvdBin * dvdbin)
   s = gst_caps_get_structure (caps, 0);
   g_return_if_fail (s != NULL);
 
-  if (can_sink_caps (dvdbin->pieces[DVD_ELEM_VIDDEC], caps)) {
+  if (can_sink_caps (dvdbin->pieces[DVD_ELEM_VIDPARSE], caps)) {
     GST_LOG_OBJECT (dvdbin, "Found video pad w/ caps %" GST_PTR_FORMAT, caps);
     dest_pad =
-        gst_element_get_static_pad (dvdbin->pieces[DVD_ELEM_VIDDEC], "sink");
+        gst_element_get_static_pad (dvdbin->pieces[DVD_ELEM_VIDPARSE], "sink");
   } else if (g_str_equal (gst_structure_get_name (s), "subpicture/x-dvd")) {
     GST_LOG_OBJECT (dvdbin, "Found subpicture pad w/ caps %" GST_PTR_FORMAT,
         caps);

diff --git a/ext/resindvd/resindvdbin.h b/ext/resindvd/resindvdbin.h
index 4315e521df1795f43398bb55d081ed0d0990aae0..4a4abebc079482281bedc02332abde30c84b9ba9 100644 (file)
--- a/ext/resindvd/resindvdbin.h
+++ b/ext/resindvd/resindvdbin.h
@@ -43,13 +43,15 @@ typedef struct _RsnDvdBinClass RsnDvdBinClass;
 #define DVD_ELEM_DEMUX          1
 #define DVD_ELEM_MQUEUE         2
 #define DVD_ELEM_SPUQ           3
-#define DVD_ELEM_VIDDEC         4
-#define DVD_ELEM_PARSET         5
-#define DVD_ELEM_AUDDEC         6
-#define DVD_ELEM_VIDQ           7
-#define DVD_ELEM_SPU_SELECT     8
-#define DVD_ELEM_AUD_SELECT     9
-#define DVD_ELEM_LAST           10
+#define DVD_ELEM_VIDPARSE       4
+#define DVD_ELEM_VIDDEC         5
+#define DVD_ELEM_PARSET         6
+#define DVD_ELEM_AUDPARSE       7 
+#define DVD_ELEM_AUDDEC         8
+#define DVD_ELEM_VIDQ           9
+#define DVD_ELEM_SPU_SELECT     10
+#define DVD_ELEM_AUD_SELECT     11
+#define DVD_ELEM_LAST           12
 
 struct _RsnDvdBin
 {