0.9.6

Author: thomas-huet

ChangeLog

@@ -1,5 +1,11 @@
+version 0.9.6:
+
+- Faster encoding (x265 is the default encoder and is built in bpgenc).
+- Added monochrome support to x265.
+- Fixed metadata handling.
+
 version 0.9.5:
-	
+
 - Added animation support.
 - added bpgview utility.
 - bpgenc: fixed support of some JPEG parameter combinations

Makefile

@@ -4,10 +4,10 @@
 #
 # Enable compilation of Javascript decoder with Emscripten
 #USE_EMCC=y
-# Enable x265 for the encoder (you must install it before)
-#USE_X265=y
+# Enable x265 for the encoder
+USE_X265=y
 # Enable the JCTVC code (best quality but slow) for the encoder
-USE_JCTVC=y
+#USE_JCTVC=y
 # Compile bpgview (SDL and SDL_image libraries needed)
 USE_BPGVIEW=y
 # Enable it to use bit depths > 12 (need more tests to validate encoder)
@@ -23,8 +23,8 @@ prefix=/usr/local
 #################################
 
 ifdef CONFIG_WIN32
-#CROSS_PREFIX:=x86_64-w64-mingw32-
-CROSS_PREFIX=i686-w64-mingw32-
+CROSS_PREFIX:=x86_64-w64-mingw32-
+#CROSS_PREFIX=i686-w64-mingw32-
 EXE:=.exe
 else
 CROSS_PREFIX:=
@@ -97,9 +97,41 @@ BPGENC_OBJS:=bpgenc.o
 BPGENC_LIBS:=
 
 ifdef USE_X265
-BPGENC_OBJS+=x265_glue.o
-BPGENC_LIBS+= -lx265
+
+X265_LIBS:=./x265.out/8bit/libx265.a ./x265.out/10bit/libx265.a ./x265.out/12bit/libx265.a
+BPGENC_OBJS+=x265_glue.o $(X265_LIBS)
+
 bpgenc.o: CFLAGS+=-DUSE_X265
+x265_glue.o: CFLAGS+=-I./x265/source -I./x265.out/8bit
+x265_glue.o: $(X265_LIBS)
+
+ifdef CONFIG_WIN32
+CMAKE_OPTS:=-DCMAKE_TOOLCHAIN_FILE=../../x265/build/msys/toolchain-x86_64-w64-mingw32.cmake
+else
+CMAKE_OPTS:=
+endif
+
+x265.out:
+	mkdir -p x265.out/8bit x265.out/10bit x265.out/12bit
+	cd x265.out/12bit && cmake ../../x265/source $(CMAKE_OPTS) -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON
+	cd x265.out/10bit && cmake ../../x265/source $(CMAKE_OPTS) -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN10=ON
+	cd x265.out/8bit && cmake ../../x265/source $(CMAKE_OPTS) -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DENABLE_SHARED=OFF -DENABLE_CLI=OFF
+
+# use this target to manually rebuild x265
+x265_make: | x265.out
+	$(MAKE) -C x265.out/12bit
+	$(MAKE) -C x265.out/10bit
+	$(MAKE) -C x265.out/8bit
+
+x265_clean:
+	rm -rf x265.out
+
+$(X265_LIBS): x265_make
+
+else
+
+x265_clean:
+
 endif # USE_X265
 
 ifdef USE_JCTVC
@@ -133,10 +165,9 @@ endif # USE_JCTVC
 
 ifdef CONFIG_WIN32
 
-LDFLAGS+=-static
-BPGDEC_LIBS:=-Wl,-dy -lpng -lz -Wl,-dn
-BPGENC_LIBS+=-Wl,-dy -lpng -ljpeg -lz -Wl,-dn
-BPGVIEW_LIBS:=-lmingw32 -lSDLmain -Wl,-dy -lSDL_image -lSDL -Wl,-dn -mwindows
+BPGDEC_LIBS:=-lpng -lz
+BPGENC_LIBS+=-lpng -ljpeg -lz
+BPGVIEW_LIBS:=-lmingw32 -lSDLmain -lSDL_image -lSDL -mwindows
 
 else
 
@@ -171,10 +202,10 @@ bpgdec.js: $(LIBBPG_JS_OBJS) post.js
 	$(EMCC) $(EMLDFLAGS) -s TOTAL_MEMORY=33554432 -o $@ $(LIBBPG_JS_OBJS)
 
 bpgdec8.js: $(LIBBPG_JS8_OBJS) post.js
-	$(EMCC) $(EMLDFLAGS) -s TOTAL_MEMORY=16777216 -o $@ $(LIBBPG_JS8_OBJS)
+	$(EMCC) $(EMLDFLAGS) -s TOTAL_MEMORY=33554432 -o $@ $(LIBBPG_JS8_OBJS)
 
 bpgdec8a.js: $(LIBBPG_JS8A_OBJS) post.js
-	$(EMCC) $(EMLDFLAGS) -s TOTAL_MEMORY=16777216 -o $@ $(LIBBPG_JS8A_OBJS)
+	$(EMCC) $(EMLDFLAGS) -s TOTAL_MEMORY=33554432 -o $@ $(LIBBPG_JS8A_OBJS)
 
 size:
 	strip bpgdec
@@ -187,7 +218,7 @@ install: bpgenc bpgdec
 CLEAN_DIRS=doc html libavcodec libavutil \
      jctvc jctvc/TLibEncoder jctvc/TLibVideoIO jctvc/TLibCommon jctvc/libmd5
 
-clean:
+clean: x265_clean
 	rm -f $(PROGS) *.o *.a *.d *~ $(addsuffix /*.o, $(CLEAN_DIRS)) \
           $(addsuffix /*.d, $(CLEAN_DIRS)) $(addsuffix /*~, $(CLEAN_DIRS)) \
           $(addsuffix /*.a, $(CLEAN_DIRS))

README

@@ -8,12 +8,6 @@ BPG Image library and utilities
   options should be OK for Linux). Type 'make' to compile and 'make
   install' to install the compiled binaries.
 
-- x265 usage: for much increased compression speed (but lower
-  quality), you can compile and install x265 and then enable its use
-  in the Makefile. x265 supports by default only 8 bits per component
-  and does not support monochrome encoding yet (hence no alpha nor
-  grayscale images can be encoded with it).
-
 - bpgview: in order to compile it you need to install the SDL and
   SDL_image libraries.
 
@@ -27,24 +21,57 @@ BPG Image library and utilities
 
 - The BPG file format is specified in doc/bpg_spec.txt.
 
-2) BPG encoder
+2) Compilation and Installation Notes
+-------------------------------------
+
+2.1) Linux
+----------
+
+  - Edit the Makefile to change the compile options (the default
+  compile options should be OK). Type 'make' to compile and 'make
+  install' to install the compiled binaries.
+ 
+  - Use 'make -j N' where N is the number of CPU cores to compile faster.
+
+  - The following packages must be installed: SDL-devel
+  SDL_image-devel yasm. It is recommended to use yasm version >= 1.3.0
+  to have a faster compilation.
+ 
+  - Only a 64 bit target is supported because x265 needs it for bit
+    depths > 8.
+
+2.2) Windows
+------------
+
+  - Only cross-compilation from Linux is supported.
+
+  - The following packages need to be installed: mingw64-gcc
+    mingw64-libpng mingw64-libjpeg-turbo mingw64-SDL mingw64-SDL_image
+    yasm. It is recommended to use yasm version >= 1.3.0 to have a
+    faster compilation.
+
+  - Only a 64 bit target is supported because x265 needs it for bit
+    depths > 8.
+
+3) BPG encoder
 --------------
 
 The BPG command line encoder is 'bpgenc'. It takes JPEG or PNG images
 as input.
 
-- Speed: by default bpgenc uses the JCTVC encoder which has a high
-  quality but is slow. If you compiled with x265, you can have a much
-  faster encoding with the '-e x265' option. With x265 you can also
-  select the encoding speed with the '-m' option (1 = fast, but larger
-  image, 9 = slower but smaller image). Warning: x265 does not support
-  monochrome (and alpha) yet, so you must use the JCTVC encoder for
-  these cases.
+- Speed: by default bpgenc uses the x265. You can compile the much
+  slower but more efficient JCTVC encoder and select it with the '-e
+  jctvc' option. With x265 you can select the encoding speed with the
+  '-m' option (1 = fast, but larger image, 9 = slower but smaller
+  image).
 
 - Bit depth: the default bit depth is 8. You can increase it to 10
   ('-b 10' option) to slightly increase the compression ratio. For web
   publishing it is generally not a good idea because the Javascript
-  decoder uses more memory.
+  decoder uses more memory. The compiled x265 encoder supports the bit
+  depth of 8, 10 and 12. The slower JCTVC encoder can be compiled to
+  support higher bit depths (up to 14) by enabling the Makefile
+  define: USE_JCTVC_HIGH_BIT_DEPTH.
 
 - Lossless compression is supported as a bonus thru the HEVC lossless
   capabilities. Use a PNG input in this case unless you know what you
@@ -60,15 +87,8 @@ as input.
     - the JCTVC encoder gives smaller images than the x265 encoder
       with lossless compression.
 
-- There is a difference of interpretation of the quantizer parameter
-  (-q option) between the x265 and JCTVC encoder. The default value is
-  optimized for the JCTVC encoder, not for x265. We will try to align
-  the x265 value to JCTVC in the future.
-
-- By default, the JCTVC encoder is limited to a precision of 12
-  bits. You can enable high bit depths (up to 14) by enabling the
-  Makefile define: USE_JCTVC_HIGH_BIT_DEPTH. The encoder is sligthly
-  slower in this case.
+- There is a small difference of interpretation of the quantizer
+  parameter (-q option) between the x265 and JCTVC encoder.
 
 - Color space and chroma format:
 
@@ -125,11 +145,11 @@ as input.
   with the '-keepmetadata' option. For JPEG input, EXIF, ICCP and XMP
   are copied. For PNG input, ICCP is copied.
 
-- Objective comparisons: the JCTVC encoder is tuned for PSNR only, not
-  for SSIM, so you should use PSNR when making objective comparison
-  with other formats. x265 is tuned by default for SSIM.
+- Objective comparisons: x265 is tuned by default for SSIM. the JCTVC
+  encoder is tuned for PSNR only, not for SSIM, so you should use PSNR
+  when making objective comparison with other formats.
 
-3) BPG decoder
+4) BPG decoder
 --------------
 
 The BPG command line decoder is bpgdec. It outputs a PNG or PPM
@@ -141,15 +161,15 @@ no decoded image is output).
 - The '-b' option selects the bit depth (8 or 16) of the PNG
   output. It is independent of the internal BPG bit depth.
 
-4) BPG viewer
+5) BPG viewer
 -------------
 
 The BPG image viewer uses the SDL library to display BPG images and
 other image formats supported by the SDL_image library. The available
 keys are displayed by launching bpgview without parameters. bpgview
 supports BPG animations.
 
-5) BPG decoding library
+6) BPG decoding library
 -----------------------
 
 BPG images can be decoded in any program with the libbpg
@@ -161,7 +181,7 @@ provided as a static one.
 Currently there is no similar library for encoding so you should
 invoke the bpgenc utility.
 
-6) Javascript decoder
+7) Javascript decoder
 ---------------------
 
 The following Javascript decoders are available, sorted by increasing size:
@@ -193,7 +213,7 @@ be avoided, as with animated GIFs.
 asm.js gives an interesting speed boost, so we hope that more browsers
 will support this Javascript subset.
 
-7) FFmpeg modifications
+8) FFmpeg modifications
 -----------------------
 
 - Completed support of chroma_format_idc = 0 (monochrome mode).
@@ -217,16 +237,25 @@ will support this Javascript subset.
 - Stripped FFmpeg from all codecs except HEVC and the necessary
   support code.
 
-8) Licensing
-------------
+9) x265 modifications
+---------------------
+
+- Support of monochrome format (some part not used by BPG may be
+  missing).
+
+- Support of static build.
+
+10) Licensing
+-------------
 
 - libbpg and bpgdec are released under the LGPL license (the FFmpeg
   part is under the LGPL, the BPG specific part is released under the
   BSD license).
 
-- bpgenc is released under the BSD license (it includes the JCTVC code
-  which is released under the BSD license. The BPG specific part is
-  released under the BSD license).
+- bpgenc is released under the GPL version 2 license. The BPG specific
+  code is released under the BSD license. The JCTVC code is released
+  under the BSD license. The x265 code is released under the GPL
+  version 2 license.
 
 - BPG relies on the HEVC compression technology which may be protected
   by patents in some countries. Most devices already include or will

VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

bpgenc.c

@@ -1893,10 +1893,12 @@ static int build_modified_sps(uint8_t **pout_buf, int *pout_buf_len,
             int vui_hrd_parameters_present_flag, bitstream_restriction_flag;
 
             sar_present = get_bits(gb, 1);
-            sar_idx = get_bits(gb, 8);
-            if (sar_idx == 255) {
-                skip_bits(gb, 16); /* sar_num */ 
-                skip_bits(gb, 16); /* sar_den */ 
+            if (sar_present) {
+                sar_idx = get_bits(gb, 8);
+                if (sar_idx == 255) {
+                    skip_bits(gb, 16); /* sar_num */ 
+                    skip_bits(gb, 16); /* sar_den */ 
+                }
             }
 
             overscan_info_present_flag = get_bits(gb, 1);
@@ -2159,38 +2161,38 @@ static int build_modified_hevc(uint8_t **pout_buf,
 }
 
 typedef enum {
-#if defined(USE_JCTVC)
-    HEVC_ENCODER_JCTVC,
-#endif
 #if defined(USE_X265)
     HEVC_ENCODER_X265,
 #endif
+#if defined(USE_JCTVC)
+    HEVC_ENCODER_JCTVC,
+#endif
 
     HEVC_ENCODER_COUNT,
 } HEVCEncoderEnum;
 
 static char *hevc_encoder_name[HEVC_ENCODER_COUNT] = {
-#if defined(USE_JCTVC)
-    "jctvc",
-#endif
 #if defined(USE_X265)
     "x265",
 #endif
+#if defined(USE_JCTVC)
+    "jctvc",
+#endif
 };
 
 static HEVCEncoder *hevc_encoder_tab[HEVC_ENCODER_COUNT] = {
-#if defined(USE_JCTVC)
-    &jctvc_encoder,
-#endif
 #if defined(USE_X265)
     &x265_hevc_encoder,
 #endif
+#if defined(USE_JCTVC)
+    &jctvc_encoder,
+#endif
 };
 
 #define IMAGE_HEADER_MAGIC 0x425047fb
 
 #define DEFAULT_OUTFILENAME "out.bpg"
-#define DEFAULT_QP 28
+#define DEFAULT_QP 29
 #define DEFAULT_BIT_DEPTH 8
 
 #ifdef RExt__HIGH_BIT_DEPTH_SUPPORT

doc/bpg_spec.txt

@@ -79,9 +79,7 @@ heic_file() {
 
      picture_data_length                                         ue7(32)
      if (extension_present_flag)  
-        extension_data_length                                    ue7(32)
-    
-     if (extension_present_flag) {
+         extension_data_length                                   ue7(32)
          extension_data()
      }
 

html/bpgdec.js

@@ -1786,6 +1786,7 @@ static int bpg_decode_header(BPGHeaderData *h,
                     md = av_malloc(sizeof(BPGExtensionData));
                     md->tag = tag;
                     md->buf_len = buf_len;
+                    md->next = NULL;
                     *plast_md = md;
                     plast_md = &md->next;