From 5a92f77ab12f5fed504207ab7d10d682d38a7806 Mon Sep 17 00:00:00 2001 From: Alex Ray Date: Mon, 27 Aug 2012 17:23:41 -0700 Subject: [PATCH] STOPSHIP libcamera2: remove device metadata Change-Id: I358b77b8a18d8a7dc76823b905a0930df845f743 Signed-off-by: Alex Ray --- libcamera2/ExynosCameraHWInterface2.cpp | 2 ++ libcamera2/ExynosJpegEncoderForCamera.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp index 5cc6c69..8d7828e 100644 --- a/libcamera2/ExynosCameraHWInterface2.cpp +++ b/libcamera2/ExynosCameraHWInterface2.cpp @@ -3853,6 +3853,7 @@ void ExynosCameraHWInterface2::m_setExifFixedAttribute(void) char property[PROPERTY_VALUE_MAX]; //2 0th IFD TIFF Tags +#if 0 // STOPSHIP TODO(aray): remove before launch, but for now don't leak product data //3 Maker property_get("ro.product.brand", property, EXIF_DEF_MAKER); strncpy((char *)mExifInfo.maker, property, @@ -3868,6 +3869,7 @@ void ExynosCameraHWInterface2::m_setExifFixedAttribute(void) strncpy((char *)mExifInfo.software, property, sizeof(mExifInfo.software) - 1); mExifInfo.software[sizeof(mExifInfo.software) - 1] = '\0'; +#endif //3 YCbCr Positioning mExifInfo.ycbcr_positioning = EXIF_DEF_YCBCR_POSITIONING; diff --git a/libcamera2/ExynosJpegEncoderForCamera.cpp b/libcamera2/ExynosJpegEncoderForCamera.cpp index 2d96528..8eb31a5 100644 --- a/libcamera2/ExynosJpegEncoderForCamera.cpp +++ b/libcamera2/ExynosJpegEncoderForCamera.cpp @@ -350,6 +350,7 @@ int ExynosJpegEncoderForCamera::makeExif (unsigned char *exifOut, 1, exifInfo->width); writeExifIfd(&pCur, EXIF_TAG_IMAGE_HEIGHT, EXIF_TYPE_LONG, 1, exifInfo->height); +#if 0 // STOPSHIP TODO(aray): remove before launch, but don't leak product data writeExifIfd(&pCur, EXIF_TAG_MAKE, EXIF_TYPE_ASCII, strlen((char *)exifInfo->maker) + 1, exifInfo->maker, &LongerTagOffest, pIfdStart); writeExifIfd(&pCur, EXIF_TAG_MODEL, EXIF_TYPE_ASCII, @@ -358,6 +359,7 @@ int ExynosJpegEncoderForCamera::makeExif (unsigned char *exifOut, 1, exifInfo->orientation); 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, @@ -1009,4 +1011,3 @@ void ExynosJpegEncoderForCamera::initJpegMemory(struct stJpegMem *pstMem, int iM } pstMem->ionClient = 0; } - -- 2.20.1