From patchwork Wed Oct 21 08:08:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 10158 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 12DD1C3D3C for ; Wed, 21 Oct 2020 08:08:20 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D3A32610B6; Wed, 21 Oct 2020 10:08:19 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=uajain.com header.i=@uajain.com header.b="taApur+1"; dkim-atps=neutral Received: from mail.uajain.com (static.126.159.217.95.clients.your-server.de [95.217.159.126]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1DF2A610B6 for ; Wed, 21 Oct 2020 10:08:18 +0200 (CEST) From: Umang Jain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=uajain.com; s=mail; t=1603267697; bh=X7zxhOa5JXahgqrLkw2Bdm3RCeCrIrqS6RA00dk0QZI=; h=From:To:Cc:Subject:In-Reply-To:References; b=taApur+1qN+Bk4F31gIk3NiIkoJQeYAKIkR308z3yByEO3t1pdTAFuLrHYWKVKyoc rlYmcERr8Riz5DH2+IWC8SnWnoFE/xQk6HxEWlVuG5cKVDWYAhzTGWSzuiQW4Ouas8 ug+L6QgABF6E5/w4hPp5r2Du0Rx2vYqKlt4UMxhb6GcAD6daUaa8gaHsCgZCukfoid 1sxf3q6L3nJSy6EkWM2opGyA3XdzXxwehIoxSPC848r1pa+KFP7hEaPo2l3HpRqpZI dhLeXn1Of3UG3Nmu0LbEiAcYUa9E7g9QY19A65fgO8xT7caN6O7bPVdLhSrkRVsVTQ KZYcujSAkAj+A== To: libcamera-devel@lists.libcamera.org Date: Wed, 21 Oct 2020 13:38:05 +0530 Message-Id: <20201021080806.46636-2-email@uajain.com> In-Reply-To: <20201021080806.46636-1-email@uajain.com> References: <20201021080806.46636-1-email@uajain.com> Mime-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 1/2] android: jpeg: encoder_libjpeg Allow encoding raw frame bytes X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Allow encoding frame which are directly handed over to the encoder via a span or vector i.e. a raw frame bytes. Introduce an overloaded EncoderLibJpeg::encode() with libcamera::Span source parameter to achieve this functionality. This makes the libjpeg-encoder a bit flexible for use case such as compressing a thumbnail generated for Exif. Signed-off-by: Umang Jain Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/android/jpeg/encoder_libjpeg.cpp | 37 +++++++++++++++++----------- src/android/jpeg/encoder_libjpeg.h | 7 ++++-- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp index f11e004..bfaf9d5 100644 --- a/src/android/jpeg/encoder_libjpeg.cpp +++ b/src/android/jpeg/encoder_libjpeg.cpp @@ -104,9 +104,9 @@ int EncoderLibJpeg::configure(const StreamConfiguration &cfg) return 0; } -void EncoderLibJpeg::compressRGB(const libcamera::MappedBuffer *frame) +void EncoderLibJpeg::compressRGB(const libcamera::Span &frame) { - unsigned char *src = static_cast(frame->maps()[0].data()); + unsigned char *src = static_cast(frame.data()); /* \todo Stride information should come from buffer configuration. */ unsigned int stride = pixelFormatInfo_->stride(compress_.image_width, 0); @@ -122,7 +122,7 @@ void EncoderLibJpeg::compressRGB(const libcamera::MappedBuffer *frame) * Compress the incoming buffer from a supported NV format. * This naively unpacks the semi-planar NV12 to a YUV888 format for libjpeg. */ -void EncoderLibJpeg::compressNV(const libcamera::MappedBuffer *frame) +void EncoderLibJpeg::compressNV(const libcamera::Span &frame) { uint8_t tmprowbuf[compress_.image_width * 3]; @@ -144,7 +144,7 @@ void EncoderLibJpeg::compressNV(const libcamera::MappedBuffer *frame) unsigned int cb_pos = nvSwap_ ? 1 : 0; unsigned int cr_pos = nvSwap_ ? 0 : 1; - const unsigned char *src = static_cast(frame->maps()[0].data()); + const unsigned char *src = static_cast(frame.data()); const unsigned char *src_c = src + y_stride * compress_.image_height; JSAMPROW row_pointer[1]; @@ -179,17 +179,10 @@ void EncoderLibJpeg::compressNV(const libcamera::MappedBuffer *frame) } } -int EncoderLibJpeg::encode(const FrameBuffer *source, +int EncoderLibJpeg::encode(const libcamera::Span &frame, const libcamera::Span &dest, const libcamera::Span &exifData) { - MappedFrameBuffer frame(source, PROT_READ); - if (!frame.isValid()) { - LOG(JPEG, Error) << "Failed to map FrameBuffer : " - << strerror(frame.error()); - return frame.error(); - } - unsigned char *destination = dest.data(); unsigned long size = dest.size(); @@ -215,11 +208,27 @@ int EncoderLibJpeg::encode(const FrameBuffer *source, << "x" << compress_.image_height; if (nv_) - compressNV(&frame); + compressNV(frame); else - compressRGB(&frame); + compressRGB(frame); jpeg_finish_compress(&compress_); return size; } + +int EncoderLibJpeg::encode(const FrameBuffer *source, + const libcamera::Span &dest, + const libcamera::Span &exifData) +{ + MappedFrameBuffer frame(source, PROT_READ); + if (!frame.isValid()) { + LOG(JPEG, Error) << "Failed to map FrameBuffer : " + << strerror(frame.error()); + return frame.error(); + } + + libcamera::Span src = frame.maps()[0]; + + return encode(src, dest, exifData); +} diff --git a/src/android/jpeg/encoder_libjpeg.h b/src/android/jpeg/encoder_libjpeg.h index 934caef..bf2e512 100644 --- a/src/android/jpeg/encoder_libjpeg.h +++ b/src/android/jpeg/encoder_libjpeg.h @@ -21,13 +21,16 @@ public: ~EncoderLibJpeg(); int configure(const libcamera::StreamConfiguration &cfg) override; + int encode(const libcamera::Span &frames, + const libcamera::Span &destination, + const libcamera::Span &exifData); int encode(const libcamera::FrameBuffer *source, const libcamera::Span &destination, const libcamera::Span &exifData) override; private: - void compressRGB(const libcamera::MappedBuffer *frame); - void compressNV(const libcamera::MappedBuffer *frame); + void compressRGB(const libcamera::Span &frame); + void compressNV(const libcamera::Span &frame); struct jpeg_compress_struct compress_; struct jpeg_error_mgr jerr_;