From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Fri, 28 Oct 2011 08:57:36 +0000 (+0100)
Subject: jpegdec: add sof-marker to template caps, so we don't get plugged for lossless jpeg
X-Git-Tag: RELEASE-0.11.1~7^2~222
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff40deb139b49262c253f8ca284fdae82d256442;p=platform%2Fupstream%2Fgst-plugins-good.git

jpegdec: add sof-marker to template caps, so we don't get plugged for lossless jpeg

jpegdec (using libjpeg 6.2/8) can't decode some lossless types of JPEG.

https://bugzilla.gnome.org/show_bug.cgi?id=556648
---

diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index 2770696..692b219 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -74,6 +74,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
     );
 /* *INDENT-ON* */
 
+/* FIXME: sof-marker is for IJG libjpeg 8, should be different for 6.2 */
 static GstStaticPadTemplate gst_jpeg_dec_sink_pad_template =
 GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
@@ -81,7 +82,8 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     GST_STATIC_CAPS ("image/jpeg, "
         "width = (int) [ " G_STRINGIFY (MIN_WIDTH) ", " G_STRINGIFY (MAX_WIDTH)
         " ], " "height = (int) [ " G_STRINGIFY (MIN_HEIGHT) ", "
-        G_STRINGIFY (MAX_HEIGHT) " ], " "framerate = (fraction) [ 0/1, MAX ]")
+        G_STRINGIFY (MAX_HEIGHT) " ], framerate = (fraction) [ 0/1, MAX ], "
+        "sof-marker = (int) { 0, 1, 2, 5, 6, 7, 9, 10, 13, 14 }")
     );
 
 GST_DEBUG_CATEGORY_STATIC (jpeg_dec_debug);