Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-19 02:15:05 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

android: jpeg: encoder_libjpeg: Allow encoding raw frame bytes

Browse source 
Allow encoding frames 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 <email@uajain.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Umang Jain 2020-10-28 02:54:45 +05:30 • committed by Kieran Bingham
parent c1ae9055f9
commit 25202dbb7e
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/android/jpeg/encoder_libjpeg.cpp
View file

@ -104,9 +104,9 @@ int EncoderLibJpeg::configure(const StreamConfiguration &cfg)
return 0; return 0;
} }
void EncoderLibJpeg::compressRGB(const MappedBuffer *frame) void EncoderLibJpeg::compressRGB(Span<const uint8_t> frame)
{ {
unsigned char *src = static_cast<unsigned char *>(frame->maps()[0].data()); unsigned char *src = const_cast<unsigned char *>(frame.data());
/* \todo Stride information should come from buffer configuration. */ /* \todo Stride information should come from buffer configuration. */
unsigned int stride = pixelFormatInfo_->stride(compress_.image_width, 0); unsigned int stride = pixelFormatInfo_->stride(compress_.image_width, 0);
@ -122,7 +122,7 @@ void EncoderLibJpeg::compressRGB(const MappedBuffer *frame)
* Compress the incoming buffer from a supported NV format. * Compress the incoming buffer from a supported NV format.
* This naively unpacks the semi-planar NV12 to a YUV888 format for libjpeg. * This naively unpacks the semi-planar NV12 to a YUV888 format for libjpeg.
*/ */
void EncoderLibJpeg::compressNV(const MappedBuffer *frame) void EncoderLibJpeg::compressNV(Span<const uint8_t> frame)
{ {
uint8_t tmprowbuf[compress_.image_width * 3]; uint8_t tmprowbuf[compress_.image_width * 3];
@ -144,7 +144,7 @@ void EncoderLibJpeg::compressNV(const MappedBuffer *frame)
unsigned int cb_pos = nvSwap_ ? 1 : 0; unsigned int cb_pos = nvSwap_ ? 1 : 0;
unsigned int cr_pos = nvSwap_ ? 0 : 1; unsigned int cr_pos = nvSwap_ ? 0 : 1;
const unsigned char *src = static_cast<unsigned char *>(frame->maps()[0].data()); const unsigned char *src = frame.data();
const unsigned char *src_c = src + y_stride * compress_.image_height; const unsigned char *src_c = src + y_stride * compress_.image_height;
JSAMPROW row_pointer[1]; JSAMPROW row_pointer[1];
@ -189,6 +189,12 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span<uint8_t> dest,
return frame.error(); return frame.error();
} }
return encode(frame.maps()[0], dest, exifData);
}
int EncoderLibJpeg::encode(Span<const uint8_t> src, Span<uint8_t> dest,
Span<const uint8_t> exifData)
{
unsigned char *destination = dest.data(); unsigned char *destination = dest.data();
unsigned long size = dest.size(); unsigned long size = dest.size();
@ -214,9 +220,9 @@ int EncoderLibJpeg::encode(const FrameBuffer &source, Span<uint8_t> dest,
<< "x" << compress_.image_height; << "x" << compress_.image_height;
if (nv_) if (nv_)
compressNV(&frame); compressNV(src);
else else
compressRGB(&frame); compressRGB(src);
jpeg_finish_compress(&compress_); jpeg_finish_compress(&compress_);

7
src/android/jpeg/encoder_libjpeg.h
View file

@ -24,10 +24,13 @@ public:
int encode(const libcamera::FrameBuffer &source, int encode(const libcamera::FrameBuffer &source,
libcamera::Span<uint8_t> destination, libcamera::Span<uint8_t> destination,
libcamera::Span<const uint8_t> exifData) override; libcamera::Span<const uint8_t> exifData) override;
int encode(libcamera::Span<const uint8_t> source,
libcamera::Span<uint8_t> destination,
libcamera::Span<const uint8_t> exifData);
private: private:
void compressRGB(const libcamera::MappedBuffer *frame); void compressRGB(libcamera::Span<const uint8_t> frame);
void compressNV(const libcamera::MappedBuffer *frame); void compressNV(libcamera::Span<const uint8_t> frame);
struct jpeg_compress_struct compress_; struct jpeg_compress_struct compress_;
struct jpeg_error_mgr jerr_; struct jpeg_error_mgr jerr_;