{"id":1163,"url":"https://patchwork.libcamera.org/api/1.1/patches/1163/?format=json","web_url":"https://patchwork.libcamera.org/patch/1163/","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":"<20190506223430.3203-1-paul.elder@ideasonboard.com>","date":"2019-05-06T22:34:29","name":"[libcamera-devel,v3,1/2] qcam: format_converter: Add formatFamily enum","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"13acd6214a09ae7b514320d2ccd0a02e3a44f298","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1163/mbox/","series":[{"id":299,"url":"https://patchwork.libcamera.org/api/1.1/series/299/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=299","date":"2019-05-06T22:34:29","name":"[libcamera-devel,v3,1/2] qcam: format_converter: Add formatFamily enum","version":3,"mbox":"https://patchwork.libcamera.org/series/299/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1163/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1163/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4323D60E5C\n\tfor ;\n\tTue, 7 May 2019 00:34:49 +0200 (CEST)","from localhost.localdomain (unknown [96.44.9.117])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2CF8A2E7;\n\tTue, 7 May 2019 00:34:48 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1557182088;\n\tbh=4dMTRt/CW4VhMqIiacHqp8h6pBqQ3dWcWjuUe82pohI=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=q+A6B+pi2aglWcE89d8gKV0MRZ/QBB3lLwzwa5n6m3vkT/yXiwCEWP6AEiHF0+EfV\n\tZMLk4oFQpLXzu6el7L2i7ev36VLLorUHOrwxx3/orQjQOQ5SruokddP4Q42tOHLItW\n\tKCGOjvOG0Aioe90RMKYqJPbekCkk72Xd7dE3hy5k=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 6 May 2019 18:34:29 -0400","Message-Id":"<20190506223430.3203-1-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.20.1","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 1/2] qcam: format_converter: Add\n\tformatFamily enum","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":"Mon, 06 May 2019 22:34:49 -0000"},"content":"It is not sustainable to add a new flag for every new video format\nfamily (eg. YUYV, RGB, NV, MJPEG, etc), so add a formatFamily enum to\nindicate these in the FormatConverter.\n\nNote that formats are grouped into families based on if they are able to\nshare a set of parameters for conversion.\n\nSigned-off-by: Paul Elder \nReviewed-by: Laurent Pinchart \n---\nChanges in v3: move enum FormatFamily to the private section\n\nChanges in v2: rename enum formatFamily to enum FormatFamily\n\n src/qcam/format_converter.cpp | 27 ++++++++++++++++-----------\n src/qcam/format_converter.h | 11 ++++++++++-\n 2 files changed, 26 insertions(+), 12 deletions(-)","diff":"diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp\nindex d9088c3..192767c 100644\n--- a/src/qcam/format_converter.cpp\n+++ b/src/qcam/format_converter.cpp\n@@ -32,48 +32,48 @@ int FormatConverter::configure(unsigned int format, unsigned int width,\n {\n \tswitch (format) {\n \tcase V4L2_PIX_FMT_BGR24:\n-\t\tyuv_ = false;\n+\t\tformatFamily_ = RGB;\n \t\tr_pos_ = 2;\n \t\tg_pos_ = 1;\n \t\tb_pos_ = 0;\n \t\tbpp_ = 3;\n \t\tbreak;\n \tcase V4L2_PIX_FMT_RGB24:\n-\t\tyuv_ = false;\n+\t\tformatFamily_ = RGB;\n \t\tr_pos_ = 0;\n \t\tg_pos_ = 1;\n \t\tb_pos_ = 2;\n \t\tbpp_ = 3;\n \t\tbreak;\n \tcase V4L2_PIX_FMT_ARGB32:\n-\t\tyuv_ = false;\n+\t\tformatFamily_ = RGB;\n \t\tr_pos_ = 1;\n \t\tg_pos_ = 2;\n \t\tb_pos_ = 3;\n \t\tbpp_ = 4;\n \t\tbreak;\n \tcase V4L2_PIX_FMT_VYUY:\n-\t\tyuv_ = true;\n+\t\tformatFamily_ = YUV;\n \t\ty_pos_ = 1;\n \t\tcb_pos_ = 2;\n \t\tbreak;\n \tcase V4L2_PIX_FMT_YVYU:\n-\t\tyuv_ = true;\n+\t\tformatFamily_ = YUV;\n \t\ty_pos_ = 0;\n \t\tcb_pos_ = 3;\n \t\tbreak;\n \tcase V4L2_PIX_FMT_UYVY:\n-\t\tyuv_ = true;\n+\t\tformatFamily_ = YUV;\n \t\ty_pos_ = 1;\n \t\tcb_pos_ = 0;\n \t\tbreak;\n \tcase V4L2_PIX_FMT_YUYV:\n-\t\tyuv_ = true;\n+\t\tformatFamily_ = YUV;\n \t\ty_pos_ = 0;\n \t\tcb_pos_ = 1;\n \t\tbreak;\n \tcase V4L2_PIX_FMT_MJPEG:\n-\t\tyuv_ = false;\n+\t\tformatFamily_ = MJPEG;\n \t\tbreak;\n \tdefault:\n \t\treturn -EINVAL;\n@@ -89,12 +89,17 @@ int FormatConverter::configure(unsigned int format, unsigned int width,\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+\tswitch (formatFamily_) {\n+\tcase MJPEG:\n \t\tdst->loadFromData(src, size, \"JPEG\");\n-\telse if (yuv_)\n+\t\tbreak;\n+\tcase YUV:\n \t\tconvertYUV(src, dst->bits());\n-\telse\n+\t\tbreak;\n+\tcase RGB:\n \t\tconvertRGB(src, dst->bits());\n+\t\tbreak;\n+\t};\n }\n \n void FormatConverter::convertRGB(const unsigned char *src, unsigned char *dst)\ndiff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h\nindex 76cd9f1..bca44aa 100644\n--- a/src/qcam/format_converter.h\n+++ b/src/qcam/format_converter.h\n@@ -20,6 +20,12 @@ public:\n \tvoid convert(const unsigned char *src, size_t size, QImage *dst);\n \n private:\n+\tenum FormatFamily {\n+\t\tMJPEG,\n+\t\tRGB,\n+\t\tYUV,\n+\t};\n+\n \tvoid convertRGB(const unsigned char *src, unsigned char *dst);\n \tvoid convertYUV(const unsigned char *src, unsigned char *dst);\n \n@@ -27,12 +33,15 @@ private:\n \tunsigned int width_;\n \tunsigned int height_;\n \n+\tenum FormatFamily formatFamily_;\n+\n+\t/* RGB parameters */\n \tunsigned int bpp_;\n \tunsigned int r_pos_;\n \tunsigned int g_pos_;\n \tunsigned int b_pos_;\n \n-\tbool yuv_;\n+\t/* YUV parameters */\n \tunsigned int y_pos_;\n \tunsigned int cb_pos_;\n };\n","prefixes":["libcamera-devel","v3","1/2"]}