summaryrefslogtreecommitdiff
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2009-09-30 13:47:17 (GMT)
committer Sebastian Dröge <sebastian.droege@collabora.co.uk>2009-09-30 13:49:02 (GMT)
commitd96defb1645a0d6b34d38fb0c598d7c8f033bb98 (patch) (side-by-side diff)
tree8fcf37f16cd8448262c722c8c03b5718cbc1583e
parent25837289c4cbf5381e40bcb80e94cf14f57e9f59 (diff)
downloadgst-plugins-bad-d96defb1645a0d6b34d38fb0c598d7c8f033bb98.zip
gst-plugins-bad-d96defb1645a0d6b34d38fb0c598d7c8f033bb98.tar.gz
resindvdbin: Create external srcpads from the static pad templates
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ext/resindvd/resindvdbin.c22
1 files changed, 14 insertions, 8 deletions
diff --git a/ext/resindvd/resindvdbin.c b/ext/resindvd/resindvdbin.c
index 7ee34c5..37f6f84 100644
--- a/ext/resindvd/resindvdbin.c
+++ b/ext/resindvd/resindvdbin.c
@@ -60,20 +60,18 @@ enum
ARG_DEVICE
};
-/* FIXME: Could list specific video and audio caps: */
static GstStaticPadTemplate video_src_template =
GST_STATIC_PAD_TEMPLATE ("video",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
- GST_STATIC_CAPS
- ("video/mpeg, mpegversion=(int) { 1, 2 }, systemstream=false")
+ GST_STATIC_CAPS ("video/x-raw-yuv")
);
static GstStaticPadTemplate audio_src_template =
GST_STATIC_PAD_TEMPLATE ("audio",
GST_PAD_SRC,
GST_PAD_SOMETIMES,
- GST_STATIC_CAPS ("audio/x-raw-int;audio/x-raw-float")
+ GST_STATIC_CAPS ("audio/x-raw-int; audio/x-raw-float")
);
static GstStaticPadTemplate subpicture_src_template =
@@ -360,6 +358,7 @@ _pad_block_destroy_notify (RsnDvdBinPadBlockCtx * ctx)
static gboolean
create_elements (RsnDvdBin * dvdbin)
{
+ GstPadTemplate *src_templ = NULL;
GstPad *src = NULL;
GstPad *sink = NULL;
RsnDvdBinPadBlockCtx *bctx = NULL;
@@ -451,7 +450,9 @@ create_elements (RsnDvdBin * dvdbin)
#endif
if (src == NULL)
goto failed_video_ghost;
- dvdbin->video_pad = gst_ghost_pad_new ("video", src);
+ src_templ = gst_static_pad_template_get (&video_src_template);
+ dvdbin->video_pad = gst_ghost_pad_new_from_template ("video", src, src_templ);
+ gst_object_unref (src_templ);
if (dvdbin->video_pad == NULL)
goto failed_video_ghost;
gst_pad_set_active (dvdbin->video_pad, TRUE);
@@ -494,7 +495,10 @@ create_elements (RsnDvdBin * dvdbin)
src = gst_element_get_static_pad (dvdbin->pieces[DVD_ELEM_SPUQ], "src");
if (src == NULL)
goto failed_spu_ghost;
- dvdbin->subpicture_pad = gst_ghost_pad_new ("subpicture", src);
+ src_templ = gst_static_pad_template_get (&subpicture_src_template);
+ dvdbin->subpicture_pad =
+ gst_ghost_pad_new_from_template ("subpicture", src, src_templ);
+ gst_object_unref (src_templ);
if (dvdbin->subpicture_pad == NULL)
goto failed_spu_ghost;
gst_pad_set_active (dvdbin->subpicture_pad, TRUE);
@@ -551,7 +555,9 @@ create_elements (RsnDvdBin * dvdbin)
src = gst_element_get_static_pad (dvdbin->pieces[DVD_ELEM_AUD_MUNGE], "src");
if (src == NULL)
goto failed_aud_ghost;
- dvdbin->audio_pad = gst_ghost_pad_new ("audio", src);
+ src_templ = gst_static_pad_template_get (&audio_src_template);
+ dvdbin->audio_pad = gst_ghost_pad_new_from_template ("audio", src, src_templ);
+ gst_object_unref (src_templ);
if (dvdbin->audio_pad == NULL)
goto failed_aud_ghost;
gst_pad_set_active (dvdbin->audio_pad, TRUE);
@@ -589,7 +595,7 @@ failed_vidq_connect:
#endif
failed_video_ghost:
GST_ELEMENT_ERROR (dvdbin, CORE, FAILED, (NULL),
- ("Could not ghost SPU output pad"));
+ ("Could not ghost video output pad"));
goto error_out;
failed_spuq_connect:
GST_ELEMENT_ERROR (dvdbin, CORE, FAILED, (NULL),