{"id":3965,"url":"https://patchwork.libcamera.org/api/patches/3965/?format=json","web_url":"https://patchwork.libcamera.org/patch/3965/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20200606150436.1851700-4-niklas.soderlund@ragnatech.se>","date":"2020-06-06T15:04:29","name":"[libcamera-devel,v2,03/10] libcamera: ipu3: Fold mediaBusToFormat() into only caller","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b8e091647c0151f9eab68d879b5e33164e750ae4","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3965/mbox/","series":[{"id":964,"url":"https://patchwork.libcamera.org/api/series/964/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=964","date":"2020-06-06T15:04:26","name":"libcamera: ipu3: Allow zero-copy RAW stream","version":2,"mbox":"https://patchwork.libcamera.org/series/964/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3965/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3965/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B484263C15\n\tfor ;\n\tSat, 6 Jun 2020 17:04:54 +0200 (CEST)","from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 11e0e4a7-a807-11ea-933e-005056917a89;\n\tSat, 06 Jun 2020 17:04:51 +0200 (CEST)"],"X-Halon-ID":"11e0e4a7-a807-11ea-933e-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 6 Jun 2020 17:04:29 +0200","Message-Id":"<20200606150436.1851700-4-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.26.2","In-Reply-To":"<20200606150436.1851700-1-niklas.soderlund@ragnatech.se>","References":"<20200606150436.1851700-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 03/10] libcamera: ipu3: Fold\n\tmediaBusToFormat() into only caller","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Sat, 06 Jun 2020 15:04:55 -0000"},"content":"Make the code easier to read and refactor.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Jacopo Mondi \n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 38 ++++++++++++++--------------\n 1 file changed, 19 insertions(+), 19 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 6df1e29281941ebf..f7363244e1d2d0ff 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -133,8 +133,6 @@ public:\n \tint start();\n \tint stop();\n \n-\tstatic V4L2PixelFormat mediaBusToFormat(unsigned int code);\n-\n \tV4L2VideoDevice *output_;\n \tV4L2Subdevice *csi2_;\n \tCameraSensor *sensor_;\n@@ -1504,7 +1502,25 @@ int CIO2Device::configure(const Size &size,\n \tif (ret)\n \t\treturn ret;\n \n-\toutputFormat->fourcc = mediaBusToFormat(sensorFormat.mbus_code);\n+\tV4L2PixelFormat v4l2Format;\n+\tswitch (sensorFormat.mbus_code) {\n+\tcase MEDIA_BUS_FMT_SBGGR10_1X10:\n+\t\tv4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SBGGR10);\n+\t\tbreak;\n+\tcase MEDIA_BUS_FMT_SGBRG10_1X10:\n+\t\tv4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGBRG10);\n+\t\tbreak;\n+\tcase MEDIA_BUS_FMT_SGRBG10_1X10:\n+\t\tv4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGRBG10);\n+\t\tbreak;\n+\tcase MEDIA_BUS_FMT_SRGGB10_1X10:\n+\t\tv4l2Format = V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SRGGB10);\n+\t\tbreak;\n+\tdefault:\n+\t\treturn -EINVAL;\n+\t}\n+\n+\toutputFormat->fourcc = v4l2Format;\n \toutputFormat->size = sensorFormat.size;\n \toutputFormat->planesCount = 1;\n \n@@ -1578,22 +1594,6 @@ int CIO2Device::stop()\n \treturn output_->streamOff();\n }\n \n-V4L2PixelFormat CIO2Device::mediaBusToFormat(unsigned int code)\n-{\n-\tswitch (code) {\n-\tcase MEDIA_BUS_FMT_SBGGR10_1X10:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SBGGR10);\n-\tcase MEDIA_BUS_FMT_SGBRG10_1X10:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGBRG10);\n-\tcase MEDIA_BUS_FMT_SGRBG10_1X10:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SGRBG10);\n-\tcase MEDIA_BUS_FMT_SRGGB10_1X10:\n-\t\treturn V4L2PixelFormat(V4L2_PIX_FMT_IPU3_SRGGB10);\n-\tdefault:\n-\t\treturn {};\n-\t}\n-}\n-\n REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3);\n \n } /* namespace libcamera */\n","prefixes":["libcamera-devel","v2","03/10"]}