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

android: jpeg: post_processor: Use the new metadata functions

Browse source 
Now that CameraMetadata supports more convenient functions, use those
instead.

Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Paul Elder 2021-05-11 19:33:14 +09:00
parent 0bc6ce8f67
commit 193ca8c353
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/android/jpeg/post_processor_jpeg.cpp
View file

@ -103,7 +103,7 @@ int PostProcessorJpeg::process(const FrameBuffer &source,
ret = requestMetadata.getEntry(ANDROID_JPEG_ORIENTATION, &entry); ret = requestMetadata.getEntry(ANDROID_JPEG_ORIENTATION, &entry);
const uint32_t jpegOrientation = ret ? *entry.data.i32 : 0; const uint32_t jpegOrientation = ret ? *entry.data.i32 : 0;
resultMetadata->addEntry(ANDROID_JPEG_ORIENTATION, &jpegOrientation, 1); resultMetadata->addEntry(ANDROID_JPEG_ORIENTATION, jpegOrientation);
exif.setOrientation(jpegOrientation); exif.setOrientation(jpegOrientation);
exif.setSize(streamSize_); exif.setSize(streamSize_);
@ -129,7 +129,7 @@ int PostProcessorJpeg::process(const FrameBuffer &source,
if (ret) { if (ret) {
exif.setGPSDateTimestamp(*entry.data.i64); exif.setGPSDateTimestamp(*entry.data.i64);
resultMetadata->addEntry(ANDROID_JPEG_GPS_TIMESTAMP, resultMetadata->addEntry(ANDROID_JPEG_GPS_TIMESTAMP,
entry.data.i64, 1); *entry.data.i64);
} }
ret = requestMetadata.getEntry(ANDROID_JPEG_THUMBNAIL_SIZE, &entry); ret = requestMetadata.getEntry(ANDROID_JPEG_THUMBNAIL_SIZE, &entry);
@ -140,7 +140,7 @@ int PostProcessorJpeg::process(const FrameBuffer &source,
ret = requestMetadata.getEntry(ANDROID_JPEG_THUMBNAIL_QUALITY, &entry); ret = requestMetadata.getEntry(ANDROID_JPEG_THUMBNAIL_QUALITY, &entry);
uint8_t quality = ret ? *entry.data.u8 : 95; uint8_t quality = ret ? *entry.data.u8 : 95;
resultMetadata->addEntry(ANDROID_JPEG_THUMBNAIL_QUALITY, &quality, 1); resultMetadata->addEntry(ANDROID_JPEG_THUMBNAIL_QUALITY, quality);
if (thumbnailSize != Size(0, 0)) { if (thumbnailSize != Size(0, 0)) {
std::vector<unsigned char> thumbnail; std::vector<unsigned char> thumbnail;
@ -172,7 +172,7 @@ int PostProcessorJpeg::process(const FrameBuffer &source,
ret = requestMetadata.getEntry(ANDROID_JPEG_QUALITY, &entry); ret = requestMetadata.getEntry(ANDROID_JPEG_QUALITY, &entry);
const uint8_t quality = ret ? *entry.data.u8 : 95; const uint8_t quality = ret ? *entry.data.u8 : 95;
resultMetadata->addEntry(ANDROID_JPEG_QUALITY, &quality, 1); resultMetadata->addEntry(ANDROID_JPEG_QUALITY, quality);
int jpeg_size = encoder_->encode(source, destination->plane(0), int jpeg_size = encoder_->encode(source, destination->plane(0),
exif.data(), quality); exif.data(), quality);
@ -190,7 +190,7 @@ int PostProcessorJpeg::process(const FrameBuffer &source,
blob->jpeg_size = jpeg_size; blob->jpeg_size = jpeg_size;
/* Update the JPEG result Metadata. */ /* Update the JPEG result Metadata. */
resultMetadata->addEntry(ANDROID_JPEG_SIZE, &jpeg_size, 1); resultMetadata->addEntry(ANDROID_JPEG_SIZE, jpeg_size);
return 0; return 0;
} }