jpegdec: remove sof-marker from template caps for now

Now that the subset check actually works, this breaks
things with demuxers that don't put a "sof-marker"
in their jpeg caps, and we don't have a good parser
to plug either yet.
This commit is contained in:
Tim-Philipp Müller 2013-02-14 14:13:27 +00:00
parent af5c3fe312
commit 24cdefcb75

View file

@ -75,6 +75,8 @@ GST_STATIC_PAD_TEMPLATE ("src",
/* *INDENT-ON* */ /* *INDENT-ON* */
/* FIXME: sof-marker is for IJG libjpeg 8, should be different for 6.2 */ /* FIXME: sof-marker is for IJG libjpeg 8, should be different for 6.2 */
/* FIXME: add back "sof-marker = (int) { 0, 1, 2, 5, 6, 7, 9, 10, 13, 14 }"
* once we have a parser and/or demuxer set caps properly */
static GstStaticPadTemplate gst_jpeg_dec_sink_pad_template = static GstStaticPadTemplate gst_jpeg_dec_sink_pad_template =
GST_STATIC_PAD_TEMPLATE ("sink", GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
@ -82,8 +84,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
GST_STATIC_CAPS ("image/jpeg, " GST_STATIC_CAPS ("image/jpeg, "
"width = (int) [ " G_STRINGIFY (MIN_WIDTH) ", " G_STRINGIFY (MAX_WIDTH) "width = (int) [ " G_STRINGIFY (MIN_WIDTH) ", " G_STRINGIFY (MAX_WIDTH)
" ], " "height = (int) [ " G_STRINGIFY (MIN_HEIGHT) ", " " ], " "height = (int) [ " G_STRINGIFY (MIN_HEIGHT) ", "
G_STRINGIFY (MAX_HEIGHT) " ], " G_STRINGIFY (MAX_HEIGHT) " ] ")
"sof-marker = (int) { 0, 1, 2, 5, 6, 7, 9, 10, 13, 14 }")
); );
GST_DEBUG_CATEGORY_STATIC (jpeg_dec_debug); GST_DEBUG_CATEGORY_STATIC (jpeg_dec_debug);