summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2012-03-15 17:42:56 +0000
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2012-03-15 17:42:56 +0000
commit55b0f1e60168571ebbbd7a99ab51a687607a6619 (patch)
tree3089e4f60ce3ff48ef5dce83069f50b4ed3638d1
parente1e827d364942ceb6f6fd61c6ae4bb5ff3db6fdc (diff)
downloadgstreamer-plugins-bad-55b0f1e60168571ebbbd7a99ab51a687607a6619.tar.gz
faceoverlay: fix pad templates
Use generic and unspecififed rgb/caps for now. The exact caps supported depend on the facedetect element and rsvgoverlay. It's not clear how this worked before, since facedetect only accepts 24-bit RGB, but the caps advertised 32-bit ARGB/BGRA. In any case, we don't want to force anything really, so that if any of those elements acquires support for additional formats we pick those up automatically.
-rw-r--r--gst/faceoverlay/gstfaceoverlay.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/gst/faceoverlay/gstfaceoverlay.c b/gst/faceoverlay/gstfaceoverlay.c
index dd3818911..ebb2de9b8 100644
--- a/gst/faceoverlay/gstfaceoverlay.c
+++ b/gst/faceoverlay/gstfaceoverlay.c
@@ -69,12 +69,6 @@
GST_DEBUG_CATEGORY_STATIC (gst_face_overlay_debug);
#define GST_CAT_DEFAULT gst_face_overlay_debug
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define GST_STR_VIDEO_CAPS GST_VIDEO_CAPS_BGRA
-#else
-#define GST_STR_VIDEO_CAPS GST_VIDEO_CAPS_ARGB
-#endif
-
enum
{
PROP_0,
@@ -85,17 +79,16 @@ enum
PROP_H
};
-/* the capabilities of the inputs and outputs. */
static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_STR_VIDEO_CAPS)
+ GST_STATIC_CAPS ("video/x-raw-rgb; video/x-raw-yuv")
);
static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_STR_VIDEO_CAPS)
+ GST_STATIC_CAPS ("video/x-raw-rgb; video/x-raw-yuv")
);
GST_BOILERPLATE (GstFaceOverlay, gst_face_overlay, GstBin, GST_TYPE_BIN);