Add bmp support via libnsbmp

Author: HaarigerHarald

Diff for: .gitignore

@@ -36,6 +36,7 @@
 *.jpeg
 *.jpg
 *.png
+*.bmp
 
 # ilclient
 /libs

Diff for: Makefile

@@ -1,6 +1,7 @@
-OBJS=omxiv.o OmxImage.o OmxRender.o SoftImage.o
+OBJS=omxiv.o OmxImage.o OmxRender.o SoftImage.o ./libnsbmp/libnsbmp.o
 BIN=omxiv.bin
 LDFLAGS+=-lilclient -ljpeg -lpng
+INCLUDES+=-I./libnsbmp -I./libs/ilclient
 
 BUILDVERSION=$(shell git rev-parse --short=10 HEAD 2>/dev/null;test $$? -gt 0 && echo UNKNOWN)
 CFLAGS+=-DVERSION=${BUILDVERSION}
@@ -13,7 +14,7 @@ $(BIN): $(OBJS)
 ilclient:
 	mkdir libs
 	cp -r /opt/vc/src/hello_pi/libs/ilclient libs
-	cd libs/ilclient; make
+	make -C libs/ilclient
 
 install:
 	cp $(BIN) /usr/bin/omxiv

Diff for: Makefile.include

@@ -1,9 +1,9 @@
 
-CFLAGS+=-DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -Wall -pipe -DHAVE_LIBOPENMAX=2 -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DHAVE_LIBBCM_HOST -DUSE_EXTERNAL_LIBBCM_HOST -DUSE_VCHIQ_ARM -DTARGET_RASPBERRY_PI -Wno-psabi
+CFLAGS+=-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -Wall -pipe -DHAVE_LIBOPENMAX=2 -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DHAVE_LIBBCM_HOST -DUSE_EXTERNAL_LIBBCM_HOST -DUSE_VCHIQ_ARM -DTARGET_RASPBERRY_PI -Wno-psabi
 
-LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -L./libs/ilclient
+LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lopenmaxil -lbcm_host -lvcos -lpthread -L./libs/ilclient
 
-INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./libs/ilclient
+INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux
 
 all: $(BIN) $(LIB)
 

Diff for: SoftImage.c

@@ -5,6 +5,7 @@
 #include <png.h>
 
 #include "SoftImage.h"
+#include "libnsbmp/libnsbmp.h"
 
 struct my_error_mgr {
 	struct jpeg_error_mgr pub;
@@ -262,4 +263,118 @@ int softDecodePng(char* filePath, IMAGE* png){
 	return SOFT_PNG_OK;
 }
 
+#define BYTES_PER_PIXEL 4
+
+// BMP
+
+static void *bitmap_create(int width, int height, unsigned int state){
+	return malloc(width * height * BYTES_PER_PIXEL);
+}
+
+
+static unsigned char *bitmap_get_buffer(void *bitmap){
+	return bitmap;
+}
+
+
+static size_t bitmap_get_bpp(void *bitmap){
+	return BYTES_PER_PIXEL;
+}
+
+int softDecodeBMP(char* filePath, IMAGE* bmpImage){
+	bmp_bitmap_callback_vt bitmap_callbacks = {
+		bitmap_create,
+		NULL,
+		bitmap_get_buffer,
+		bitmap_get_bpp
+	};
+	bmp_result code;
+	bmp_image bmp;
+	short ret = 0;
+
+	bmp_create(&bmp, &bitmap_callbacks);
+	
+	FILE *fp;
+	size_t size;
+	unsigned char *data;
+
+	fp = fopen(filePath, "rb");
+	if (!fp) {
+		return SOFT_IMAGE_ERROR_FILE_OPEN;
+	}
+	fseek(fp, 0L, SEEK_END);
+	size = ftell(fp);
+	fseek(fp, 0L, SEEK_SET);
+
+	data = malloc(size);
+	if (!data) {
+		fclose(fp);
+		return SOFT_BMP_ERROR_MEMORY;
+	}
+
+	if (fread(data, 1, size, fp) != size) {
+		fclose(fp);
+		return SOFT_BMP_ERROR_MEMORY;
+	}
+
+	fclose(fp);
+
+	code = bmp_analyse(&bmp, size, data);
+	if (code != BMP_OK) {
+		ret = SOFT_BMP_ERROR_ANALYSING;
+		goto cleanup;
+	}
+
+	code = bmp_decode(&bmp);
+	if (code != BMP_OK) {
+		ret = SOFT_BMP_ERROR_DECODING;
+		goto cleanup;
+	}
+	
+	char* bmpData = bmp.bitmap;
+	int bmpWidth = bmp.width;
+	
+	bmpImage->height = bmp.height;
+	bmpImage->colorSpace = COLOR_SPACE_RGBA;
+		
+	bmp_finalise(&bmp);
+	free(data);
+	
+	/* Width needs to be a multiple of 16, otherwise
+	 * resize and render component will bug. We
+	 * add some transparent pixels left and right. */
+	int wPixelAd = bmpWidth%16;
+	if(wPixelAd != 0)
+		wPixelAd=16-wPixelAd;	
+	bmpImage->width=bmpWidth+wPixelAd;
+	int wPixelAdL= wPixelAd/2;
+	int wPixelAdR = wPixelAd/2+wPixelAd%2;
+	wPixelAdL*=BYTES_PER_PIXEL;
+	wPixelAdR*=BYTES_PER_PIXEL;
+	wPixelAd*=BYTES_PER_PIXEL;
+	
+	bmpImage->nData = bmpImage->width* bmpImage->height* BYTES_PER_PIXEL;
+	bmpImage->pData = malloc(bmpImage->nData);
+	if(!bmpImage->pData){
+		free(bmpData);
+		return SOFT_BMP_ERROR_MEMORY;
+	}
+	int i;
+	for(i=0; i<bmpImage->height; i++){
+		memset(bmpImage->pData + i* bmpImage->width* BYTES_PER_PIXEL, 0, wPixelAdL);
+		memcpy(bmpImage->pData + i* bmpImage->width* BYTES_PER_PIXEL + wPixelAdL, 
+			bmpData +i* bmpWidth*BYTES_PER_PIXEL, bmpWidth*BYTES_PER_PIXEL);
+		memset(bmpImage->pData + (i+1)* bmpImage->width* BYTES_PER_PIXEL-wPixelAdR, 
+			0, wPixelAdR);
+	}
+	
+	free(bmpData);
+
+	return ret;
+	
+cleanup:
+	bmp_finalise(&bmp);
+	free(data);
+	return ret;
+}
 

Diff for: SoftImage.h

@@ -25,3 +25,10 @@ int softDecodeJpeg(char *filePath, IMAGE *jpeg);
 #define SOFT_PNG_ERROR_CREATE_STRUCT 0x10
 
 int softDecodePng(char* filePath, IMAGE* png); 
+
+#define SOFT_BMP_OK 0x0
+#define SOFT_BMP_ERROR_MEMORY 0x1
+#define SOFT_BMP_ERROR_DECODING 0x04
+#define SOFT_BMP_ERROR_ANALYSING 0x08
+
+int softDecodeBMP(char* filePath, IMAGE* bmpImage);

Diff for: libnsbmp/COPYING

@@ -0,0 +1,20 @@
+Copyright (C) 2006 Richard Wilson
+Copyright (C) 2008 Sean Fox
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+  * The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.