android: Set result metadata and EXIF fields based on request metadata
Set the following android result metadata: - ANDROID_LENS_FOCAL_LENGTH - ANDROID_LENS_APERTURE - ANDROID_JPEG_GPS_TIMESTAMP - ANDROID_JPEG_GPS_COORDINATES - ANDROID_JPEG_GPS_PROCESSING_METHOD And the following EXIF fields: - GPSDatestamp - GPSTimestamp - GPSLocation - GPSLatitudeRef - GPSLatitude - GPSLongitudeRef - GPSLongitude - GPSAltitudeRef - GPSAltitude - GPSProcessingMethod - FocalLength - ExposureTime - FNumber - ISO - Flash - WhiteBalance - SubsecTime - SubsecTimeOriginal - SubsecTimeDigitized Based on android request metadata. This allows the following CTS tests to pass: - android.hardware.camera2.cts.StillCaptureTest#testFocalLengths - android.hardware.camera2.cts.StillCaptureTest#testJpegExif Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
parent
229653a59b
commit
abfabdd6e7
6 changed files with 89 additions and 21 deletions
|
@ -708,7 +708,7 @@ std::tuple<uint32_t, uint32_t> CameraDevice::calculateStaticMetadataSize()
|
|||
* Currently: 53 entries, 782 bytes of static metadata
|
||||
*/
|
||||
uint32_t numEntries = 53;
|
||||
uint32_t byteSize = 782;
|
||||
uint32_t byteSize = 802;
|
||||
|
||||
/*
|
||||
* Calculate space occupation in bytes for dynamically built metadata
|
||||
|
@ -1253,6 +1253,8 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
|
|||
ANDROID_CONTROL_VIDEO_STABILIZATION_MODE,
|
||||
ANDROID_FLASH_MODE,
|
||||
ANDROID_FLASH_STATE,
|
||||
ANDROID_LENS_APERTURE,
|
||||
ANDROID_LENS_FOCAL_LENGTH,
|
||||
ANDROID_LENS_STATE,
|
||||
ANDROID_LENS_OPTICAL_STABILIZATION_MODE,
|
||||
ANDROID_SENSOR_TIMESTAMP,
|
||||
|
@ -1264,6 +1266,9 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()
|
|||
ANDROID_NOISE_REDUCTION_MODE,
|
||||
ANDROID_REQUEST_PIPELINE_DEPTH,
|
||||
ANDROID_SCALER_CROP_REGION,
|
||||
ANDROID_JPEG_GPS_COORDINATES,
|
||||
ANDROID_JPEG_GPS_PROCESSING_METHOD,
|
||||
ANDROID_JPEG_GPS_TIMESTAMP,
|
||||
ANDROID_JPEG_SIZE,
|
||||
ANDROID_JPEG_QUALITY,
|
||||
ANDROID_JPEG_ORIENTATION,
|
||||
|
@ -1816,6 +1821,7 @@ void CameraDevice::requestComplete(Request *request)
|
|||
}
|
||||
|
||||
int ret = cameraStream->process(*buffer, &mapped,
|
||||
descriptor->settings_,
|
||||
resultMetadata.get());
|
||||
if (ret) {
|
||||
status = CAMERA3_BUFFER_STATUS_ERROR;
|
||||
|
@ -1912,14 +1918,20 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,
|
|||
|
||||
/*
|
||||
* \todo Keep this in sync with the actual number of entries.
|
||||
* Currently: 33 entries, 75 bytes
|
||||
* Currently: 38 entries, 147 bytes
|
||||
*
|
||||
* Reserve more space for the JPEG metadata set by the post-processor.
|
||||
* Currently: ANDROID_JPEG_SIZE (int32_t), ANDROID_JPEG_QUALITY (byte),
|
||||
* ANDROID_JPEG_ORIENTATION (int32_t) = 3 entries, 9 bytes.
|
||||
* Currently:
|
||||
* ANDROID_JPEG_GPS_COORDINATES (double x 3) = 24 bytes
|
||||
* ANDROID_JPEG_GPS_PROCESSING_METHOD (byte x 32) = 32 bytes
|
||||
* ANDROID_JPEG_GPS_TIMESTAMP (int64) = 8 bytes
|
||||
* ANDROID_JPEG_SIZE (int32_t) = 4 bytes
|
||||
* ANDROID_JPEG_QUALITY (byte) = 1 byte
|
||||
* ANDROID_JPEG_ORIENTATION (int32_t) = 4 bytes
|
||||
* Total bytes for JPEG metadata: 73
|
||||
*/
|
||||
std::unique_ptr<CameraMetadata> resultMetadata =
|
||||
std::make_unique<CameraMetadata>(33, 75);
|
||||
std::make_unique<CameraMetadata>(38, 147);
|
||||
if (!resultMetadata->isValid()) {
|
||||
LOG(HAL, Error) << "Failed to allocate static metadata";
|
||||
return nullptr;
|
||||
|
@ -1984,6 +1996,14 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,
|
|||
value = ANDROID_FLASH_STATE_UNAVAILABLE;
|
||||
resultMetadata->addEntry(ANDROID_FLASH_STATE, &value, 1);
|
||||
|
||||
camera_metadata_ro_entry_t entry;
|
||||
int ret = descriptor->settings_.getEntry(ANDROID_LENS_APERTURE, &entry);
|
||||
if (ret)
|
||||
resultMetadata->addEntry(ANDROID_LENS_APERTURE, entry.data.f, 1);
|
||||
|
||||
float focal_length = 1.0;
|
||||
resultMetadata->addEntry(ANDROID_LENS_FOCAL_LENGTH, &focal_length, 1);
|
||||
|
||||
value = ANDROID_LENS_STATE_STATIONARY;
|
||||
resultMetadata->addEntry(ANDROID_LENS_STATE, &value, 1);
|
||||
|
||||
|
|
|
@ -96,12 +96,15 @@ int CameraStream::configure()
|
|||
}
|
||||
|
||||
int CameraStream::process(const libcamera::FrameBuffer &source,
|
||||
MappedCamera3Buffer *dest, CameraMetadata *metadata)
|
||||
MappedCamera3Buffer *dest,
|
||||
const CameraMetadata &requestMetadata,
|
||||
CameraMetadata *resultMetadata)
|
||||
{
|
||||
if (!postProcessor_)
|
||||
return 0;
|
||||
|
||||
return postProcessor_->process(source, dest->maps()[0], metadata);
|
||||
return postProcessor_->process(source, dest->maps()[0],
|
||||
requestMetadata, resultMetadata);
|
||||
}
|
||||
|
||||
FrameBuffer *CameraStream::getBuffer()
|
||||
|
|
|
@ -119,7 +119,9 @@ public:
|
|||
|
||||
int configure();
|
||||
int process(const libcamera::FrameBuffer &source,
|
||||
MappedCamera3Buffer *dest, CameraMetadata *metadata);
|
||||
MappedCamera3Buffer *dest,
|
||||
const CameraMetadata &requestMetadata,
|
||||
CameraMetadata *resultMetadata);
|
||||
libcamera::FrameBuffer *getBuffer();
|
||||
void putBuffer(libcamera::FrameBuffer *buffer);
|
||||
|
||||
|
|
|
@ -83,17 +83,26 @@ void PostProcessorJpeg::generateThumbnail(const FrameBuffer &source,
|
|||
|
||||
int PostProcessorJpeg::process(const FrameBuffer &source,
|
||||
Span<uint8_t> destination,
|
||||
CameraMetadata *metadata)
|
||||
const CameraMetadata &requestMetadata,
|
||||
CameraMetadata *resultMetadata)
|
||||
{
|
||||
if (!encoder_)
|
||||
return 0;
|
||||
|
||||
camera_metadata_ro_entry_t entry;
|
||||
int ret;
|
||||
|
||||
/* Set EXIF metadata for various tags. */
|
||||
Exif exif;
|
||||
/* \todo Set Make and Model from external vendor tags. */
|
||||
exif.setMake("libcamera");
|
||||
exif.setModel("cameraModel");
|
||||
exif.setOrientation(cameraDevice_->orientation());
|
||||
exif.setMake(cameraDevice_->maker());
|
||||
exif.setModel(cameraDevice_->model());
|
||||
|
||||
ret = requestMetadata.getEntry(ANDROID_JPEG_ORIENTATION, &entry);
|
||||
|
||||
const uint32_t jpegOrientation = ret ? *entry.data.i32 : 0;
|
||||
resultMetadata->addEntry(ANDROID_JPEG_ORIENTATION, &jpegOrientation, 1);
|
||||
exif.setOrientation(jpegOrientation);
|
||||
|
||||
exif.setSize(streamSize_);
|
||||
/*
|
||||
* We set the frame's EXIF timestamp as the time of encode.
|
||||
|
@ -102,6 +111,39 @@ int PostProcessorJpeg::process(const FrameBuffer &source,
|
|||
*/
|
||||
exif.setTimestamp(std::time(nullptr), 0ms);
|
||||
|
||||
/* \todo Get this information from libcamera::Request::metadata */
|
||||
exif.setExposureTime(0);
|
||||
ret = requestMetadata.getEntry(ANDROID_LENS_APERTURE, &entry);
|
||||
if (ret)
|
||||
exif.setAperture(*entry.data.f);
|
||||
exif.setISO(100);
|
||||
exif.setFlash(Exif::Flash::FlashNotPresent);
|
||||
exif.setWhiteBalance(Exif::WhiteBalance::Auto);
|
||||
|
||||
exif.setFocalLength(1.0);
|
||||
|
||||
ret = requestMetadata.getEntry(ANDROID_JPEG_GPS_TIMESTAMP, &entry);
|
||||
if (ret) {
|
||||
exif.setGPSDateTimestamp(*entry.data.i64);
|
||||
resultMetadata->addEntry(ANDROID_JPEG_GPS_TIMESTAMP,
|
||||
entry.data.i64, 1);
|
||||
}
|
||||
|
||||
ret = requestMetadata.getEntry(ANDROID_JPEG_GPS_COORDINATES, &entry);
|
||||
if (ret) {
|
||||
exif.setGPSLocation(entry.data.d);
|
||||
resultMetadata->addEntry(ANDROID_JPEG_GPS_COORDINATES,
|
||||
entry.data.d, 3);
|
||||
}
|
||||
|
||||
ret = requestMetadata.getEntry(ANDROID_JPEG_GPS_PROCESSING_METHOD, &entry);
|
||||
if (ret) {
|
||||
std::string method(entry.data.u8, entry.data.u8 + entry.count);
|
||||
exif.setGPSMethod(method);
|
||||
resultMetadata->addEntry(ANDROID_JPEG_GPS_PROCESSING_METHOD,
|
||||
entry.data.u8, entry.count);
|
||||
}
|
||||
|
||||
std::vector<unsigned char> thumbnail;
|
||||
generateThumbnail(source, &thumbnail);
|
||||
if (!thumbnail.empty())
|
||||
|
@ -136,13 +178,12 @@ int PostProcessorJpeg::process(const FrameBuffer &source,
|
|||
blob->jpeg_size = jpeg_size;
|
||||
|
||||
/* Update the JPEG result Metadata. */
|
||||
metadata->addEntry(ANDROID_JPEG_SIZE, &jpeg_size, 1);
|
||||
resultMetadata->addEntry(ANDROID_JPEG_SIZE, &jpeg_size, 1);
|
||||
|
||||
const uint32_t jpeg_quality = 95;
|
||||
metadata->addEntry(ANDROID_JPEG_QUALITY, &jpeg_quality, 1);
|
||||
|
||||
const uint32_t jpeg_orientation = 0;
|
||||
metadata->addEntry(ANDROID_JPEG_ORIENTATION, &jpeg_orientation, 1);
|
||||
/* \todo Configure JPEG encoder with this */
|
||||
ret = requestMetadata.getEntry(ANDROID_JPEG_QUALITY, &entry);
|
||||
const uint8_t jpegQuality = ret ? *entry.data.u8 : 95;
|
||||
resultMetadata->addEntry(ANDROID_JPEG_QUALITY, &jpegQuality, 1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -26,7 +26,8 @@ public:
|
|||
const libcamera::StreamConfiguration &outcfg) override;
|
||||
int process(const libcamera::FrameBuffer &source,
|
||||
libcamera::Span<uint8_t> destination,
|
||||
CameraMetadata *metadata) override;
|
||||
const CameraMetadata &requestMetadata,
|
||||
CameraMetadata *resultMetadata) override;
|
||||
|
||||
private:
|
||||
void generateThumbnail(const libcamera::FrameBuffer &source,
|
||||
|
|
|
@ -22,7 +22,8 @@ public:
|
|||
const libcamera::StreamConfiguration &outCfg) = 0;
|
||||
virtual int process(const libcamera::FrameBuffer &source,
|
||||
libcamera::Span<uint8_t> destination,
|
||||
CameraMetadata *metadata) = 0;
|
||||
const CameraMetadata &requestMetadata,
|
||||
CameraMetadata *resultMetadata) = 0;
|
||||
};
|
||||
|
||||
#endif /* __ANDROID_POST_PROCESSOR_H__ */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue