summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2004-07-28 13:47:59 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2004-07-28 13:47:59 +0000
commit2c2d4de527ed9e09690a573d14e17d376c971a89 (patch)
tree4fb08f577be6536f055458c8839b0d79add5cd57
parentdf0d4e2a7dd47a54085504085a817b34fd639fd7 (diff)
downloadgst-plugins-bad-2c2d4de527ed9e09690a573d14e17d376c971a89.tar.gz
gst-plugins-bad-2c2d4de527ed9e09690a573d14e17d376c971a89.tar.bz2
gst-plugins-bad-2c2d4de527ed9e09690a573d14e17d376c971a89.zip
ext/dvdnav/README: Update the README to use dvddemux
Original commit message from CVS: * ext/dvdnav/README: Update the README to use dvddemux * ext/gdk_pixbuf/pixbufscale.c: (gst_pixbufscale_getcaps): Ensure getcaps returns a subset of the template caps * gst/mpeg2sub/gstmpeg2subt.c: (gst_mpeg2subt_base_init), (gst_mpeg2subt_init): Ensure getcaps returns a subset of the template caps * gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_class_init), (gst_dvd_demux_init), (gst_dvd_demux_get_video_stream), (gst_dvd_demux_get_subpicture_stream), (gst_dvd_demux_send_subbuffer), (gst_dvd_demux_set_cur_subpicture): * gst/mpegstream/gstdvddemux.h: Set the explicit caps on the current_video pad before pushing anything * gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_get_video_stream), (gst_mpeg_demux_get_audio_stream): Free caps used to gst_pad_set_explicit_caps, which takes a const GstCaps *
-rw-r--r--ChangeLog21
-rw-r--r--gst/mpeg2sub/gstmpeg2subt.c13
2 files changed, 33 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 86bc3705..8252702f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2004-07-28 Jan Schmidt <thaytan@mad.scientist.com>
+
+ * ext/dvdnav/README:
+ Update the README to use dvddemux
+ * ext/gdk_pixbuf/pixbufscale.c: (gst_pixbufscale_getcaps):
+ Ensure getcaps returns a subset of the template caps
+ * gst/mpeg2sub/gstmpeg2subt.c: (gst_mpeg2subt_base_init),
+ (gst_mpeg2subt_init):
+ Ensure getcaps returns a subset of the template caps
+ * gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_class_init),
+ (gst_dvd_demux_init), (gst_dvd_demux_get_video_stream),
+ (gst_dvd_demux_get_subpicture_stream),
+ (gst_dvd_demux_send_subbuffer), (gst_dvd_demux_set_cur_subpicture):
+ * gst/mpegstream/gstdvddemux.h:
+ Set the explicit caps on the current_video pad before pushing
+ anything
+ * gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_get_video_stream),
+ (gst_mpeg_demux_get_audio_stream):
+ Free caps used to gst_pad_set_explicit_caps, which takes a const
+ GstCaps *
+
2004-07-28 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: update GStreamer requirement to 0.8.4 because of
diff --git a/gst/mpeg2sub/gstmpeg2subt.c b/gst/mpeg2sub/gstmpeg2subt.c
index 07c107c3..e6dd86a1 100644
--- a/gst/mpeg2sub/gstmpeg2subt.c
+++ b/gst/mpeg2sub/gstmpeg2subt.c
@@ -68,6 +68,13 @@ static GstStaticPadTemplate video_template = GST_STATIC_PAD_TEMPLATE ("video",
"width = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ]")
);
+static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
+ GST_PAD_SRC,
+ GST_PAD_ALWAYS,
+ GST_STATIC_CAPS ("video/x-raw-yuv, " "format = (fourcc) { I420 }, " /* YV12 later */
+ "width = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ]")
+ );
+
static GstStaticPadTemplate subtitle_template =
GST_STATIC_PAD_TEMPLATE ("subtitle",
GST_PAD_SINK,
@@ -161,6 +168,8 @@ gst_mpeg2subt_base_init (GstMpeg2SubtClass * klass)
GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
gst_element_class_add_pad_template (element_class,
+ gst_static_pad_template_get (&src_template));
+ gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&video_template));
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&subtitle_template));
@@ -203,7 +212,9 @@ gst_mpeg2subt_init (GstMpeg2Subt * mpeg2subt)
(&subtitle_template), "subtitle");
gst_element_add_pad (GST_ELEMENT (mpeg2subt), mpeg2subt->subtitlepad);
- mpeg2subt->srcpad = gst_pad_new ("src", GST_PAD_SRC);
+ mpeg2subt->srcpad =
+ gst_pad_new_from_template (gst_static_pad_template_get
+ (&src_template), "src");
gst_element_add_pad (GST_ELEMENT (mpeg2subt), mpeg2subt->srcpad);
gst_pad_set_getcaps_function (mpeg2subt->srcpad,
GST_DEBUG_FUNCPTR (gst_mpeg2subt_getcaps_video));