From fb20b019a7ebf1814448bf06487d4d49f7cd07fa Mon Sep 17 00:00:00 2001 From: "Joshua M. Doe" Date: Thu, 22 Aug 2013 23:59:12 -0400 Subject: [PATCH] videolevels: don't require bpp to be set in sink caps --- gst/videoadjust/gstvideolevels.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gst/videoadjust/gstvideolevels.c b/gst/videoadjust/gstvideolevels.c index bd3a3b7..e82ad87 100644 --- a/gst/videoadjust/gstvideolevels.c +++ b/gst/videoadjust/gstvideolevels.c @@ -75,12 +75,7 @@ static GstStaticPadTemplate gst_videolevels_src_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("video/x-raw, " - "format = (string) { GRAY16_LE, GRAY16_BE }, " - "bpp = (int) {16, 14, 12, 10}, " - "width = " GST_VIDEO_SIZE_RANGE ", " - "height = " GST_VIDEO_SIZE_RANGE ", " - "framerate = " GST_VIDEO_FPS_RANGE) + GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ GRAY16_LE, GRAY16_BE }")) //";" // "video/x-bayer,format=(string){bggr16,grbg16,gbrg16,rggb16}," // "bpp=(int){10,12,14,16},endianness={1234,4321}," @@ -420,6 +415,7 @@ gst_videolevels_set_info (GstVideoFilter * filter, GstCaps * incaps, s = gst_caps_get_structure (incaps, 0); if (!gst_structure_get_int (s, "bpp", &levels->bpp_in)) levels->bpp_in = 16; + g_assert (levels->bpp_in >= 1 && levels->bpp_in <= 16); res = gst_videolevels_calculate_lut (levels);