{"id":1160,"url":"https://patchwork.libcamera.org/api/1.1/patches/1160/?format=json","web_url":"https://patchwork.libcamera.org/patch/1160/","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":"<20190504203354.20870-2-paul.elder@ideasonboard.com>","date":"2019-05-04T20:33:54","name":"[libcamera-devel,2/2] qcam: format_converter: Add NV formats support","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c1427c3ca9644f366686004c30f918b9ca9a5db9","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/1160/mbox/","series":[{"id":297,"url":"https://patchwork.libcamera.org/api/1.1/series/297/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=297","date":"2019-05-04T20:33:53","name":"[libcamera-devel,1/2] qcam: format_converter: Add formatFamily enum","version":1,"mbox":"https://patchwork.libcamera.org/series/297/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1160/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1160/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 3FFB060E54\n\tfor ;\n\tSat, 4 May 2019 22:34:11 +0200 (CEST)","from localhost.localdomain (unknown [96.44.9.117])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8EEFC33D;\n\tSat, 4 May 2019 22:34:10 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1557002051;\n\tbh=/nMgt4qoWRA31V0Dyd+fmYxbnf7p6ARyyhYdP6j36N4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ENWkIK31uetPbo2uv2KsctdldtpgGPACVUzxWABcn/I/tOVfKJgR1nbez7Ja24/bH\n\tiz60WD/j3fUHUzRgrK1KFyx/ddAUIoX6Szw6Ui1BjiKn5Vtx0dFAhPX6AwmJWsIh+g\n\tZntH/YA1ZObcX9YnjNLLUqbfQzxanqOOfsniG3mQ=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 4 May 2019 16:33:54 -0400","Message-Id":"<20190504203354.20870-2-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190504203354.20870-1-paul.elder@ideasonboard.com>","References":"<20190504203354.20870-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/2] qcam: format_converter: Add NV\n\tformats 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":"Sat, 04 May 2019 20:34:11 -0000"},"content":"Add support for some NV formats:\n- V4L2_PIX_FMT_NV12, V4L2_PIX_FMT_NV21\n- V4L2_PIX_FMT_NV16, V4L2_PIX_FMT_NV61\n- V4L2_PIX_FMT_NV24, V4L2_PIX_FMT_NV42\n\nSigned-off-by: Paul Elder \n---\n src/qcam/format_converter.cpp | 62 +++++++++++++++++++++++++++++++++++\n src/qcam/format_converter.h | 7 ++++\n 2 files changed, 69 insertions(+)","diff":"diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp\nindex 192767c..ca91c7e 100644\n--- a/src/qcam/format_converter.cpp\n+++ b/src/qcam/format_converter.cpp\n@@ -72,6 +72,42 @@ 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_NV12:\n+\t\tformatFamily_ = NV;\n+\t\txDownSample_ = 2;\n+\t\tyDownSample_ = 2;\n+\t\tnvSwap_ = false;\n+\t\tbreak;\n+\tcase V4L2_PIX_FMT_NV21:\n+\t\tformatFamily_ = NV;\n+\t\txDownSample_ = 2;\n+\t\tyDownSample_ = 2;\n+\t\tnvSwap_ = true;\n+\t\tbreak;\n+\tcase V4L2_PIX_FMT_NV16:\n+\t\tformatFamily_ = NV;\n+\t\txDownSample_ = 2;\n+\t\tyDownSample_ = 1;\n+\t\tnvSwap_ = false;\n+\t\tbreak;\n+\tcase V4L2_PIX_FMT_NV61:\n+\t\tformatFamily_ = NV;\n+\t\txDownSample_ = 2;\n+\t\tyDownSample_ = 1;\n+\t\tnvSwap_ = true;\n+\t\tbreak;\n+\tcase V4L2_PIX_FMT_NV24:\n+\t\tformatFamily_ = NV;\n+\t\txDownSample_ = 1;\n+\t\tyDownSample_ = 1;\n+\t\tnvSwap_ = false;\n+\t\tbreak;\n+\tcase V4L2_PIX_FMT_NV42:\n+\t\tformatFamily_ = NV;\n+\t\txDownSample_ = 1;\n+\t\tyDownSample_ = 1;\n+\t\tnvSwap_ = true;\n+\t\tbreak;\n \tcase V4L2_PIX_FMT_MJPEG:\n \t\tformatFamily_ = MJPEG;\n \t\tbreak;\n@@ -99,6 +135,9 @@ void FormatConverter::convert(const unsigned char *src, size_t size,\n \tcase RGB:\n \t\tconvertRGB(src, dst->bits());\n \t\tbreak;\n+\tcase NV:\n+\t\tconvertNV(src, dst->bits());\n+\t\tbreak;\n \t};\n }\n \n@@ -171,3 +210,26 @@ void FormatConverter::convertYUV(const unsigned char *src, unsigned char *dst)\n \t\t}\n \t}\n }\n+\n+void FormatConverter::convertNV(const unsigned char *src, unsigned char *dst)\n+{\n+\tunsigned int i, j;\n+\tint r, g, b, y, cr, cb, loc;\n+\n+\tfor (j = 0; j < height_; j++) {\n+\t\tfor (i = 0; i < width_; i++) {\n+\t\t\ty = src[j * width_ + i];\n+\t\t\tloc = height_ * width_ +\n+\t\t\t (j / yDownSample_) * width_ * 2 / xDownSample_ +\n+\t\t\t (i & -xDownSample_) * 2 / xDownSample_;\n+\t\t\tcb = nvSwap_ ? src[loc + 1] : src[loc];\n+\t\t\tcr = nvSwap_ ? src[loc] : src[loc + 1];\n+\n+\t\t\tyuv_to_rgb(y, cb, cr, &r, &g, &b);\n+\t\t\tdst[j * width_ * 4 + i * 4 + 0] = b;\n+\t\t\tdst[j * width_ * 4 + i * 4 + 1] = g;\n+\t\t\tdst[j * width_ * 4 + i * 4 + 2] = r;\n+\t\t\tdst[j * width_ * 4 + i * 4 + 3] = 0xff;\n+\t\t}\n+\t}\n+}\ndiff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h\nindex 9820982..48af0fc 100644\n--- a/src/qcam/format_converter.h\n+++ b/src/qcam/format_converter.h\n@@ -16,6 +16,7 @@ class FormatConverter\n public:\n \tenum formatFamily {\n \t\tMJPEG,\n+\t\tNV,\n \t\tRGB,\n \t\tYUV,\n \t};\n@@ -26,6 +27,7 @@ public:\n \tvoid convert(const unsigned char *src, size_t size, QImage *dst);\n \n private:\n+\tvoid convertNV(const unsigned char *src, unsigned char *dst);\n \tvoid convertRGB(const unsigned char *src, unsigned char *dst);\n \tvoid convertYUV(const unsigned char *src, unsigned char *dst);\n \n@@ -35,6 +37,11 @@ private:\n \n \tenum formatFamily formatFamily_;\n \n+\t/* NV parameters */\n+\tunsigned int xDownSample_;\n+\tunsigned int yDownSample_;\n+\tbool nvSwap_;\n+\n \t/* RGB parameters */\n \tunsigned int bpp_;\n \tunsigned int r_pos_;\n","prefixes":["libcamera-devel","2/2"]}