{"id":10122,"url":"https://patchwork.libcamera.org/api/1.1/patches/10122/?format=json","web_url":"https://patchwork.libcamera.org/patch/10122/","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":"<20201020074229.119151-2-hiroh@chromium.org>","date":"2020-10-20T07:42:27","name":"[libcamera-devel,v2,2/4] android: Modify Encoder interface","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"ac519bb6bfb69dc743d9994d86d87dad4efe4c65","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/1.1/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10122/mbox/","series":[{"id":1389,"url":"https://patchwork.libcamera.org/api/1.1/series/1389/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1389","date":"2020-10-20T07:42:26","name":"[libcamera-devel,v2,1/4] android: Modify PostProcessor interface","version":2,"mbox":"https://patchwork.libcamera.org/series/1389/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10122/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10122/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id DBD24BDB13\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 20 Oct 2020 07:42:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A391361373;\n\tTue, 20 Oct 2020 09:42:42 +0200 (CEST)","from mail-pl1-x642.google.com (mail-pl1-x642.google.com\n\t[IPv6:2607:f8b0:4864:20::642])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3E6C760353\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 20 Oct 2020 09:42:41 +0200 (CEST)","by mail-pl1-x642.google.com with SMTP id b19so590651pld.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 20 Oct 2020 00:42:41 -0700 (PDT)","from hiroh.tok.corp.google.com\n\t([2401:fa00:8f:2:de4a:3eff:fe7d:f78f])\n\tby smtp.gmail.com with ESMTPSA id\n\td26sm1193684pfo.82.2020.10.20.00.42.37\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 20 Oct 2020 00:42:39 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"TuMte7+Q\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=4GFgfk9SMXWs9mals3D4EQq8xd4Or6Xym7sScIqjpis=;\n\tb=TuMte7+QUDeHCHGfCLp6R7xz0kHdzXy7pHjgq17Xa3tl3mwH+TaMWLzMeZk1WQKIU9\n\turmKvNHuK4a+FqTgX37YpyeN0uefs3YVdlkQLhReyX1lF1WAliUGLPiI6pnyK0RCAE92\n\t0Dfwpa+kJo0TGcmsYzA1Y6uJYsJOFPK5HzMk4=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=4GFgfk9SMXWs9mals3D4EQq8xd4Or6Xym7sScIqjpis=;\n\tb=sCXkLwFXy/P17WzSvEO3nOl1jEf5QFdzZPcI4lnqbrVSq0mGdfIYZI06fUtcxA8nGh\n\tckRicBtDjRVniJBLJcoZz1dGAXj8t40/zfcF+EKYq/3XSWQk7cZxVWqETOJyvImcvD0e\n\tfQ0FdmGmWOiyPMYJo6him1sFUurXjr/4Wqa9/I6J/Mg53v1kHvyXoXjpcXpX2FrxPPdC\n\tJxK48MxudYl+C1uueChsAmwBeb0OPd9v+hWH15DhA4zjOaAtHdyu9NGPm+D4bYb6hK9T\n\tNfpfRYMXHgDE9zJfkiMlKhufmINH351c6KsPMuOCuoYMC4AeQIE0GfNQsTSTO+IdazpI\n\tz0ZQ==","X-Gm-Message-State":"AOAM531QaOFragg/js3b4MyPGPqfO6VaGP7Cdeo1mduDihND13MupStq\n\tq9QshpmFw2VAY9ZIFGjp4VEQF+L0H5YGfA==","X-Google-Smtp-Source":"ABdhPJyEtfXDOoq6rjGlqorfuP/OLIsfzWW6Z4P+ufnkgDEfyUfkCWhK8hf2B3GM9NF1Pr0b+wUy/Q==","X-Received":"by 2002:a17:90b:438c:: with SMTP id\n\tin12mr1750546pjb.32.1603179759542; \n\tTue, 20 Oct 2020 00:42:39 -0700 (PDT)","From":"Hirokazu Honda <hiroh@chromium.org>","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 20 Oct 2020 16:42:27 +0900","Message-Id":"<20201020074229.119151-2-hiroh@chromium.org>","X-Mailer":"git-send-email 2.29.0.rc1.297.gfa9743e501-goog","In-Reply-To":"<20201020074229.119151-1-hiroh@chromium.org>","References":"<20201020074229.119151-1-hiroh@chromium.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 2/4] android: Modify Encoder interface","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"In Encoder::encode(), the |source| argument doesn't have to be a\npointer. This replaces its type, const pointer, with const\nreference as the latter is preferred to the former.\nlibcamera::Span is chea to construct/copy/move. We should deal\nwith the type as pass-by-value parameter. Therefore this also\ndrops the const reference in the |destination| argument.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\n---\n src/android/jpeg/encoder.h               | 4 ++--\n src/android/jpeg/encoder_libjpeg.cpp     | 6 +++---\n src/android/jpeg/encoder_libjpeg.h       | 4 ++--\n src/android/jpeg/post_processor_jpeg.cpp | 2 +-\n 4 files changed, 8 insertions(+), 8 deletions(-)","diff":"diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h\nindex 4483153..4fe71cf 100644\n--- a/src/android/jpeg/encoder.h\n+++ b/src/android/jpeg/encoder.h\n@@ -17,8 +17,8 @@ public:\n \tvirtual ~Encoder() {};\n \n \tvirtual int configure(const libcamera::StreamConfiguration &cfg) = 0;\n-\tvirtual int encode(const libcamera::FrameBuffer *source,\n-\t\t\t   const libcamera::Span<uint8_t> &destination,\n+\tvirtual int encode(const libcamera::FrameBuffer &source,\n+\t\t\t   libcamera::Span<uint8_t> destination,\n \t\t\t   const libcamera::Span<const uint8_t> &exifData) = 0;\n };\n \ndiff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\nindex 8995ba5..4236c9d 100644\n--- a/src/android/jpeg/encoder_libjpeg.cpp\n+++ b/src/android/jpeg/encoder_libjpeg.cpp\n@@ -179,11 +179,11 @@ void EncoderLibJpeg::compressNV(const libcamera::MappedBuffer *frame)\n \t}\n }\n \n-int EncoderLibJpeg::encode(const FrameBuffer *source,\n-\t\t\t   const libcamera::Span<uint8_t> &dest,\n+int EncoderLibJpeg::encode(const FrameBuffer &source,\n+\t\t\t   libcamera::Span<uint8_t> dest,\n \t\t\t   const libcamera::Span<const uint8_t> &exifData)\n {\n-\tMappedFrameBuffer frame(source, PROT_READ);\n+\tMappedFrameBuffer frame(&source, PROT_READ);\n \tif (!frame.isValid()) {\n \t\tLOG(JPEG, Error) << \"Failed to map FrameBuffer : \"\n \t\t\t\t << strerror(frame.error());\ndiff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\nindex 934caef..391a53c 100644\n--- a/src/android/jpeg/encoder_libjpeg.h\n+++ b/src/android/jpeg/encoder_libjpeg.h\n@@ -21,8 +21,8 @@ public:\n \t~EncoderLibJpeg();\n \n \tint configure(const libcamera::StreamConfiguration &cfg) override;\n-\tint encode(const libcamera::FrameBuffer *source,\n-\t\t   const libcamera::Span<uint8_t> &destination,\n+\tint encode(const libcamera::FrameBuffer &source,\n+\t\t   libcamera::Span<uint8_t> destination,\n \t\t   const libcamera::Span<const uint8_t> &exifData) override;\n \n private:\ndiff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\nindex 55b9088..6f33631 100644\n--- a/src/android/jpeg/post_processor_jpeg.cpp\n+++ b/src/android/jpeg/post_processor_jpeg.cpp\n@@ -67,7 +67,7 @@ int PostProcessorJpeg::process(const libcamera::FrameBuffer &source,\n \tif (exif.generate() != 0)\n \t\tLOG(JPEG, Error) << \"Failed to generate valid EXIF data\";\n \n-\tint jpeg_size = encoder_->encode(&source, destination, exif.data());\n+\tint jpeg_size = encoder_->encode(source, destination, exif.data());\n \tif (jpeg_size < 0) {\n \t\tLOG(JPEG, Error) << \"Failed to encode stream image\";\n \t\treturn jpeg_size;\n","prefixes":["libcamera-devel","v2","2/4"]}