summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2013-03-15 00:25:43 -0700
committerDavid Schleef <ds@schleef.org>2013-03-15 20:30:01 -0700
commit84faa2f8b8a62c8c9a976c22627ba9714394d723 (patch)
treeda39fa2ee378df25bd29ff01e25a92a63c5f87c5 /tools
parent7992c1c92e3745211026cdbe8d3688d46d2cb8bc (diff)
element-maker: clean up bits from previous commit
Files that were supposed to be in the previous element-maker commit. This is what happens when cherry-pick doesn't work.
Diffstat (limited to 'tools')
-rw-r--r--tools/element-templates/sinkpad-template4
-rw-r--r--tools/element-templates/sinkpad-template-video19
-rw-r--r--tools/element-templates/srcpad-template4
-rw-r--r--tools/element-templates/srcpad-template-video20
4 files changed, 17 insertions, 30 deletions
diff --git a/tools/element-templates/sinkpad-template b/tools/element-templates/sinkpad-template
index b06b346b1..785365d81 100644
--- a/tools/element-templates/sinkpad-template
+++ b/tools/element-templates/sinkpad-template
@@ -11,8 +11,8 @@ GST_STATIC_PAD_TEMPLATE ("sink",
);
% base-init
- gst_element_class_add_static_pad_template (element_class,
- &gst_replace_sink_template);
+ gst_element_class_add_pad_template (element_class,
+ gst_static_pad_template_get (&gst_replace_sink_template);
% instance-init
% methods
% end
diff --git a/tools/element-templates/sinkpad-template-video b/tools/element-templates/sinkpad-template-video
index b317c6fd7..b11965d16 100644
--- a/tools/element-templates/sinkpad-template-video
+++ b/tools/element-templates/sinkpad-template-video
@@ -1,21 +1,12 @@
/* vim: set filetype=c: */
% instance-members
+ GstPad *sinkpad;
% prototypes
% pad-template
/* FIXME: add/remove formats you can handle */
#define VIDEO_SINK_CAPS \
- GST_VIDEO_CAPS_RGBA "; " \
- GST_VIDEO_CAPS_ARGB "; " \
- GST_VIDEO_CAPS_BGRA "; " \
- GST_VIDEO_CAPS_ABGR "; " \
- GST_VIDEO_CAPS_RGBx "; " \
- GST_VIDEO_CAPS_xRGB "; " \
- GST_VIDEO_CAPS_BGRx "; " \
- GST_VIDEO_CAPS_xBGR "; " \
- GST_VIDEO_CAPS_RGB "; " \
- GST_VIDEO_CAPS_BGR "; " \
- GST_VIDEO_CAPS_YUV("{ AYUV }")
+ GST_VIDEO_CAPS_MAKE("{ I420, Y444, Y42B, UYVY, RGBA }")
static GstStaticPadTemplate gst_replace_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink",
@@ -25,9 +16,11 @@ GST_STATIC_PAD_TEMPLATE ("sink",
);
% base-init
- gst_element_class_add_static_pad_template (element_class,
- &gst_replace_sink_template);
+ gst_element_class_add_pad_template (GST_ELEMENT_CLASS(klass),
+ gst_static_pad_template_get (&gst_replace_sink_template));
% instance-init
+ replace->sinkpad = gst_pad_new_from_static_template (
+ &gst_replace_sink_template, "sink");
% methods
% end
diff --git a/tools/element-templates/srcpad-template b/tools/element-templates/srcpad-template
index dd0842bbd..020f6a281 100644
--- a/tools/element-templates/srcpad-template
+++ b/tools/element-templates/srcpad-template
@@ -11,8 +11,8 @@ GST_STATIC_PAD_TEMPLATE ("src",
);
% base-init
- gst_element_class_add_static_pad_template (element_class,
- &gst_replace_src_template);
+ gst_element_class_add_pad_template (element_class,
+ gst_static_pad_template_get (&gst_replace_src_template);
% instance-init
% methods
% end
diff --git a/tools/element-templates/srcpad-template-video b/tools/element-templates/srcpad-template-video
index 4f3932086..6e233dfe1 100644
--- a/tools/element-templates/srcpad-template-video
+++ b/tools/element-templates/srcpad-template-video
@@ -1,21 +1,12 @@
/* vim: set filetype=c: */
% instance-members
+ GstPad *srcpad;
% prototypes
% pad-template
/* FIXME: add/remove formats you can handle */
#define VIDEO_SRC_CAPS \
- GST_VIDEO_CAPS_RGBA "; " \
- GST_VIDEO_CAPS_ARGB "; " \
- GST_VIDEO_CAPS_BGRA "; " \
- GST_VIDEO_CAPS_ABGR "; " \
- GST_VIDEO_CAPS_RGBx "; " \
- GST_VIDEO_CAPS_xRGB "; " \
- GST_VIDEO_CAPS_BGRx "; " \
- GST_VIDEO_CAPS_xBGR "; " \
- GST_VIDEO_CAPS_RGB "; " \
- GST_VIDEO_CAPS_BGR "; " \
- GST_VIDEO_CAPS_YUV("{ AYUV }")
+ GST_VIDEO_CAPS_MAKE("{ I420, Y444, Y42B, UYVY, RGBA }")
static GstStaticPadTemplate gst_replace_src_template =
GST_STATIC_PAD_TEMPLATE ("src",
@@ -25,8 +16,11 @@ GST_STATIC_PAD_TEMPLATE ("src",
);
% base-init
- gst_element_class_add_static_pad_template (element_class,
- &gst_replace_src_template);
+ gst_element_class_add_pad_template (GST_ELEMENT_CLASS(klass),
+ gst_static_pad_template_get (&gst_replace_src_template));
+% instance-init
+ replace->srcpad = gst_pad_new_from_static_template (
+ &gst_replace_src_template, "src");
% instance-init
% methods
% end