From patchwork Fri Mar 29 15:27:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 822 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 01A66600FB for ; Fri, 29 Mar 2019 16:27:22 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 77E509A3 for ; Fri, 29 Mar 2019 16:27:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1553873242; bh=wCpn4PlmVl4G5k+uLj4w9rV7JfRjUGR0sIUHMG7XC/c=; h=From:To:Subject:Date:From; b=NE8iZA++GT+g0aZhA88OTowS36UA9e7Sa0GMRZTeXnH4vEr43WMIfkMyEy/DAEAeE LKTOpjIyBQ8kzqalpcBopWRf36CAXP1sxsc1QUBTmirFFbLrCgm3agz9j7wPs0eqVi +ZYDPYVxQecBrHU8b4JNkpZWgY8x24SX++rSLnM4= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 29 Mar 2019 17:27:05 +0200 Message-Id: <20190329152705.29988-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] qcam: Add JPEG format support X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2019 15:27:23 -0000 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 +++++++++++++++- src/qcam/format_converter.h | 9 ++++++++- src/qcam/main_window.cpp | 2 +- src/qcam/viewfinder.cpp | 4 ++-- src/qcam/viewfinder.h | 2 +- 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp index 6979a054c0ca..bda9057e17b6 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; diff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h index 196064c74f65..396d0bea116a 100644 --- a/src/qcam/format_converter.h +++ b/src/qcam/format_converter.h @@ -7,15 +7,22 @@ #ifndef __QCAM_FORMAT_CONVERTER_H__ #define __QCAM_FORMAT_CONVERTER_H__ +#include + +class QImage; + class FormatConverter { public: int configure(unsigned int format, unsigned int width, unsigned int height); - void convert(const unsigned char *src, unsigned char *dst); + void convert(const unsigned char *src, size_t size, QImage *dst); private: + void convertYUV(const unsigned char *src, unsigned char *dst); + + unsigned int format_; unsigned int width_; unsigned int height_; unsigned int y_pos_; diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index a148aa4d117f..fea701422015 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -222,7 +222,7 @@ int MainWindow::display(Buffer *buffer) Plane &plane = buffer->planes().front(); unsigned char *raw = static_cast(plane.mem()); - viewfinder_->display(raw); + viewfinder_->display(raw, buffer->bytesused()); return 0; } diff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp index 5841dc032967..224a227ddd5b 100644 --- a/src/qcam/viewfinder.cpp +++ b/src/qcam/viewfinder.cpp @@ -16,9 +16,9 @@ ViewFinder::ViewFinder(QWidget *parent) { } -void ViewFinder::display(const unsigned char *raw) +void ViewFinder::display(const unsigned char *raw, size_t size) { - converter_.convert(raw, image_->bits()); + converter_.convert(raw, size, image_); QPixmap pixmap = QPixmap::fromImage(*image_); setPixmap(pixmap); diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h index df4901699a14..c9ca98913e05 100644 --- a/src/qcam/viewfinder.h +++ b/src/qcam/viewfinder.h @@ -20,7 +20,7 @@ public: int setFormat(unsigned int format, unsigned int width, unsigned int height); - void display(const unsigned char *rgb); + void display(const unsigned char *rgb, size_t size); private: unsigned int format_;