{"id":822,"url":"https://patchwork.libcamera.org/api/1.1/patches/822/?format=json","web_url":"https://patchwork.libcamera.org/patch/822/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190329152705.29988-1-laurent.pinchart@ideasonboard.com>","date":"2019-03-29T15:27:05","name":"[libcamera-devel] qcam: Add JPEG format support","commit_ref":"80e236e19b61a1267948433fd6855da138d6f527","pull_url":null,"state":"accepted","archived":false,"hash":"9b951595e2e51652bea9391338c69d79ea1dd50e","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/822/mbox/","series":[{"id":224,"url":"https://patchwork.libcamera.org/api/1.1/series/224/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=224","date":"2019-03-29T15:27:05","name":"[libcamera-devel] qcam: Add JPEG format support","version":1,"mbox":"https://patchwork.libcamera.org/series/224/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/822/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/822/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 01A66600FB\n\tfor ;\n\tFri, 29 Mar 2019 16:27:22 +0100 (CET)","from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 77E509A3\n\tfor ;\n\tFri, 29 Mar 2019 16:27:22 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1553873242;\n\tbh=wCpn4PlmVl4G5k+uLj4w9rV7JfRjUGR0sIUHMG7XC/c=;\n\th=From:To:Subject:Date:From;\n\tb=NE8iZA++GT+g0aZhA88OTowS36UA9e7Sa0GMRZTeXnH4vEr43WMIfkMyEy/DAEAeE\n\tLKTOpjIyBQ8kzqalpcBopWRf36CAXP1sxsc1QUBTmirFFbLrCgm3agz9j7wPs0eqVi\n\t+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","Content-Transfer-Encoding":"8bit","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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 29 Mar 2019 15:27:23 -0000"},"content":"When the camera provides MJPEG, use the QImage JPEG decompression code\nto convert that to RGB.\n\nSigned-off-by: Laurent Pinchart \n---\n src/qcam/format_converter.cpp | 16 +++++++++++++++-\n src/qcam/format_converter.h | 9 ++++++++-\n src/qcam/main_window.cpp | 2 +-\n src/qcam/viewfinder.cpp | 4 ++--\n src/qcam/viewfinder.h | 2 +-\n 5 files changed, 27 insertions(+), 6 deletions(-)","diff":"diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp\nindex 6979a054c0ca..bda9057e17b6 100644\n--- a/src/qcam/format_converter.cpp\n+++ b/src/qcam/format_converter.cpp\n@@ -9,6 +9,8 @@\n \n #include \n \n+#include \n+\n #include \"format_converter.h\"\n \n #define RGBSHIFT\t\t8\n@@ -45,16 +47,28 @@ int FormatConverter::configure(unsigned int format, unsigned int width,\n \t\ty_pos_ = 0;\n \t\tcb_pos_ = 1;\n \t\tbreak;\n+\tcase V4L2_PIX_FMT_MJPEG:\n+\t\tbreak;\n \tdefault:\n \t\treturn -EINVAL;\n \t};\n \n+\tformat_ = format;\n \twidth_ = width;\n \theight_ = height;\n \n \treturn 0;\n }\n \n+void FormatConverter::convert(const unsigned char *src, size_t size,\n+\t\t\t QImage *dst)\n+{\n+\tif (format_ == V4L2_PIX_FMT_MJPEG)\n+\t\tdst->loadFromData(src, size, \"JPEG\");\n+\telse\n+\t\tconvertYUV(src, dst->bits());\n+}\n+\n static void yuv_to_rgb(int y, int u, int v, int *r, int *g, int *b)\n {\n \tint c = y - 16;\n@@ -65,7 +79,7 @@ static void yuv_to_rgb(int y, int u, int v, int *r, int *g, int *b)\n \t*b = CLIP(( 298 * c + 516 * d + 128) >> RGBSHIFT);\n }\n \n-void FormatConverter::convert(const unsigned char *src, unsigned char *dst)\n+void FormatConverter::convertYUV(const unsigned char *src, unsigned char *dst)\n {\n \tunsigned int src_x, src_y, dst_x, dst_y;\n \tunsigned int src_stride;\ndiff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h\nindex 196064c74f65..396d0bea116a 100644\n--- a/src/qcam/format_converter.h\n+++ b/src/qcam/format_converter.h\n@@ -7,15 +7,22 @@\n #ifndef __QCAM_FORMAT_CONVERTER_H__\n #define __QCAM_FORMAT_CONVERTER_H__\n \n+#include \n+\n+class QImage;\n+\n class FormatConverter\n {\n public:\n \tint configure(unsigned int format, unsigned int width,\n \t\t unsigned int height);\n \n-\tvoid convert(const unsigned char *src, unsigned char *dst);\n+\tvoid convert(const unsigned char *src, size_t size, QImage *dst);\n \n private:\n+\tvoid convertYUV(const unsigned char *src, unsigned char *dst);\n+\n+\tunsigned int format_;\n \tunsigned int width_;\n \tunsigned int height_;\n \tunsigned int y_pos_;\ndiff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\nindex a148aa4d117f..fea701422015 100644\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -222,7 +222,7 @@ int MainWindow::display(Buffer *buffer)\n \n \tPlane &plane = buffer->planes().front();\n \tunsigned char *raw = static_cast(plane.mem());\n-\tviewfinder_->display(raw);\n+\tviewfinder_->display(raw, buffer->bytesused());\n \n \treturn 0;\n }\ndiff --git a/src/qcam/viewfinder.cpp b/src/qcam/viewfinder.cpp\nindex 5841dc032967..224a227ddd5b 100644\n--- a/src/qcam/viewfinder.cpp\n+++ b/src/qcam/viewfinder.cpp\n@@ -16,9 +16,9 @@ ViewFinder::ViewFinder(QWidget *parent)\n {\n }\n \n-void ViewFinder::display(const unsigned char *raw)\n+void ViewFinder::display(const unsigned char *raw, size_t size)\n {\n-\tconverter_.convert(raw, image_->bits());\n+\tconverter_.convert(raw, size, image_);\n \n \tQPixmap pixmap = QPixmap::fromImage(*image_);\n \tsetPixmap(pixmap);\ndiff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h\nindex df4901699a14..c9ca98913e05 100644\n--- a/src/qcam/viewfinder.h\n+++ b/src/qcam/viewfinder.h\n@@ -20,7 +20,7 @@ public:\n \n \tint setFormat(unsigned int format, unsigned int width,\n \t\t unsigned int height);\n-\tvoid display(const unsigned char *rgb);\n+\tvoid display(const unsigned char *rgb, size_t size);\n \n private:\n \tunsigned int format_;\n","prefixes":["libcamera-devel"]}