summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-08-06 14:30:30 +0200
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-10-02 15:04:41 +0200
commit68c55b49c4035d38981fe9540da90d9205015f0f (patch)
treef8c7f6bfaeabddb5cf113c9986ce928c7421bb36
parent78fcf8e17c84c79385af1b0943b83bef9327b355 (diff)
qcam: dng_writer: Record camera model
Record the model property of the camera if available. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Umang Jain <email@uajain.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/qcam/dng_writer.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp
index 030d1387..34c8df5a 100644
--- a/src/qcam/dng_writer.cpp
+++ b/src/qcam/dng_writer.cpp
@@ -15,6 +15,7 @@
#include <libcamera/control_ids.h>
#include <libcamera/formats.h>
+#include <libcamera/property_ids.h>
using namespace libcamera;
@@ -353,6 +354,8 @@ int DNGWriter::write(const char *filename, const Camera *camera,
[[maybe_unused]] const FrameBuffer *buffer,
const void *data)
{
+ const ControlList &cameraProperties = camera->properties();
+
const auto it = formatInfo.find(config.pixelFormat);
if (it == formatInfo.cend()) {
std::cerr << "Unsupported pixel format" << std::endl;
@@ -387,9 +390,13 @@ int DNGWriter::write(const char *filename, const Camera *camera,
TIFFSetField(tif, TIFFTAG_DNGBACKWARDVERSION, version);
TIFFSetField(tif, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB);
TIFFSetField(tif, TIFFTAG_MAKE, "libcamera");
- /* \todo Report a real model string instead of id. */
- TIFFSetField(tif, TIFFTAG_MODEL, camera->id().c_str());
- TIFFSetField(tif, TIFFTAG_UNIQUECAMERAMODEL, camera->id().c_str());
+
+ if (cameraProperties.contains(properties::Model)) {
+ std::string model = cameraProperties.get(properties::Model);
+ TIFFSetField(tif, TIFFTAG_MODEL, model.c_str());
+ /* \todo set TIFFTAG_UNIQUECAMERAMODEL. */
+ }
+
TIFFSetField(tif, TIFFTAG_SOFTWARE, "qcam");
TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT);