v4l2object: Don't enforce dimension field on encoded formats

Don't enforce having width, height and framerate in template caps for encoded
formats. These don't always need to be exposed and may break negotiation for
decoder and decoding sink. If needed, these field will be automatically added
when probed caps are known.

https://bugzilla.gnome.org/show_bug.cgi?id=720568
This commit is contained in:
Nicolas Dufresne 2013-12-12 16:27:21 -05:00
parent ba81eeb16b
commit 986e5b460d

View file

@ -1022,25 +1022,25 @@ static const GstV4L2FormatDesc gst_v4l2_formats[] = {
#endif #endif
/* compressed formats */ /* compressed formats */
{V4L2_PIX_FMT_MJPEG, TRUE, GST_V4L2_CODEC}, {V4L2_PIX_FMT_MJPEG, FALSE, GST_V4L2_CODEC},
{V4L2_PIX_FMT_JPEG, TRUE, GST_V4L2_CODEC}, {V4L2_PIX_FMT_JPEG, FALSE, GST_V4L2_CODEC},
#ifdef V4L2_PIX_FMT_PJPG #ifdef V4L2_PIX_FMT_PJPG
{V4L2_PIX_FMT_PJPG, TRUE, GST_V4L2_CODEC}, {V4L2_PIX_FMT_PJPG, FALSE, GST_V4L2_CODEC},
#endif #endif
{V4L2_PIX_FMT_DV, TRUE, GST_V4L2_TRANSPORT}, {V4L2_PIX_FMT_DV, FALSE, GST_V4L2_TRANSPORT},
{V4L2_PIX_FMT_MPEG, FALSE, GST_V4L2_TRANSPORT}, {V4L2_PIX_FMT_MPEG, FALSE, GST_V4L2_TRANSPORT},
{V4L2_PIX_FMT_MPEG1, TRUE, GST_V4L2_CODEC}, {V4L2_PIX_FMT_MPEG1, FALSE, GST_V4L2_CODEC},
{V4L2_PIX_FMT_MPEG2, TRUE, GST_V4L2_CODEC}, {V4L2_PIX_FMT_MPEG2, FALSE, GST_V4L2_CODEC},
{V4L2_PIX_FMT_MPEG4, TRUE, GST_V4L2_CODEC}, {V4L2_PIX_FMT_MPEG4, FALSE, GST_V4L2_CODEC},
#ifdef V4L2_PIX_FMT_H263 #ifdef V4L2_PIX_FMT_H263
{V4L2_PIX_FMT_H263, TRUE, GST_V4L2_CODEC}, {V4L2_PIX_FMT_H263, FALSE, GST_V4L2_CODEC},
#endif #endif
#ifdef V4L2_PIX_FMT_H264 #ifdef V4L2_PIX_FMT_H264
{V4L2_PIX_FMT_H264, TRUE, GST_V4L2_CODEC}, {V4L2_PIX_FMT_H264, FALSE, GST_V4L2_CODEC},
#endif #endif
#ifdef V4L2_PIX_FMT_VP8 #ifdef V4L2_PIX_FMT_VP8
{V4L2_PIX_FMT_VP8, TRUE, GST_V4L2_CODEC}, {V4L2_PIX_FMT_VP8, FALSE, GST_V4L2_CODEC},
#endif #endif
/* Vendor-specific formats */ /* Vendor-specific formats */