Commit d7001113 authored by Wim Taymans's avatar Wim Taymans

some more ffmpegcolorspace to videoconvert changes

parent 35bec595
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<xi:include href="xml/element-decodebin.xml" /> <xi:include href="xml/element-decodebin.xml" />
<xi:include href="xml/element-decodebin2.xml" /> <xi:include href="xml/element-decodebin2.xml" />
<xi:include href="xml/element-encodebin.xml" /> <xi:include href="xml/element-encodebin.xml" />
<xi:include href="xml/element-ffmpegcolorspace.xml" /> <xi:include href="xml/element-videoconvert.xml" />
<xi:include href="xml/element-gdpdepay.xml" /> <xi:include href="xml/element-gdpdepay.xml" />
<xi:include href="xml/element-gdppay.xml" /> <xi:include href="xml/element-gdppay.xml" />
<xi:include href="xml/element-giosink.xml" /> <xi:include href="xml/element-giosink.xml" />
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<xi:include href="xml/plugin-cdparanoia.xml" /> <xi:include href="xml/plugin-cdparanoia.xml" />
<xi:include href="xml/plugin-decodebin.xml" /> <xi:include href="xml/plugin-decodebin.xml" />
<xi:include href="xml/plugin-encoding.xml" /> <xi:include href="xml/plugin-encoding.xml" />
<xi:include href="xml/plugin-ffmpegcolorspace.xml" /> <xi:include href="xml/plugin-videoconvert.xml" />
<xi:include href="xml/plugin-gdp.xml" /> <xi:include href="xml/plugin-gdp.xml" />
<xi:include href="xml/plugin-gio.xml" /> <xi:include href="xml/plugin-gio.xml" />
<xi:include href="xml/plugin-libvisual.xml" /> <xi:include href="xml/plugin-libvisual.xml" />
......
...@@ -264,16 +264,16 @@ gst_encode_bin_get_type ...@@ -264,16 +264,16 @@ gst_encode_bin_get_type
<SECTION> <SECTION>
<FILE>element-ffmpegcolorspace</FILE> <FILE>element-videoconvert</FILE>
<TITLE>ffmpegcolorspace</TITLE> <TITLE>videoconvert</TITLE>
GstFFMpegCsp GstVideoConvert
<SUBSECTION Standard> <SUBSECTION Standard>
GST_FFMPEGCSP GST_VIDEO_CONVERT
GST_FFMPEGCSP_CLASS GST_VIDEO_CONVERT_CLASS
GST_IS_FFMPEGCSP GST_IS_VIDEO_CONVERT_
GST_IS_FFMPEGCSP_CLASS GST_IS_VIDEO_CONVERT_CLASS
GST_TYPE_FFMPEGCSP GST_TYPE_VIDEO_CONVERT_
GstFFMpegCspClass GstVideoConvertClass
</SECTION> </SECTION>
<SECTION> <SECTION>
......
...@@ -52,7 +52,7 @@ GType gst_autoplug_select_result_get_type (void); ...@@ -52,7 +52,7 @@ GType gst_autoplug_select_result_get_type (void);
* @GST_PLAY_FLAG_NATIVE_AUDIO: only allow native audio formats, this omits * @GST_PLAY_FLAG_NATIVE_AUDIO: only allow native audio formats, this omits
* configuration of audioconvert and audioresample. * configuration of audioconvert and audioresample.
* @GST_PLAY_FLAG_NATIVE_VIDEO: only allow native video formats, this omits * @GST_PLAY_FLAG_NATIVE_VIDEO: only allow native video formats, this omits
* configuration of ffmpegcolorspace and videoscale. * configuration of videoconvert and videoscale.
* @GST_PLAY_FLAG_DOWNLOAD: enable progressice download buffering for selected * @GST_PLAY_FLAG_DOWNLOAD: enable progressice download buffering for selected
* formats. * formats.
* @GST_PLAY_FLAG_BUFFERING: enable buffering of the demuxed or parsed data. * @GST_PLAY_FLAG_BUFFERING: enable buffering of the demuxed or parsed data.
......
...@@ -109,12 +109,12 @@ pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -109,12 +109,12 @@ pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (self->sinkpad), NULL); gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (self->sinkpad), NULL);
gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (self->srcpad), NULL); gst_ghost_pad_set_target (GST_GHOST_PAD_CAST (self->srcpad), NULL);
self->conv = gst_element_factory_make ("ffmpegcolorspace", "conv"); self->conv = gst_element_factory_make ("videoconvert", "conv");
if (self->conv == NULL) { if (self->conv == NULL) {
post_missing_element_message (self, "ffmpegcolorspace"); post_missing_element_message (self, "videoconvert");
GST_ELEMENT_WARNING (self, CORE, MISSING_PLUGIN, GST_ELEMENT_WARNING (self, CORE, MISSING_PLUGIN,
(_("Missing element '%s' - check your GStreamer installation."), (_("Missing element '%s' - check your GStreamer installation."),
"ffmpegcolorspace"), ("video rendering might fail")); "videoconvert"), ("video rendering might fail"));
} else { } else {
gst_bin_add (bin, self->conv); gst_bin_add (bin, self->conv);
gst_element_sync_state_with_parent (self->conv); gst_element_sync_state_with_parent (self->conv);
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* <refsect2> * <refsect2>
* <title>Examples</title> * <title>Examples</title>
* |[ * |[
* gst-launch -v filesrc location=test.mkv ! matroskademux name=demux ! "video/x-h264" ! queue2 ! decodebin ! subtitleoverlay name=overlay ! ffmpegcolorspace ! autovideosink demux. ! "video/x-dvd-subpicture" ! queue2 ! overlay. * gst-launch -v filesrc location=test.mkv ! matroskademux name=demux ! "video/x-h264" ! queue2 ! decodebin ! subtitleoverlay name=overlay ! videoconvert ! autovideosink demux. ! "video/x-dvd-subpicture" ! queue2 ! overlay.
* ]| This will play back the given Matroska file with h264 video and subpicture subtitles. * ]| This will play back the given Matroska file with h264 video and subpicture subtitles.
* </refsect2> * </refsect2>
*/ */
...@@ -936,7 +936,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -936,7 +936,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
gst_object_unref (src); gst_object_unref (src);
if (G_UNLIKELY (!_create_element (self, &self->post_colorspace, if (G_UNLIKELY (!_create_element (self, &self->post_colorspace,
"ffmpegcolorspace", NULL, "post-colorspace", FALSE))) { "videoconvert", NULL, "post-colorspace", FALSE))) {
continue; continue;
} }
...@@ -948,13 +948,13 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -948,13 +948,13 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
sink = gst_element_get_static_pad (self->post_colorspace, "sink"); sink = gst_element_get_static_pad (self->post_colorspace, "sink");
if (G_UNLIKELY (!sink)) { if (G_UNLIKELY (!sink)) {
GST_WARNING_OBJECT (self, "Can't get sink pad from ffmpegcolorspace"); GST_WARNING_OBJECT (self, "Can't get sink pad from videoconvert");
gst_object_unref (src); gst_object_unref (src);
continue; continue;
} }
if (G_UNLIKELY (gst_pad_link (src, sink) != GST_PAD_LINK_OK)) { if (G_UNLIKELY (gst_pad_link (src, sink) != GST_PAD_LINK_OK)) {
GST_WARNING_OBJECT (self, "Can't link overlay with ffmpegcolorspace"); GST_WARNING_OBJECT (self, "Can't link overlay with videoconvert");
gst_object_unref (src); gst_object_unref (src);
gst_object_unref (sink); gst_object_unref (sink);
continue; continue;
...@@ -963,7 +963,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -963,7 +963,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
gst_object_unref (sink); gst_object_unref (sink);
if (G_UNLIKELY (!_create_element (self, &self->pre_colorspace, if (G_UNLIKELY (!_create_element (self, &self->pre_colorspace,
"ffmpegcolorspace", NULL, "pre-colorspace", FALSE))) { "videoconvert", NULL, "pre-colorspace", FALSE))) {
continue; continue;
} }
...@@ -975,13 +975,13 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -975,13 +975,13 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
src = gst_element_get_static_pad (self->pre_colorspace, "src"); src = gst_element_get_static_pad (self->pre_colorspace, "src");
if (G_UNLIKELY (!src)) { if (G_UNLIKELY (!src)) {
GST_WARNING_OBJECT (self, "Can't get srcpad from ffmpegcolorspace"); GST_WARNING_OBJECT (self, "Can't get srcpad from videoconvert");
gst_object_unref (sink); gst_object_unref (sink);
continue; continue;
} }
if (G_UNLIKELY (gst_pad_link (src, sink) != GST_PAD_LINK_OK)) { if (G_UNLIKELY (gst_pad_link (src, sink) != GST_PAD_LINK_OK)) {
GST_WARNING_OBJECT (self, "Can't link ffmpegcolorspace to textoverlay"); GST_WARNING_OBJECT (self, "Can't link videoconvert to textoverlay");
gst_object_unref (src); gst_object_unref (src);
gst_object_unref (sink); gst_object_unref (sink);
continue; continue;
...@@ -992,7 +992,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -992,7 +992,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
/* Set src ghostpad target */ /* Set src ghostpad target */
src = gst_element_get_static_pad (self->post_colorspace, "src"); src = gst_element_get_static_pad (self->post_colorspace, "src");
if (G_UNLIKELY (!src)) { if (G_UNLIKELY (!src)) {
GST_WARNING_OBJECT (self, "Can't get src pad from ffmpegcolorspace"); GST_WARNING_OBJECT (self, "Can't get src pad from videoconvert");
continue; continue;
} }
...@@ -1011,7 +1011,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -1011,7 +1011,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
sink = gst_element_get_static_pad (self->pre_colorspace, "sink"); sink = gst_element_get_static_pad (self->pre_colorspace, "sink");
if (G_UNLIKELY (!sink)) { if (G_UNLIKELY (!sink)) {
GST_WARNING_OBJECT (self, "Can't get sink pad from ffmpegcolorspace"); GST_WARNING_OBJECT (self, "Can't get sink pad from videoconvert");
continue; continue;
} }
...@@ -1043,7 +1043,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -1043,7 +1043,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
/* Set the sink ghostpad targets */ /* Set the sink ghostpad targets */
sink = gst_element_get_static_pad (self->pre_colorspace, "sink"); sink = gst_element_get_static_pad (self->pre_colorspace, "sink");
if (G_UNLIKELY (!sink)) { if (G_UNLIKELY (!sink)) {
GST_WARNING_OBJECT (self, "Can't get sink pad from ffmpegcolorspace"); GST_WARNING_OBJECT (self, "Can't get sink pad from videoconvert");
continue; continue;
} }
...@@ -1093,7 +1093,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -1093,7 +1093,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
/* First link everything internally */ /* First link everything internally */
if (G_UNLIKELY (!_create_element (self, &self->post_colorspace, if (G_UNLIKELY (!_create_element (self, &self->post_colorspace,
"ffmpegcolorspace", NULL, "post-colorspace", FALSE))) { "videoconvert", NULL, "post-colorspace", FALSE))) {
continue; continue;
} }
...@@ -1105,13 +1105,13 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -1105,13 +1105,13 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
sink = gst_element_get_static_pad (self->post_colorspace, "sink"); sink = gst_element_get_static_pad (self->post_colorspace, "sink");
if (G_UNLIKELY (!sink)) { if (G_UNLIKELY (!sink)) {
GST_WARNING_OBJECT (self, "Can't get sink pad from ffmpegcolorspace"); GST_WARNING_OBJECT (self, "Can't get sink pad from videoconvert");
gst_object_unref (src); gst_object_unref (src);
continue; continue;
} }
if (G_UNLIKELY (gst_pad_link (src, sink) != GST_PAD_LINK_OK)) { if (G_UNLIKELY (gst_pad_link (src, sink) != GST_PAD_LINK_OK)) {
GST_WARNING_OBJECT (self, "Can't link renderer with ffmpegcolorspace"); GST_WARNING_OBJECT (self, "Can't link renderer with videoconvert");
gst_object_unref (src); gst_object_unref (src);
gst_object_unref (sink); gst_object_unref (sink);
continue; continue;
...@@ -1120,7 +1120,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -1120,7 +1120,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
gst_object_unref (sink); gst_object_unref (sink);
if (G_UNLIKELY (!_create_element (self, &self->pre_colorspace, if (G_UNLIKELY (!_create_element (self, &self->pre_colorspace,
"ffmpegcolorspace", NULL, "pre-colorspace", FALSE))) { "videoconvert", NULL, "pre-colorspace", FALSE))) {
continue; continue;
} }
...@@ -1132,13 +1132,13 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -1132,13 +1132,13 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
src = gst_element_get_static_pad (self->pre_colorspace, "src"); src = gst_element_get_static_pad (self->pre_colorspace, "src");
if (G_UNLIKELY (!src)) { if (G_UNLIKELY (!src)) {
GST_WARNING_OBJECT (self, "Can't get srcpad from ffmpegcolorspace"); GST_WARNING_OBJECT (self, "Can't get srcpad from videoconvert");
gst_object_unref (sink); gst_object_unref (sink);
continue; continue;
} }
if (G_UNLIKELY (gst_pad_link (src, sink) != GST_PAD_LINK_OK)) { if (G_UNLIKELY (gst_pad_link (src, sink) != GST_PAD_LINK_OK)) {
GST_WARNING_OBJECT (self, "Can't link ffmpegcolorspace to renderer"); GST_WARNING_OBJECT (self, "Can't link videoconvert to renderer");
gst_object_unref (src); gst_object_unref (src);
gst_object_unref (sink); gst_object_unref (sink);
continue; continue;
...@@ -1149,7 +1149,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -1149,7 +1149,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
/* Set src ghostpad target */ /* Set src ghostpad target */
src = gst_element_get_static_pad (self->post_colorspace, "src"); src = gst_element_get_static_pad (self->post_colorspace, "src");
if (G_UNLIKELY (!src)) { if (G_UNLIKELY (!src)) {
GST_WARNING_OBJECT (self, "Can't get src pad from ffmpegcolorspace"); GST_WARNING_OBJECT (self, "Can't get src pad from videoconvert");
continue; continue;
} }
...@@ -1168,7 +1168,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -1168,7 +1168,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
sink = gst_element_get_static_pad (self->pre_colorspace, "sink"); sink = gst_element_get_static_pad (self->pre_colorspace, "sink");
if (G_UNLIKELY (!sink)) { if (G_UNLIKELY (!sink)) {
GST_WARNING_OBJECT (self, "Can't get sink pad from ffmpegcolorspace"); GST_WARNING_OBJECT (self, "Can't get sink pad from videoconvert");
continue; continue;
} }
...@@ -1198,7 +1198,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data, ...@@ -1198,7 +1198,7 @@ _pad_blocked_cb (GstPad * pad, GstProbeType type, gpointer type_data,
/* Set the sink ghostpad targets */ /* Set the sink ghostpad targets */
sink = gst_element_get_static_pad (self->pre_colorspace, "sink"); sink = gst_element_get_static_pad (self->pre_colorspace, "sink");
if (G_UNLIKELY (!sink)) { if (G_UNLIKELY (!sink)) {
GST_WARNING_OBJECT (self, "Can't get sink pad from ffmpegcolorspace"); GST_WARNING_OBJECT (self, "Can't get sink pad from videoconvert");
continue; continue;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment