Respect exif orientation

Author: HaarigerHarald

omxiv.c

@@ -42,15 +42,16 @@ static const struct option longOpts[] = {
 	{"info", no_argument, 0, 'i'},
 	{"no-keys", no_argument, 0, 'k'},
 	{"soft", no_argument, 0, 's'},
+	{"ignore-exif", no_argument, 0, 0x103},
 	{0, 0, 0, 0}
 };
 
 static ILCLIENT_T *client=NULL;
 static char end = 0;
 
-static char info = 0, blank = 0, soft = 0, keys = 1, center = 0;
+static char info = 0, blank = 0, soft = 0, keys = 1, center = 0, exifOrient = 1, mirror = 0;
 static uint32_t sWidth, sHeight;
-static int initRotation = 0;
+static int initRotation = 0, rotateInc = 90;
 
 static OMX_RENDER render = INIT_OMX_RENDER, render2;
 static OMX_RENDER* pCurRender = &render;
@@ -159,7 +160,8 @@ void printUsage(const char *progr){
 	printf("    -d  --display       n        Display number\n");
 	printf("    -i  --info                   Print some additional infos\n");
 	printf("    -k  --no-keys                Disable keyboard input\n");
-	printf("    -s  --soft                   Force software decoding\n\n");
+	printf("    -s  --soft                   Force software decoding\n");
+	printf("        --ignore-exif            Ignore exif orientation\n\n");
 	printf("KEY CONFIGURATION:\n\n");
 	printf("    ESC, q  :   Quit\n");
 	printf("    LEFT    :   Previous image\n");
@@ -211,7 +213,43 @@ static int renderImage(IMAGE *image, ANIM_IMAGE *anim){
 		}
 	}
 
-	dispConfig.rotation = initRotation;
+	dispConfig.rotation = 0;
+	switch(exifOrient){
+		case 7:
+			dispConfig.rotation += 90;
+		case 4:
+			dispConfig.rotation += 90;
+		case 5:
+			dispConfig.rotation += 90;
+		case 2:
+			dispConfig.rotation += (360 - initRotation);
+			if(mirror == 0){
+				rotateInc = 270;
+				dispConfig.configFlags |= OMX_DISP_CONFIG_FLAG_MIRROR;
+			}else{
+				rotateInc = 90;
+				dispConfig.configFlags &= ~OMX_DISP_CONFIG_FLAG_MIRROR;
+			}
+			break;
+		case 8: 
+			dispConfig.rotation += 90;
+		case 3: 
+			dispConfig.rotation += 90;
+		case 6:
+			dispConfig.rotation += 90;
+		case 1:
+		case 0:
+			dispConfig.rotation += initRotation;
+			if(mirror == 1){
+				rotateInc = 270;
+				dispConfig.configFlags |= OMX_DISP_CONFIG_FLAG_MIRROR;
+			}else{
+				rotateInc = 90;
+				dispConfig.configFlags &= ~OMX_DISP_CONFIG_FLAG_MIRROR;
+			}
+			break;
+	}
+	dispConfig.rotation%=360;
 
 	if(anim->frameCount < 2){
 		ret = omxRenderImage(pCurRender, image);
@@ -238,6 +276,8 @@ static int decodeImage(const char *filePath, IMAGE *image, ANIM_IMAGE *anim){
 	size_t size = 0;
 	char magNum[8];
 
+	exifOrient = (exifOrient == 0) ? 0 : 1;
+	
 	if(strncmp(filePath, "http://", 7) == 0 || strncmp(filePath, "https://", 8) == 0){
 		if(info)
 			printf("Open Url: %s\n", filePath);
@@ -275,6 +315,9 @@ static int decodeImage(const char *filePath, IMAGE *image, ANIM_IMAGE *anim){
 			return ret;
 		}
 
+		if(exifOrient != 0)
+			exifOrient = jInfo.orientation;
+		
 		rewind(imageFile);
 
 		if(soft || jInfo.mode == JPEG_MODE_PROGRESSIVE || jInfo.nColorComponents != 3){
@@ -420,8 +463,7 @@ int main(int argc, char *argv[]){
 				dispConfig.rotation = initRotation;
 				break;
 			case 'm':
-				dispConfig.configFlags |= OMX_DISP_CONFIG_FLAG_MIRROR;
-				break;
+				mirror = 1; break;
 			case 'l':
 				dispConfig.layer = strtol(optarg, NULL, 10);
 				break;
@@ -434,6 +476,8 @@ int main(int argc, char *argv[]){
 				keys = 0; break;
 			case 's':
 				soft = 1; break;
+			case 0x103:
+				exifOrient = 0; break;
 			default:
 				return EXIT_FAILURE;	
 		}
@@ -544,6 +588,7 @@ int main(int argc, char *argv[]){
 		}else if(c == 'm' || c =='M'){
 			tcflush(0, TCIFLUSH);
 			dispConfig.configFlags^= OMX_DISP_CONFIG_FLAG_MIRROR;
+			rotateInc = (rotateInc + 180)%360;
 			ret = setOmxDisplayConfig(pCurRender);
 			if(ret != 0){
 				fprintf(stderr, "dispConfig set returned 0x%x\n", ret);
@@ -556,18 +601,14 @@ int main(int argc, char *argv[]){
 			c = getch(1);
 			tcflush(0, TCIFLUSH);
 			if(c == 0x41){
-				if(dispConfig.rotation>0)
-					dispConfig.rotation-= 90;
-				else
-					dispConfig.rotation=270;
+				dispConfig.rotation = (dispConfig.rotation + 360 -rotateInc)%360;
 				ret = setOmxDisplayConfig(pCurRender);
 				if(ret != 0){
 					fprintf(stderr, "dispConfig set returned 0x%x\n", ret);
 					break;
 				}
 			}else if(c == 0x42){
-				dispConfig.rotation+= 90;
-				dispConfig.rotation%=360;
+				dispConfig.rotation = (dispConfig.rotation + rotateInc)%360;
 				ret = setOmxDisplayConfig(pCurRender);
 				if(ret != 0){
 					fprintf(stderr, "dispConfig set returned 0x%x\n", ret);

soft_image.c

@@ -42,6 +42,8 @@
 #define MIN_FRAME_DELAY_CS 2
 #define BUMP_UP_FRAME_DELAY_CS 10
 
+static const char magExif[] = {0x45, 0x78, 0x69, 0x66, 0x00, 0x00};
+
 struct my_error_mgr {
 	struct jpeg_error_mgr pub;
 	jmp_buf setjmp_buffer;
@@ -73,6 +75,7 @@ int readJpegHeader(FILE *infile, JPEG_INFO *jpegInfo){
 
 	jpeg_create_decompress(&cinfo);
 	jpeg_stdio_src(&cinfo, infile);
+	jpeg_save_markers(&cinfo, JPEG_APP0+1, 0xffff);
 	jpeg_read_header(&cinfo, TRUE);
 
 	if(cinfo.progressive_mode)
@@ -82,6 +85,88 @@ int readJpegHeader(FILE *infile, JPEG_INFO *jpegInfo){
 
 	jpegInfo->nColorComponents = cinfo.num_components;
 
+	
+	// read EXIF orientation
+	// losely base on: http://sylvana.net/jpegcrop/jpegexiforient.c
+	jpegInfo->orientation = 1; // Default
+	jpeg_saved_marker_ptr pMarker = cinfo.marker_list;
+	
+	if(pMarker != NULL && pMarker->data_length >= 20 && 
+		memcmp(pMarker->data, magExif, sizeof(magExif)) == 0) {
+			
+		unsigned int exifLen = pMarker->data_length;
+		uint8_t* exifData = pMarker->data;
+		short motorola;
+		
+		// byte order 
+		if(exifData[6] == 0x49 && exifData[7] == 0x49)
+			motorola = 0;
+		else if(exifData[6] == 0x4D && exifData[7] == 0x4D)
+			motorola = 1;
+		else
+			goto cleanExit;
+
+		if (motorola) {
+			if(exifData[8] != 0 || exifData[9] != 0x2A) 
+				goto cleanExit;
+		} else {
+			if(exifData[9] != 0 || exifData[8] != 0x2A) 
+				goto cleanExit;
+		}
+		
+		unsigned int offset;
+		// read offset to IFD0
+		if(motorola) {
+			if (exifData[10] != 0 || exifData[11] != 0)
+				goto cleanExit;
+			offset = (exifData[12]<<8) + exifData[13] + 6;
+		} else {
+			if (exifData[12] != 0 || exifData[13] != 0)
+				goto cleanExit;
+			offset = (exifData[11]<<8) + exifData[10] + 6;
+		}
+		if(offset > exifLen - 14)
+			goto cleanExit;
+		
+		unsigned int nTags;
+		
+		// read number of tags in IFD0
+		if(motorola)
+			nTags = (exifData[offset]<<8) + exifData[offset+1];
+		else 
+			nTags = (exifData[offset+1]<<8) + exifData[offset];
+
+		offset += 2;
+
+		while(1) {
+			if (nTags-- == 0 || offset > exifLen - 12)
+				goto cleanExit;
+			
+			unsigned int tag;
+			if (motorola)
+				tag = (exifData[offset]<<8) + exifData[offset+1];
+			else 
+				tag = (exifData[offset+1]<<8) + exifData[offset];
+				
+			if (tag == 0x0112) break; // orientation tag found
+			
+			offset += 12;
+		}
+		
+		unsigned char orientation = 9;
+		
+		if (motorola && exifData[offset+8] == 0) {
+			orientation = exifData[offset+9];
+		} else if(exifData[offset+9] == 0) {
+			orientation = exifData[offset+8];
+		}
+		
+		if (orientation <= 8 && orientation != 0)
+			jpegInfo->orientation = orientation;
+	}
+	
+cleanExit:	
+	
 	jpeg_destroy_decompress(&cinfo);
 
 	return SOFT_IMAGE_OK;

soft_image.h

@@ -45,8 +45,9 @@ void destroyAnimIm(ANIM_IMAGE *animIm);
 #define JPEG_MODE_NON_PROGRESSIVE 1
 
 typedef struct JPEG_INFO {
-	int nColorComponents;
-	int mode;
+	int nColorComponents; // number of color components 
+	int mode; // progressive or non progressive 
+	char orientation; // orientation according to exif tag (1..8, default: 1)
 } JPEG_INFO;
 
 int readJpegHeader(FILE *jpegFile, JPEG_INFO *jpegInfo);