{"id":10254,"url":"https://patchwork.libcamera.org/api/1.1/patches/10254/?format=json","web_url":"https://patchwork.libcamera.org/patch/10254/","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":"<20201026140134.44166-3-email@uajain.com>","date":"2020-10-26T14:01:33","name":"[libcamera-devel,2/3] android: jpeg: encoder_libjpeg: Allow encoding raw frame bytes","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"5fd2519674429a1bb0f0bed123a70c689b28b762","submitter":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/people/1/?format=json","name":"Umang Jain","email":"email@uajain.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10254/mbox/","series":[{"id":1416,"url":"https://patchwork.libcamera.org/api/1.1/series/1416/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1416","date":"2020-10-26T14:01:31","name":"android: jpeg: exif: Embed a JPEG-encoded thumbnail","version":1,"mbox":"https://patchwork.libcamera.org/series/1416/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10254/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10254/checks/","tags":{},"headers":{"Return-Path":"","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 CF2C6BDB13\n\tfor ;\n\tMon, 26 Oct 2020 14:02:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 96D2161E50;\n\tMon, 26 Oct 2020 15:02:39 +0100 (CET)","from mail.uajain.com (static.126.159.217.95.clients.your-server.de\n\t[95.217.159.126])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6504E6034E\n\tfor ;\n\tMon, 26 Oct 2020 15:02:38 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=uajain.com header.i=@uajain.com\n\theader.b=\"h8/TPxOg\"; dkim-atps=neutral","From":"Umang Jain ","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=uajain.com; s=mail;\n\tt=1603720957; bh=OWHnUO+fVmcAjoWBuc1ZR6piPQ4tHonEuPj8jGNDWFs=;\n\th=From:To:Cc:Subject:In-Reply-To:References;\n\tb=h8/TPxOgwSKeV6lmbOIMit8V6kdzwUnIakDClGIWqk2V4ODsTvXMNMWXO+OC4vCmS\n\tbgo4LN5aUxRFuTyX/zmu54XC6TCgqYp82+iG658tgyxztv4WAFqcIjIha2t8qmDyY8\n\tjHGBt3KF4EEV5+lsHAGdqzDq+COJPe698scYb5TucJDd7FXcyiHT3xdZiYasoANt8O\n\tKiI8YaQcYDHak7sjcLo6VHt7yBsqpZ0IvSRYLqv/COjU4yG81JcODzhjicC5sZFePB\n\tqU/s6lDf0zCjfPaQ4NsQTrTZfR9AXhWXzS/YAiFsGjZj1ARCUHRmoySkSozROO/F6Z\n\tCdpxPhlcfs93Q==","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 26 Oct 2020 19:31:33 +0530","Message-Id":"<20201026140134.44166-3-email@uajain.com>","In-Reply-To":"<20201026140134.44166-1-email@uajain.com>","References":"<20201026140134.44166-1-email@uajain.com>","Mime-Version":"1.0","Subject":"[libcamera-devel] [PATCH 2/3] android: jpeg: encoder_libjpeg: Allow\n\tencoding raw frame bytes","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Allow encoding frames which are directly handed over to the encoder\nvia a span or vector i.e. a raw frame bytes. Introduce an overloaded\nEncoderLibJpeg::encode() with libcamera::Span source parameter to\nachieve this functionality. This makes the libjpeg-encoder a bit\nflexible for use case such as compressing a thumbnail generated for\nExif.\n\nSigned-off-by: Umang Jain \n---\n src/android/jpeg/encoder_libjpeg.cpp | 18 ++++++++++++------\n src/android/jpeg/encoder_libjpeg.h | 7 +++++--\n 2 files changed, 17 insertions(+), 8 deletions(-)","diff":"diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp\nindex cfa5332..129ca27 100644\n--- a/src/android/jpeg/encoder_libjpeg.cpp\n+++ b/src/android/jpeg/encoder_libjpeg.cpp\n@@ -104,9 +104,9 @@ int EncoderLibJpeg::configure(const StreamConfiguration &cfg)\n \treturn 0;\n }\n \n-void EncoderLibJpeg::compressRGB(const MappedBuffer *frame)\n+void EncoderLibJpeg::compressRGB(Span frame)\n {\n-\tunsigned char *src = static_cast(frame->maps()[0].data());\n+\tunsigned char *src = frame.data();\n \t/* \\todo Stride information should come from buffer configuration. */\n \tunsigned int stride = pixelFormatInfo_->stride(compress_.image_width, 0);\n \n@@ -122,7 +122,7 @@ void EncoderLibJpeg::compressRGB(const MappedBuffer *frame)\n * Compress the incoming buffer from a supported NV format.\n * This naively unpacks the semi-planar NV12 to a YUV888 format for libjpeg.\n */\n-void EncoderLibJpeg::compressNV(const MappedBuffer *frame)\n+void EncoderLibJpeg::compressNV(Span frame)\n {\n \tuint8_t tmprowbuf[compress_.image_width * 3];\n \n@@ -144,7 +144,7 @@ void EncoderLibJpeg::compressNV(const MappedBuffer *frame)\n \tunsigned int cb_pos = nvSwap_ ? 1 : 0;\n \tunsigned int cr_pos = nvSwap_ ? 0 : 1;\n \n-\tconst unsigned char *src = static_cast(frame->maps()[0].data());\n+\tconst unsigned char *src = frame.data();\n \tconst unsigned char *src_c = src + y_stride * compress_.image_height;\n \n \tJSAMPROW row_pointer[1];\n@@ -189,6 +189,12 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span dest,\n \t\treturn frame.error();\n \t}\n \n+\treturn encode(frame.maps()[0], dest, exifData);\n+}\n+\n+int EncoderLibJpeg::encode(Span src, Span dest,\n+\t\t\t Span exifData)\n+{\n \tunsigned char *destination = dest.data();\n \tunsigned long size = dest.size();\n \n@@ -214,9 +220,9 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span dest,\n \t\t\t << \"x\" << compress_.image_height;\n \n \tif (nv_)\n-\t\tcompressNV(&frame);\n+\t\tcompressNV(src);\n \telse\n-\t\tcompressRGB(&frame);\n+\t\tcompressRGB(src);\n \n \tjpeg_finish_compress(&compress_);\n \ndiff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h\nindex 40505dd..06f884b 100644\n--- a/src/android/jpeg/encoder_libjpeg.h\n+++ b/src/android/jpeg/encoder_libjpeg.h\n@@ -24,10 +24,13 @@ public:\n \tint encode(const libcamera::FrameBuffer &source,\n \t\t libcamera::Span destination,\n \t\t libcamera::Span exifData) override;\n+\tint encode(libcamera::Span source,\n+\t\t libcamera::Span destination,\n+\t\t libcamera::Span exifData);\n \n private:\n-\tvoid compressRGB(const libcamera::MappedBuffer *frame);\n-\tvoid compressNV(const libcamera::MappedBuffer *frame);\n+\tvoid compressRGB(libcamera::Span frame);\n+\tvoid compressNV(libcamera::Span frame);\n \n \tstruct jpeg_compress_struct compress_;\n \tstruct jpeg_error_mgr jerr_;\n","prefixes":["libcamera-devel","2/3"]}