From: "Németh Márton" <nm127@freemail.hu>
To: Hans de Goede <hdegoede@redhat.com>, Luc Saillard <luc@saillard.org>
Cc: V4L Mailing List <linux-media@vger.kernel.org>
Subject: [PATCH ] libv4l: skip false Pixart markers
Date: Mon, 01 Feb 2010 23:13:07 +0100 [thread overview]
Message-ID: <4B6751F3.3040407@freemail.hu> (raw)
In-Reply-To: <4B67466F.1030301@freemail.hu>
From: Márton Németh <nm127@freemail.hu>
The byte sequence 0xff, 0xff, 0xff 0xff is not a real marker to skip, instead
it is one byte from the image and the following three 0xff bytes might belong
to a real marker. Modify pixart_fill_nbits() macro to pass the first 0xff byte
as an image data.
Signed-off-by: Márton Németh <nm127@freemail.hu>
---
diff -r f23c5a878fb1 v4l2-apps/libv4l/libv4lconvert/tinyjpeg.c
--- a/v4l2-apps/libv4l/libv4lconvert/tinyjpeg.c Mon Feb 01 13:32:46 2010 +0100
+++ b/v4l2-apps/libv4l/libv4lconvert/tinyjpeg.c Mon Feb 01 23:05:39 2010 +0100
@@ -339,10 +339,15 @@
} \
break; \
case 0xff: \
- if (stream[1] == 0xff && (stream[2] < 7 || stream[2] == 0xff)) { \
- stream += 3; \
- c = *stream++; \
- break; \
+ if (stream[1] == 0xff) { \
+ if (stream[2] < 7) { \
+ stream += 3; \
+ c = *stream++; \
+ break; \
+ } else if (stream[2] == 0xff) { \
+ /* four 0xff in a row: the first belongs to the image data */ \
+ break; \
+ }\
} \
/* Error fall through */ \
default: \
next prev parent reply other threads:[~2010-02-01 22:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-01 21:23 libv4l: possible problem found in PAC7302 JPEG decoding Németh Márton
2010-02-01 22:13 ` Németh Márton [this message]
2010-02-02 10:30 ` [PATCH ] libv4l: skip false Pixart markers Hans de Goede
2010-02-02 18:54 ` Németh Márton
2010-02-04 8:22 ` [PATCH libv4l tree, RFC] libv4l: skip false Pixart markers with buffer copy Németh Márton
2010-02-05 13:42 ` Hans de Goede
2010-02-05 16:43 ` Thomas Kaiser
2010-02-02 10:46 ` libv4l: possible problem found in PAC7302 JPEG decoding Thomas Kaiser
2010-02-02 18:59 ` Németh Márton
2010-02-02 19:48 ` Thomas Kaiser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B6751F3.3040407@freemail.hu \
--to=nm127@freemail.hu \
--cc=hdegoede@redhat.com \
--cc=linux-media@vger.kernel.org \
--cc=luc@saillard.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox