From 55b0f1e60168571ebbbd7a99ab51a687607a6619 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 15 Mar 2012 17:42:56 +0000 Subject: [PATCH] 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. --- gst/faceoverlay/gstfaceoverlay.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gst/faceoverlay/gstfaceoverlay.c b/gst/faceoverlay/gstfaceoverlay.c index dd38189..ebb2de9 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); -- 2.7.4