diff options
author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2013-03-19 13:27:35 +0100 |
---|---|---|
committer | Josep Torra <n770galaxy@gmail.com> | 2013-03-22 10:46:25 +0100 |
commit | 5553190efc88626e0fa0885e12a2405afd223679 (patch) | |
tree | dc6f64735ca5629fca5e50e9c2a9f18465bf3889 | |
parent | d09663ff9649e00e6a555a798b8f50c0a65aea77 (diff) |
omx: Add more constraints to the default sink template caps
Conflicts:
omx/gstomxwmvdec.c
-rw-r--r-- | config/rpi/gstomx.conf | 2 | ||||
-rw-r--r-- | omx/gstomxh263dec.c | 3 | ||||
-rw-r--r-- | omx/gstomxh264dec.c | 4 | ||||
-rw-r--r-- | omx/gstomxmjpegdec.c | 3 | ||||
-rw-r--r-- | omx/gstomxmpeg2videodec.c | 3 | ||||
-rw-r--r-- | omx/gstomxmpeg4videodec.c | 3 | ||||
-rw-r--r-- | omx/gstomxvideodec.c | 2 | ||||
-rw-r--r-- | omx/gstomxvp8dec.c | 7 | ||||
-rw-r--r-- | omx/gstomxwmvdec.c | 3 |
9 files changed, 20 insertions, 10 deletions
diff --git a/config/rpi/gstomx.conf b/config/rpi/gstomx.conf index 3b34169..da1593a 100644 --- a/config/rpi/gstomx.conf +++ b/config/rpi/gstomx.conf @@ -69,7 +69,7 @@ rank=256 in-port-index=200 out-port-index=201 hacks=no-component-role -sink-template-caps=video/x-wmv,wmvversion=(int)3,format=(string){WMV3,WVC1} +sink-template-caps=video/x-wmv,wmvversion=(int)3,format=(string){WMV3,WVC1},width=(int)[1,MAX],height=(int)[1,MAX] [omxh264enc] type-name=GstOMXH264Enc diff --git a/omx/gstomxh263dec.c b/omx/gstomxh263dec.c index 20db5fa..ffbc538 100644 --- a/omx/gstomxh263dec.c +++ b/omx/gstomxh263dec.c @@ -71,7 +71,8 @@ gst_omx_h263_dec_class_init (GstOMXH263DecClass * klass) videodec_class->set_format = GST_DEBUG_FUNCPTR (gst_omx_h263_dec_set_format); videodec_class->cdata.default_sink_template_caps = "video/x-h263, " - "parsed=(boolean) true"; + "variant=(string) itu, " + "parsed=(boolean) true, " "width=(int) [1,MAX], " "height=(int) [1,MAX]"; gst_omx_set_default_role (&videodec_class->cdata, "video_decoder.h263"); } diff --git a/omx/gstomxh264dec.c b/omx/gstomxh264dec.c index 5e12d6f..a48609f 100644 --- a/omx/gstomxh264dec.c +++ b/omx/gstomxh264dec.c @@ -73,7 +73,9 @@ gst_omx_h264_dec_class_init (GstOMXH264DecClass * klass) videodec_class->cdata.default_sink_template_caps = "video/x-h264, " "parsed=(boolean) true, " - "alignment=(string)au, " "stream-format=(string) byte-stream"; + "alignment=(string) au, " + "stream-format=(string) byte-stream, " + "width=(int) [1,MAX], " "height=(int) [1,MAX]"; gst_omx_set_default_role (&videodec_class->cdata, "video_decoder.avc"); } diff --git a/omx/gstomxmjpegdec.c b/omx/gstomxmjpegdec.c index 0f2873e..f7d0eb1 100644 --- a/omx/gstomxmjpegdec.c +++ b/omx/gstomxmjpegdec.c @@ -70,7 +70,8 @@ gst_omx_mjpeg_dec_class_init (GstOMXMJPEGDecClass * klass) GST_DEBUG_FUNCPTR (gst_omx_mjpeg_dec_is_format_change); videodec_class->set_format = GST_DEBUG_FUNCPTR (gst_omx_mjpeg_dec_set_format); - videodec_class->cdata.default_sink_template_caps = "image/jpeg"; + videodec_class->cdata.default_sink_template_caps = "image/jpeg, " + "width=(int) [1,MAX], " "height=(int) [1,MAX]"; gst_omx_set_default_role (&videodec_class->cdata, "video_decoder.mjpeg"); } diff --git a/omx/gstomxmpeg2videodec.c b/omx/gstomxmpeg2videodec.c index e4aef91..a3bf201 100644 --- a/omx/gstomxmpeg2videodec.c +++ b/omx/gstomxmpeg2videodec.c @@ -73,7 +73,8 @@ gst_omx_mpeg2_video_dec_class_init (GstOMXMPEG2VideoDecClass * klass) videodec_class->cdata.default_sink_template_caps = "video/mpeg, " "mpegversion=(int) [1, 2], " - "systemstream=(boolean) false, " "parsed=(boolean) true"; + "systemstream=(boolean) false, " + "parsed=(boolean) true, " "width=(int) [1,MAX], " "height=(int) [1,MAX]"; gst_omx_set_default_role (&videodec_class->cdata, "video_decoder.mpeg2"); } diff --git a/omx/gstomxmpeg4videodec.c b/omx/gstomxmpeg4videodec.c index 0d0919b..168758b 100644 --- a/omx/gstomxmpeg4videodec.c +++ b/omx/gstomxmpeg4videodec.c @@ -73,7 +73,8 @@ gst_omx_mpeg4_video_dec_class_init (GstOMXMPEG4VideoDecClass * klass) videodec_class->cdata.default_sink_template_caps = "video/mpeg, " "mpegversion=(int) 4, " - "systemstream=(boolean) false, " "parsed=(boolean) true"; + "systemstream=(boolean) false, " + "parsed=(boolean) true, " "width=(int) [1,MAX], " "height=(int) [1,MAX]"; gst_omx_set_default_role (&videodec_class->cdata, "video_decoder.mpeg4"); } diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c index 9d0f660..ff8383b 100644 --- a/omx/gstomxvideodec.c +++ b/omx/gstomxvideodec.c @@ -1,6 +1,8 @@ /* * Copyright (C) 2011, Hewlett-Packard Development Company, L.P. * Author: Sebastian Dröge <sebastian.droege@collabora.co.uk>, Collabora Ltd. + * Copyright (C) 2013, Collabora Ltd. + * Author: Sebastian Dröge <sebastian.droege@collabora.co.uk> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/omx/gstomxvp8dec.c b/omx/gstomxvp8dec.c index 9c3675b..de06322 100644 --- a/omx/gstomxvp8dec.c +++ b/omx/gstomxvp8dec.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2011, Hewlett-Packard Development Company, L.P. - * Author: Sebastian Dröge <sebastian.droege@collabora.co.uk>, Collabora Ltd. + * Copyright (C) 2013, Collabora Ltd. + * Author: Sebastian Dröge <sebastian.droege@collabora.co.uk> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -70,7 +70,8 @@ gst_omx_vp8_dec_class_init (GstOMXVP8DecClass * klass) GST_DEBUG_FUNCPTR (gst_omx_vp8_dec_is_format_change); videodec_class->set_format = GST_DEBUG_FUNCPTR (gst_omx_vp8_dec_set_format); - videodec_class->cdata.default_sink_template_caps = "video/x-vp8"; + videodec_class->cdata.default_sink_template_caps = "video/x-vp8, " + "width=(int) [1,MAX], " "height=(int) [1,MAX]"; gst_omx_set_default_role (&videodec_class->cdata, "video_decoder.vp8"); } diff --git a/omx/gstomxwmvdec.c b/omx/gstomxwmvdec.c index 1c8376c..098bf71 100644 --- a/omx/gstomxwmvdec.c +++ b/omx/gstomxwmvdec.c @@ -70,7 +70,8 @@ gst_omx_wmv_dec_class_init (GstOMXWMVDecClass * klass) GST_DEBUG_FUNCPTR (gst_omx_wmv_dec_is_format_change); videodec_class->set_format = GST_DEBUG_FUNCPTR (gst_omx_wmv_dec_set_format); - videodec_class->cdata.default_sink_template_caps = "video/x-wmv"; + videodec_class->cdata.default_sink_template_caps = "video/x-wmv, " + "width=(int) [1,MAX], " "height=(int) [1,MAX]"; gst_omx_set_default_role (&videodec_class->cdata, "video_decoder.wmv"); } |