diff --git a/config/rpi/gstomx.conf b/config/rpi/gstomx.conf index 43667f41cb..ee1da9defc 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 5db50c3b30..134995bd51 100644 --- a/omx/gstomxh263dec.c +++ b/omx/gstomxh263dec.c @@ -60,7 +60,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_element_class_set_static_metadata (element_class, "OpenMAX H.263 Video Decoder", diff --git a/omx/gstomxh264dec.c b/omx/gstomxh264dec.c index b760d20c2e..2581889a41 100644 --- a/omx/gstomxh264dec.c +++ b/omx/gstomxh264dec.c @@ -61,7 +61,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_element_class_set_static_metadata (element_class, "OpenMAX H.264 Video Decoder", diff --git a/omx/gstomxmjpegdec.c b/omx/gstomxmjpegdec.c index 402e51b149..8e704ae8e5 100644 --- a/omx/gstomxmjpegdec.c +++ b/omx/gstomxmjpegdec.c @@ -59,7 +59,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_element_class_set_static_metadata (element_class, "OpenMAX MJPEG Video Decoder", diff --git a/omx/gstomxmpeg2videodec.c b/omx/gstomxmpeg2videodec.c index a3cfd8365c..7eaaf8b8c9 100644 --- a/omx/gstomxmpeg2videodec.c +++ b/omx/gstomxmpeg2videodec.c @@ -62,7 +62,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_element_class_set_static_metadata (element_class, "OpenMAX MPEG2 Video Decoder", diff --git a/omx/gstomxmpeg4videodec.c b/omx/gstomxmpeg4videodec.c index 04ddc7817e..d912d74dcb 100644 --- a/omx/gstomxmpeg4videodec.c +++ b/omx/gstomxmpeg4videodec.c @@ -63,7 +63,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_element_class_set_static_metadata (element_class, "OpenMAX MPEG4 Video Decoder", diff --git a/omx/gstomxtheoradec.c b/omx/gstomxtheoradec.c index e1410df131..6d8ca5c3ff 100644 --- a/omx/gstomxtheoradec.c +++ b/omx/gstomxtheoradec.c @@ -1,6 +1,6 @@ /* - * Copyright (C) 2011, Hewlett-Packard Development Company, L.P. - * Author: Sebastian Dröge , Collabora Ltd. + * Copyright (C) 2013, Collabora Ltd. + * Author: Sebastian Dröge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -64,15 +64,16 @@ gst_omx_theora_dec_class_init (GstOMXTheoraDecClass * klass) videodec_class->set_format = GST_DEBUG_FUNCPTR (gst_omx_theora_dec_set_format); - videodec_class->cdata.default_sink_template_caps = "video/x-theora"; + videodec_class->cdata.default_sink_template_caps = "video/x-theora, " + "width=(int) [1,MAX], " "height=(int) [1,MAX]"; gstvideodec_class->handle_frame = gst_omx_theora_dec_handle_frame; gstvideodec_class->stop = gst_omx_theora_dec_stop; gst_element_class_set_static_metadata (element_class, - "OpenMAX THEORA Video Decoder", + "OpenMAX Theora Video Decoder", "Codec/Decoder/Video", - "Decode THEORA video streams", + "Decode Theora video streams", "Sebastian Dröge "); gst_omx_set_default_role (&videodec_class->cdata, "video_decoder.theora"); diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c index b4ebab7abf..976f58eb34 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 , Collabora Ltd. + * Copyright (C) 2013, Collabora Ltd. + * Author: Sebastian Dröge * * 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 0d5a60db20..61886b8fbd 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 , Collabora Ltd. + * Copyright (C) 2013, Collabora Ltd. + * Author: Sebastian Dröge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -59,7 +59,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_element_class_set_static_metadata (element_class, "OpenMAX VP8 Video Decoder", diff --git a/omx/gstomxwmvdec.c b/omx/gstomxwmvdec.c index 28c60f7bf2..64460d9346 100644 --- a/omx/gstomxwmvdec.c +++ b/omx/gstomxwmvdec.c @@ -59,8 +59,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_element_class_set_static_metadata (element_class, "OpenMAX WMV Video Decoder",