Options, new added and others restored

library/ako-private.h

@@ -41,7 +41,7 @@ void akoSavePgmI16(size_t width, size_t height, size_t in_stride, const int16_t*
 
 // format.c:
 
-void akoFormatToPlanarI16Yuv(int keep_transparent_pixels, enum akoColor, size_t channels, size_t width, size_t height,
+void akoFormatToPlanarI16Yuv(int discard_non_visible, enum akoColor, size_t channels, size_t width, size_t height,
                              size_t in_stride, size_t out_planes_spacing, const uint8_t* in, int16_t* out);
 void akoFormatToInterleavedU8Rgb(enum akoColor, size_t channels, size_t width, size_t height, size_t in_planes_spacing,
                                  size_t out_stride, int16_t* in,
@@ -94,8 +94,8 @@ size_t akoImageMaxPlanesSpacingSize(size_t image_w, size_t image_h, size_t tiles
 
 // quantization.c:
 
-int16_t akoGate(int factor, size_t tile_w, size_t tile_h, size_t current_w, size_t current_h);
-int16_t akoQuantization(int factor, size_t tile_w, size_t tile_h, size_t current_w, size_t current_h);
+int16_t akoGate(int factor, int factor_mul, size_t tile_w, size_t tile_h, size_t current_w, size_t current_h);
+int16_t akoQuantization(int factor, int factor_mul, size_t tile_w, size_t tile_h, size_t current_w, size_t current_h);
 
 // wavelet-cdf53.c:
 

library/ako.h

@@ -40,23 +40,15 @@ enum akoStatus
 	AKO_BROKEN_INPUT,
 };
 
-enum akoWrap // Wrap mode
-{
-	AKO_WRAP_CLAMP = 0,
-	AKO_WRAP_MIRROR,
-	AKO_WRAP_REPEAT,
-	AKO_WRAP_ZERO,
-};
-
-enum akoWavelet // Wavelet transformation
+enum akoWavelet
 {
 	AKO_WAVELET_DD137 = 0,
 	AKO_WAVELET_CDF53,
 	AKO_WAVELET_HAAR,
 	AKO_WAVELET_NONE,
 };
 
-enum akoColor // Color transformation
+enum akoColor
 {
 	AKO_COLOR_YCOCG = 0,
 	AKO_COLOR_SUBTRACT_G,
@@ -65,9 +57,18 @@ enum akoColor // Color transformation
 	AKO_COLOR_YCOCG_Q, // Internal
 };
 
-enum akoCompression // Compression method
+enum akoWrap
+{
+	AKO_WRAP_CLAMP = 0,
+	AKO_WRAP_MIRROR,
+	AKO_WRAP_REPEAT,
+	AKO_WRAP_ZERO,
+};
+
+enum akoCompression
 {
-	AKO_COMPRESSION_ELIAS_RLE = 0,
+	AKO_COMPRESSION_KAGARI = 0,
+	AKO_COMPRESSION_MANBAVARAN,
 	AKO_COMPRESSION_NONE,
 };
 
@@ -84,16 +85,17 @@ enum akoEvent
 
 struct akoSettings
 {
-	enum akoWrap wrap;
 	enum akoWavelet wavelet;
 	enum akoColor color;
+	enum akoWrap wrap;
 	enum akoCompression compression;
 	size_t tiles_dimension;
 
-	int discard_transparent_pixels;
-
 	int quantization;
 	int gate;
+
+	int chroma_loss;
+	int discard_non_visible;
 };
 
 struct akoCallbacks
@@ -116,10 +118,10 @@ struct akoHead
 
 	uint32_t flags;
 	// bits 0-3   : Channels,        0 = Gray, 1 = Gray + Alpha, 2 = RGB, 3 = RGBA, etc...
-	// bits 4-5   : Wrap,            0 = Clamp, 1 = Repeat, 2 = Set to zero
+	// bits 4-5   : Wrap,            0 = Clamp, 1 = Mirror, 2 = Repeat, 3 = Zero
 	// bits 6-7   : Wavelet,         0 = DD137, 1 = CDF53, 2 = Haar, 3 = None
-	// bits 8-9   : Color,           0 = YCOCG, 1 = YCOCG-R, 2 = Subtract Green, 3 = RGB
-	// bits 10-11 : Compression,     0 = Elias Coding + Rle, 1 = No compression
+	// bits 8-9   : Color,           0 = YCOCG, 1 = Subtract Green, 2 = None, 3 = Internal
+	// bits 10-11 : Compression,     0 = Elias Coding, 1 = rAns, 2 = No compression
 	// bits 12-16 : Tiles dimension, 0 = No tiles, 1 = 8x8, 2 = 16x16, 3 = 32x32, 4 = 64x64, etc...
 	// bits 17-32 : Unused bits (always zero)
 };

library/encode.c

@@ -2,7 +2,7 @@
 
 MIT License
 
-Copyright (c) 2021 Alexander Brandt
+Copyright (c) 2021-2022 Alexander Brandt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -131,9 +131,9 @@ AKO_EXPORT size_t akoEncodeExt(const struct akoCallbacks* c, const struct akoSet
 		// 1. Format
 		sEvent(t, tiles_no, AKO_EVENT_FORMAT_START, checked_c.events_data, checked_c.events);
 		{
-			akoFormatToPlanarI16Yuv(checked_s.discard_transparent_pixels, checked_s.color, channels, tile_w, tile_h,
-			                        image_w, planes_spacing,
-			                        (const uint8_t*)in + ((image_w * tile_y) + tile_x) * channels, workarea_a);
+			akoFormatToPlanarI16Yuv(checked_s.discard_non_visible, checked_s.color, channels, tile_w, tile_h, image_w,
+			                        planes_spacing, (const uint8_t*)in + ((image_w * tile_y) + tile_x) * channels,
+			                        workarea_a);
 		}
 		sEvent(t, tiles_no, AKO_EVENT_FORMAT_END, checked_c.events_data, checked_c.events);
 

library/format.c

@@ -2,7 +2,7 @@
 
 MIT License
 
-Copyright (c) 2021 Alexander Brandt
+Copyright (c) 2021-2022 Alexander Brandt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -27,10 +27,10 @@ SOFTWARE.
 #include "ako-private.h"
 
 
-static inline void sDeinterleave(int discard_transparent_pixels, size_t channels, size_t width, size_t in_stride,
+static inline void sDeinterleave(int discard_non_visible, size_t channels, size_t width, size_t in_stride,
                                  size_t out_plane, const uint8_t* in, const uint8_t* in_end, int16_t* out)
 {
-	if (discard_transparent_pixels != 0)
+	if (discard_non_visible != 0)
 	{
 		for (; in < in_end; in += in_stride, out += width)
 			for (size_t col = 0; col < width; col++)
@@ -61,11 +61,10 @@ static inline void sDeinterleave(int discard_transparent_pixels, size_t channels
 }
 
 
-void akoFormatToPlanarI16Yuv(int discard_transparent_pixels, enum akoColor color, size_t channels, size_t width,
-                             size_t height, size_t input_stride, size_t out_planes_spacing, const uint8_t* in,
-                             int16_t* out)
+void akoFormatToPlanarI16Yuv(int discard_non_visible, enum akoColor color, size_t channels, size_t width, size_t height,
+                             size_t input_stride, size_t out_planes_spacing, const uint8_t* in, int16_t* out)
 {
-	// Deinterleave, convert from u8 to i16, and remove (or not) transparent pixels
+	// Deinterleave, convert from u8 to i16, and remove (or not) non visible pixels
 	{
 		const size_t in_stride = input_stride * channels;
 		const size_t out_plane = (width * height) + out_planes_spacing;
@@ -75,9 +74,9 @@ void akoFormatToPlanarI16Yuv(int discard_transparent_pixels, enum akoColor color
 		if (channels == 3)
 			sDeinterleave(0, 3, width, in_stride, out_plane, in, in_end, out);
 		else if (channels == 4)
-			sDeinterleave(discard_transparent_pixels, 4, width, in_stride, out_plane, in, in_end, out);
+			sDeinterleave(discard_non_visible, 4, width, in_stride, out_plane, in, in_end, out);
 		else if (channels == 2)
-			sDeinterleave(discard_transparent_pixels, 2, width, in_stride, out_plane, in, in_end, out);
+			sDeinterleave(discard_non_visible, 2, width, in_stride, out_plane, in, in_end, out);
 		else if (channels == 1)
 			sDeinterleave(0, 1, width, in_stride, out_plane, in, in_end, out);
 		else

library/head.c

@@ -2,7 +2,7 @@
 
 MIT License
 
-Copyright (c) 2021 Alexander Brandt
+Copyright (c) 2021-2022 Alexander Brandt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -56,7 +56,7 @@ static inline enum akoStatus sValidate(size_t channels, size_t width, size_t hei
 	    color != AKO_COLOR_NONE)
 		return AKO_INVALID_COLOR_TRANSFORMATION;
 
-	if (compression != AKO_COMPRESSION_ELIAS_RLE && compression != AKO_COMPRESSION_NONE)
+	if (compression != AKO_COMPRESSION_KAGARI && compression != AKO_COMPRESSION_NONE)
 		return AKO_INVALID_COMPRESSION_METHOD;
 
 	return AKO_OK;

library/lifting.c

@@ -2,7 +2,7 @@
 
 MIT License
 
-Copyright (c) 2021 Alexander Brandt
+Copyright (c) 2021-2022 Alexander Brandt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -168,10 +168,19 @@ void akoLift(size_t tile_no, const struct akoSettings* s, size_t channels, size_
 		// Iterate in Vuy order
 		for (size_t ch = (channels - 1); ch < channels; ch--) // Yes, underflows
 		{
-			const int16_t q =
-			    akoQuantization(s->quantization * ((ch == 0) ? 1 : 2), tile_w, tile_h, current_w, current_h);
+			int16_t q = 0;
+			int16_t g = 0;
 
-			const int16_t g = akoGate(s->gate * ((ch == 0) ? 1 : 2), tile_w, tile_h, current_w, current_h);
+			if (ch == 0)
+			{
+				q = akoQuantization(s->quantization, 1, tile_w, tile_h, current_w, current_h);
+				g = akoGate(s->gate, 1, tile_w, tile_h, current_w, current_h);
+			}
+			else
+			{
+				q = akoQuantization(s->quantization, s->chroma_loss + 1, tile_w, tile_h, current_w, current_h);
+				g = akoGate(s->gate, s->chroma_loss + 1, tile_w, tile_h, current_w, current_h);
+			}
 
 			// 1. Lift
 			int16_t* lp = in + (tile_w * tile_h + planes_space) * ch;

library/misc.c

@@ -2,7 +2,7 @@
 
 MIT License
 
-Copyright (c) 2021 Alexander Brandt
+Copyright (c) 2021-2022 Alexander Brandt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -31,17 +31,18 @@ AKO_EXPORT struct akoSettings akoDefaultSettings()
 {
 	struct akoSettings s = {0};
 
-	s.wrap = AKO_WRAP_CLAMP;
 	s.wavelet = AKO_WAVELET_DD137;
 	s.color = AKO_COLOR_YCOCG;
-	s.compression = AKO_COMPRESSION_ELIAS_RLE;
+	s.wrap = AKO_WRAP_CLAMP;
+	s.compression = AKO_COMPRESSION_KAGARI;
 	s.tiles_dimension = 0;
 
-	s.discard_transparent_pixels = 0;
-
 	s.quantization = 16;
 	s.gate = 0;
 
+	s.chroma_loss = 1;
+	s.discard_non_visible = 0;
+
 	return s;
 }
 

library/quantization.c

@@ -2,7 +2,7 @@
 
 MIT License
 
-Copyright (c) 2021 Alexander Brandt
+Copyright (c) 2021-2022 Alexander Brandt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -64,12 +64,13 @@ static float sExponential(float factor, float tile_w, float tile_h, float curren
 }
 
 
-int16_t akoGate(int factor, size_t tile_w, size_t tile_h, size_t current_w, size_t current_h)
+int16_t akoGate(int factor, int factor_mul, size_t tile_w, size_t tile_h, size_t current_w, size_t current_h)
 {
 	if (factor <= 0)
 		return 0;
 
-	float g = sExponential((float)factor, (float)tile_w, (float)tile_h, (float)current_w, (float)current_h);
+	float g = sExponential((float)factor * (float)factor_mul, (float)tile_w, (float)tile_h, (float)current_w,
+	                       (float)current_h);
 
 	if (g < 0.0F)
 		g = 0.0F;
@@ -80,12 +81,13 @@ int16_t akoGate(int factor, size_t tile_w, size_t tile_h, size_t current_w, size
 }
 
 
-int16_t akoQuantization(int factor, size_t tile_w, size_t tile_h, size_t current_w, size_t current_h)
+int16_t akoQuantization(int factor, int factor_mul, size_t tile_w, size_t tile_h, size_t current_w, size_t current_h)
 {
 	if (factor <= 0)
 		return 1;
 
-	float q = sExponential((float)factor, (float)tile_w, (float)tile_h, (float)current_w, (float)current_h);
+	float q = sExponential((float)factor * (float)factor_mul, (float)tile_w, (float)tile_h, (float)current_w,
+	                       (float)current_h);
 
 	if (q < 1.0F)
 		q = 1.0F;

tools/akodec.cpp

@@ -2,7 +2,7 @@
 
 MIT License
 
-Copyright (c) 2021 Alexander Brandt
+Copyright (c) 2021-2022 Alexander Brandt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -77,9 +77,10 @@ class AkoImage
 	size_t channels;
 	void* data;
 
-	enum akoWrap wrap;
-	enum akoWavelet wavelet;
-	enum akoColor color;
+	akoWavelet wavelet;
+	akoColor color;
+	akoWrap wrap;
+	akoCompression compression;
 	size_t blob_size;
 
   public:
@@ -89,10 +90,11 @@ class AkoImage
 	size_t      get_channels() const { return channels; };
 	const void* get_data() const     { return (const void*)(data); };
 
-	enum akoWrap    get_wrap() const      { return wrap; };
-	enum akoWavelet get_wavelet() const   { return wavelet; };
-	enum akoColor   get_color() const     { return color; };
-	size_t          get_blob_size() const { return blob_size; };
+	akoWavelet     get_wavelet() const     { return wavelet; };
+	akoColor       get_color() const       { return color; };
+	akoWrap        get_wrap() const        { return wrap; };
+	akoCompression get_compression() const { return compression; };
+	size_t         get_blob_size() const   { return blob_size; };
 	// clang-format on
 
 	AkoImage(const std::string& filename, bool quiet, bool benchmark)
@@ -145,9 +147,10 @@ class AkoImage
 		}
 
 		// Bye!
-		wrap = settings.wrap;
 		wavelet = settings.wavelet;
 		color = settings.color;
+		wrap = settings.wrap;
+		compression = settings.compression;
 	}
 
 	~AkoImage()
@@ -177,9 +180,9 @@ void AkoDec(const std::string& filename_input, const std::string& filename_outpu
 	const auto ako = AkoImage(filename_input, quiet, benchmark);
 
 	if (verbose == true)
-		std::printf("Input data: %zu channels, %zux%zu px, wavelet: %i, color: %i, wrap: %i\n", ako.get_channels(),
-		            ako.get_width(), ako.get_height(), (int)ako.get_wavelet(), (int)ako.get_color(),
-		            (int)ako.get_wrap());
+		std::printf("Input data: %zu channels, %zux%zu px, wavelet: %i, color: %i, wrap: %i, compression: %i\n",
+		            ako.get_channels(), ako.get_width(), ako.get_height(), (int)ako.get_wavelet(), (int)ako.get_color(),
+		            (int)ako.get_wrap(), (int)ako.get_compression());
 
 	// Checksum data
 	uint32_t input_checksum = 0;