Revert "STOPSHIP libcamera2: remove device metadata"

This reverts commit 6c7b0add3629c0fae49a947e2639892c7cf1b074.

Bug: 7065917
Change-Id: I3685b40708bf17eed1a62ac90ae91ff564667c4e

diff --git a/libcamera2/ExynosJpegEncoderForCamera.cpp b/libcamera2/ExynosJpegEncoderForCamera.cpp
index 62d913f18468d472679d52db923167d270929d46..45249421e19eacfa6a445afae20d7dd03434b5ad 100644 (file)
--- a/libcamera2/ExynosJpegEncoderForCamera.cpp
+++ b/libcamera2/ExynosJpegEncoderForCamera.cpp
@@ -341,9 +341,6 @@ int ExynosJpegEncoderForCamera::makeExif (unsigned char *exifOut,
         tmp = NUM_0TH_IFD_TIFF;
     else
         tmp = NUM_0TH_IFD_TIFF - 1;
-    // STOPSHIP TODO(aray): remove before launch, takes fields below out of exif
-    tmp -= 4;
-    // end TODO(aray)
 
     memcpy(pCur, &tmp, NUM_SIZE);
     pCur += NUM_SIZE;
@@ -364,7 +361,6 @@ int ExynosJpegEncoderForCamera::makeExif (unsigned char *exifOut,
     writeExifIfd(&pCur, EXIF_TAG_SOFTWARE, EXIF_TYPE_ASCII,
                  strlen((char *)exifInfo->software) + 1, exifInfo->software, &LongerTagOffest, pIfdStart);
 #endif
-
     writeExifIfd(&pCur, EXIF_TAG_DATE_TIME, EXIF_TYPE_ASCII,
                  20, exifInfo->date_time, &LongerTagOffest, pIfdStart);
     writeExifIfd(&pCur, EXIF_TAG_YCBCR_POSITIONING, EXIF_TYPE_SHORT,