From 80e236e19b61a1267948433fd6855da138d6f527 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 29 Mar 2019 17:20:07 +0200 Subject: qcam: Add JPEG format support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the camera provides MJPEG, use the QImage JPEG decompression code to convert that to RGB. Signed-off-by: Laurent Pinchart Tested-by: Kieran Bingham Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- src/qcam/format_converter.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/qcam/format_converter.cpp') diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp index 6979a054..bda9057e 100644 --- a/src/qcam/format_converter.cpp +++ b/src/qcam/format_converter.cpp @@ -9,6 +9,8 @@ #include +#include + #include "format_converter.h" #define RGBSHIFT 8 @@ -45,16 +47,28 @@ int FormatConverter::configure(unsigned int format, unsigned int width, y_pos_ = 0; cb_pos_ = 1; break; + case V4L2_PIX_FMT_MJPEG: + break; default: return -EINVAL; }; + format_ = format; width_ = width; height_ = height; return 0; } +void FormatConverter::convert(const unsigned char *src, size_t size, + QImage *dst) +{ + if (format_ == V4L2_PIX_FMT_MJPEG) + dst->loadFromData(src, size, "JPEG"); + else + convertYUV(src, dst->bits()); +} + static void yuv_to_rgb(int y, int u, int v, int *r, int *g, int *b) { int c = y - 16; @@ -65,7 +79,7 @@ static void yuv_to_rgb(int y, int u, int v, int *r, int *g, int *b) *b = CLIP(( 298 * c + 516 * d + 128) >> RGBSHIFT); } -void FormatConverter::convert(const unsigned char *src, unsigned char *dst) +void FormatConverter::convertYUV(const unsigned char *src, unsigned char *dst) { unsigned int src_x, src_y, dst_x, dst_y; unsigned int src_stride; -- cgit v1.2.1