HEIC instead of BPG

Author: vi

.gitignore

@@ -1,9 +1,10 @@
-bpg.so
+heic.so
 *.d
 *.o
 *.mkv
 *.ffmpeg
 *.png
 *.ts
-*.bpg
+*.heic
 *.ppm
+*.debug

README.md

@@ -1,16 +1,15 @@
-imlib2-bpg
+imlib2-heic
 ---
 
-Loader for [BPG image format][1] for Imlib2 (i.e. for [Feh][2]).
+Loader for [HEIC][1] for Imlib2 (i.e. for [Feh][2]). Based on libheif.
 
 Usage
 ---
 
 1. Ensure Imlib2 development things (like `libimlib2-dev`) are installed;
-2. Build libbpg (for example, v0.9.3);
-3. Adjust BPGDIR in `makefile`;
-4. Build and install `bpg.so`.
+2. Ensure libheif is installed.
+3. Build and install `heic.so`.
 
 
-[1]:http://bellard.org/bpg/
+[1]:https://nokiatech.github.io/heif/technical.html
 [2]:http://feh.finalrewind.org/

commands.mk

@@ -4,7 +4,7 @@ RM=rm -f
 INSTALL=install
 INSTALL_PROGRAM=$(INSTALL) -s -m 555
 INSTALL_DIR=$(INSTALL) -d
-INSTALL_LIB=$(INSTALL) -s -m 444
+INSTALL_LIB=$(INSTALL) -m 444
 INSTALL_DATA=$(INSTALL) -m 444
 INSTALL_SCRIPT=$(INSTALL_PROGRAM)
 XGETTEXT=xgettext

loader_bpg.c loader_heic.c

@@ -1,10 +1,10 @@
-/* File: loader_bpg.c
+/* File: loader_heic.c
    Time-stamp: <2012-12-09 21:19:30 gawen>
 
    Copyright (c) 2011 David Hauweele <david@hauweele.net>
    All rights reserved.
    
-   Modified by Vitaly "_Vi" Shukela to use bpg instead of webp.
+   Modified by Vitaly "_Vi" Shukela to use heic instead of webp.
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
@@ -46,109 +46,105 @@
 #include "loader.h"
 
 #include <inttypes.h>
-#include "libbpg.h"
+#include "libheif/heif.h"
 
 char load(ImlibImage * im, ImlibProgressFunction progress,
           char progress_granularity, char immediate_load)
 {
 
   int w,h;
-  uint8_t *buf = NULL;
-  int buf_len, buf_len_max;
-  FILE *f = NULL;
-  BPGImageInfo img_info_s, *img_info = &img_info_s;
-  BPGDecoderContext *img = NULL;
-  uint8_t *bgra = NULL;
-  int decoded_image_used = 0;
   int y=0;
+
+  char retcode = 0;
+  struct heif_context *ctx = heif_context_alloc();
+  struct heif_error ret;
+  struct heif_image_handle *imh = NULL;
+  struct heif_image *img = NULL;
 
   if(im->data)
     return 0;
 
 
-  f = fopen(im->real_file, "rb");
-  if (!f) {
-        goto EXIT;
-  }
+  ret =  heif_context_read_from_file(ctx, im->real_file, NULL);
 
-  {
-    fseek(f, 0, SEEK_END);
-    buf_len_max = ftell(f);
-    fseek(f, 0, SEEK_SET);
-  }
-  if (buf_len_max < 1) {
-     buf_len_max = BPG_DECODER_INFO_BUF_SIZE;
+  if (ret.code != heif_error_Ok) {
+		goto EXIT;
   }
 
-  buf = malloc(buf_len_max);
-  if (!buf) {
+  ret = heif_context_get_primary_image_handle(ctx, &imh);
+  if (ret.code != heif_error_Ok) {
+		goto EXIT;
+  }
+  if (!imh) {
 		goto EXIT;
   }
-  buf_len = fread(buf, 1, buf_len_max, f);
 
-  fclose(f); f = NULL;
+  w = heif_image_handle_get_width(imh);
+  h = heif_image_handle_get_height(imh);
+  
+  im->w = w;
+  im->h = h;
 
+  if(!IMAGE_DIMENSIONS_OK(w, h))
+      goto EXIT;
 
-  img = bpg_decoder_open();
+  if(progress) {
+      progress(im, 0, 0, 0, w, h);
+  }
 
-  if (bpg_decoder_decode(img, buf, buf_len) < 0) {
-		goto EXIT;
+  if (!immediate_load) {
+      retcode = 1;
+      goto EXIT;
   }
-  free(buf); buf = NULL;
 
+  ret = heif_decode_image(imh, &img, heif_colorspace_RGB, heif_chroma_interleaved_RGBA, NULL);
+  if (!imh) {
+		goto EXIT;
+  }
 
-  bpg_decoder_get_info(img, img_info);
-    
-  w = img_info->width;
-  h = img_info->height;
+  /*struct heif_error heif_decode_image(const struct heif_image_handle* in_handle,
+                                    struct heif_image** out_img,
+                                    enum heif_colorspace colorspace,
+                                    enum heif_chroma chroma,
+                                    const struct heif_decoding_options* options);*/
 
-  bgra = malloc(4 * w * h);
-  if (!bgra) goto EXIT;
 
-  bpg_decoder_start(img, BPG_OUTPUT_FORMAT_RGBA32);
-  for (y = 0; y < h; ++y) {
-     bpg_decoder_get_line(img, bgra + 4*w*y);
-
-	 int x;
-	 for (x=0; x < w; ++x) {
-		#define SWAP(a,b) { unsigned char tmp; tmp=a; a=b; b=tmp; }
-		SWAP(bgra[4*w*y + 4*x + 0], bgra[4*w*y + 4*x + 2]);
-		#undef SWAP
-	 }
-  }
+  int stride = 0;
+  uint8_t *plane  = heif_image_get_plane(img, heif_channel_interleaved, &stride);
 
-  bpg_decoder_close(img); img = NULL;
-  
-  
-  if(!im->loader && !im->data) {
-    im->w = w;
-    im->h = h;
+  if (!plane) {
+		goto EXIT;
+  }
 
-    if(!IMAGE_DIMENSIONS_OK(w, h))
-      goto EXIT;
+  uint8_t *bgra;
+  bgra = (uint8_t*)malloc(4 * w * h);
+  if (!bgra) goto EXIT;
 
-    SET_FLAGS(im->flags, F_HAS_ALPHA);
-    
-    im->format = strdup("bpg");
+  for (y = 0; y < h; ++y) {
+     int x;
+     for (x=0; x < w; ++x) {
+		  bgra[4*(y*w + x) + 0] = plane[y*stride + 4*x + 2];
+		  bgra[4*(y*w + x) + 1] = plane[y*stride + 4*x + 1];
+		  bgra[4*(y*w + x) + 2] = plane[y*stride + 4*x + 0];
+		  bgra[4*(y*w + x) + 3] = plane[y*stride + 4*x + 3];
+     }
   }
 
-  if((!im->data && im->loader) || immediate_load || progress) {
-    im->data = (DATA32*)bgra;
-    decoded_image_used = 1;
-    if(progress)
+  im->data = (DATA32*)bgra;
+  if(progress)
       progress(im, 100, 0, 0, w, h);
-    return 1;
-  }
 
-  
+  SET_FLAGS(im->flags, F_HAS_ALPHA);
+    
+  im->format = strdup("heif");
+  retcode = 1;
 
 EXIT:
-  if (f) fclose(f);
-  if (buf) free(buf);
-  if (img) bpg_decoder_close(img);
-  if ((!decoded_image_used) && bgra) free(bgra);
+  if (ctx) heif_context_free(ctx);
+  if (imh) heif_image_handle_release(imh);
+  if (img) heif_image_release(img);
 
-  return 0;
+  return retcode;
 }
 
 char save(ImlibImage *im, ImlibProgressFunction progress,
@@ -160,7 +156,7 @@ char save(ImlibImage *im, ImlibProgressFunction progress,
 void formats(ImlibLoader *l)
 {
   int i;
-  char *list_formats[] = { "bpg" };
+  char *list_formats[] = { "heic", "heif" };
 
   l->num_formats = (sizeof(list_formats) / sizeof(char *));
   l->formats     = malloc(sizeof(char *) * l->num_formats);

makefile

@@ -1,10 +1,8 @@
 include commands.mk
 
-BPGDIR=/mnt/src/p/libbpg-0.9.3
-
-OPTS    := -O2
-CFLAGS  := -std=c99 $(OPTS) $(shell imlib2-config --cflags) -fPIC -Wall -I${BPGDIR}
-LDFLAGS := $(shell imlib2-config --libs) -L${BPGDIR} -lbpg
+OPTS    := -O3
+CFLAGS  := -std=c99 $(OPTS) $(shell pkg-config libheif --cflags) -fPIC -Wall
+LDFLAGS := $(shell imlib2-config --libs) $(shell pkg-config libheif --libs)
 
 
 SRC = $(wildcard *.c)
@@ -20,25 +18,27 @@ endif
 
 .PHONY: all clean
 
-all: bpg.so
+all: heic.so
 
-bpg.so: $(OBJ)
-	$(CC) -shared -o $@ $^ $(LDFLAGS)
+heic.so: $(OBJ)
+	$(CC) -shared -o $@ $^ $(LDFLAGS) 
+	cp $@ $@.debug
+	strip $@
 
 %.o: %.c
 	$(CC) -Wp,-MMD,$*.d -c $(CFLAGS) -o $@ $<
 
 clean:
 	$(RM) $(DEP)
 	$(RM) $(OBJ)
-	$(RM) bpg.so
+	$(RM) heic.so
 
 install:
 	$(INSTALL_DIR) $(DESTDIR)$(LOADERDIR)
-	$(INSTALL_LIB) bpg.so $(DESTDIR)$(LOADERDIR)
+	$(INSTALL_LIB) heic.so $(DESTDIR)$(LOADERDIR)
 
 uninstall:
-	$(RM) $(PLUGINDIR)/bpg.so
+	$(RM) $(PLUGINDIR)/heic.so
 
 -include $(DEP)