* [PATCH] libv4lconvert: Fix support for compressed bayer formats
@ 2019-02-05 17:06 Ricardo Ribalda Delgado
0 siblings, 0 replies; only message in thread
From: Ricardo Ribalda Delgado @ 2019-02-05 17:06 UTC (permalink / raw)
To: Hans de Goede, Hans Verkuil, Gregor Jasny, linux-media, daniel
Cc: Ricardo Ribalda Delgado
10 bit packet Bayer format broke the support for the other
compressed bayer formats.
Due to the fallthrough of the compressed formats, 10b code will be
executed for every 10b format.
Fixes: c44b30096589 ("libv4l: Add support for BAYER10P format conversion")
Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
---
lib/libv4lconvert/libv4lconvert.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/lib/libv4lconvert/libv4lconvert.c b/lib/libv4lconvert/libv4lconvert.c
index b3dbf5a0..718e1d43 100644
--- a/lib/libv4lconvert/libv4lconvert.c
+++ b/lib/libv4lconvert/libv4lconvert.c
@@ -990,12 +990,10 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert_data *data,
case V4L2_PIX_FMT_SBGGR10P:
case V4L2_PIX_FMT_SGBRG10P:
case V4L2_PIX_FMT_SGRBG10P:
- case V4L2_PIX_FMT_SRGGB10P:
- if (src_size < ((width * height * 10)/8)) {
- V4LCONVERT_ERR("short raw bayer10 data frame\n");
- errno = EPIPE;
- result = -1;
- }
+ case V4L2_PIX_FMT_SRGGB10P: {
+
+ int b10format = 1;
+
switch (src_pix_fmt) {
case V4L2_PIX_FMT_SBGGR10P:
src_pix_fmt = V4L2_PIX_FMT_SBGGR8;
@@ -1009,10 +1007,22 @@ static int v4lconvert_convert_pixfmt(struct v4lconvert_data *data,
case V4L2_PIX_FMT_SRGGB10P:
src_pix_fmt = V4L2_PIX_FMT_SRGGB8;
break;
+ default:
+ b10format = 0;
}
- v4lconvert_bayer10p_to_bayer8(src, src, width, height);
- bytesperline = width;
+ if (b10format) {
+ if (src_size < ((width * height * 10)/8)) {
+ V4LCONVERT_ERR
+ ("short raw bayer10 data frame\n");
+ errno = EPIPE;
+ result = -1;
+ break;
+ }
+ v4lconvert_bayer10p_to_bayer8(src, src, width, height);
+ bytesperline = width;
+ }
+ }
/* Fall-through*/
case V4L2_PIX_FMT_SBGGR8:
case V4L2_PIX_FMT_SGBRG8:
--
2.20.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-02-05 17:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-05 17:06 [PATCH] libv4lconvert: Fix support for compressed bayer formats Ricardo Ribalda Delgado
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).