AVIF Exif data support

sylikc · Jun 21, 2023 · e1852b2 · e1852b2
1 parent 2ce3887
commit e1852b2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/JPEGView/AVIFWrapper.cpp b/src/JPEGView/AVIFWrapper.cpp
@@ -22,6 +22,7 @@ void* AvifReader::ReadImage(int& width,
 	int frame_index,
 	int& frame_count,
 	int& frame_time,
+	void*& exif_chunk,
 	bool& outOfMemory,
 	const void* buffer,
 	int sizebytes)
@@ -30,6 +31,7 @@ void* AvifReader::ReadImage(int& width,
 	width = height = 0;
 	nchannels = 4;
 	has_animation = false;
+	exif_chunk = NULL;
 
 	avifResult result;
 	int nthreads = 256; // sets maximum number of active threads allowed for libavif, default is 1
@@ -93,9 +95,22 @@ void* AvifReader::ReadImage(int& width,
 	if (cache.transform == NULL)
 		cache.transform = ICCProfileTransform::CreateTransform(icc.data, icc.size, ICCProfileTransform::FORMAT_BGRA);
 	ICCProfileTransform::DoTransform(cache.transform, cache.rgb.pixels, cache.rgb.pixels, width, height);
+
+	avifRWData exif = cache.decoder->image->exif;
+	if (exif.size > 8 && exif.size < 65528 && exif.data != NULL) {
+		exif_chunk = malloc(exif.size + 10);
+		if (exif_chunk != NULL) {
+			memcpy(exif_chunk, "\xFF\xE1\0\0Exif\0\0", 10);
+			*((unsigned short*)exif_chunk + 1) = _byteswap_ushort(exif.size + 8);
+			memcpy((uint8_t*)exif_chunk + 10, exif.data, exif.size);
+		}
+	}
+
+	void* pPixelData = cache.rgb.pixels;
 	if (!has_animation)
 		DeleteCache();
-	return cache.rgb.pixels;
+
+	return pPixelData;
 }
 
 void AvifReader::DeleteCache() {

diff --git a/src/JPEGView/AVIFWrapper.h b/src/JPEGView/AVIFWrapper.h
@@ -14,6 +14,7 @@ class AvifReader
 		int frame_index, // index of frame
 		int& frame_count, // number of frames
 		int& frame_time, // frame duration in milliseconds
+		void*& exif_chunk, // Pointer to Exif data (must be freed by caller)
 		bool& outOfMemory, // set to true when no memory to read image
 		const void* buffer, // memory address containing jxl compressed data.
 		int sizebytes); // size of jxl compressed data

diff --git a/src/JPEGView/ImageLoadThread.cpp b/src/JPEGView/ImageLoadThread.cpp
@@ -860,8 +860,9 @@ void CImageLoadThread::ProcessReadAVIFRequest(CRequest* request) {
 		if (bUseCachedDecoder || (::ReadFile(hFile, pBuffer, nFileSize, (LPDWORD)&nNumBytesRead, NULL) && nNumBytesRead == nFileSize)) {
 			int nWidth, nHeight, nBPP, nFrameCount, nFrameTimeMs;
 			bool bHasAnimation;
+			void* pEXIFData;
 			uint8* pPixelData = (uint8*)AvifReader::ReadImage(nWidth, nHeight, nBPP, bHasAnimation, request->FrameIndex, 
-				nFrameCount, nFrameTimeMs, request->OutOfMemory, pBuffer, nFileSize);
+				nFrameCount, nFrameTimeMs, pEXIFData, request->OutOfMemory, pBuffer, nFileSize);
 			if (pPixelData != NULL) {
 				if (bHasAnimation)
 					m_sLastAvifFileName = sFileName;
@@ -870,7 +871,8 @@ void CImageLoadThread::ProcessReadAVIFRequest(CRequest* request) {
 				for (int i = 0; i < nWidth * nHeight; i++)
 					*pImage32++ = WebpAlphaBlendBackground(*pImage32, CSettingsProvider::This().ColorTransparency());
 
-				request->Image = new CJPEGImage(nWidth, nHeight, pPixelData, NULL, 4, 0, IF_AVIF, bHasAnimation, request->FrameIndex, nFrameCount, nFrameTimeMs);
+				request->Image = new CJPEGImage(nWidth, nHeight, pPixelData, pEXIFData, 4, 0, IF_AVIF, bHasAnimation, request->FrameIndex, nFrameCount, nFrameTimeMs);
+				free(pEXIFData);
 				bSuccess = true;
 			} else {
 				DeleteCachedAvifDecoder();