diff options
| author | Frediano Ziglio <fziglio@redhat.com> | 2018-07-10 11:02:17 +0200 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2018-07-10 10:34:57 +0100 |
| commit | 8b21fc5ea1dca1af39597cd375537d56400dba53 (patch) | |
| tree | 37b9a1b2649667abc9143ed1b64dc87c0768cec5 | |
| parent | 0046ee5e8170bb9e71e7504f6226b79d988768b3 (diff) | |
quic: Move all golomb decoding macros in a single place
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
| -rw-r--r-- | common/quic_rgb_tmpl.c | 42 | ||||
| -rw-r--r-- | common/quic_tmpl.c | 17 |
2 files changed, 27 insertions, 32 deletions
diff --git a/common/quic_rgb_tmpl.c b/common/quic_rgb_tmpl.c index 3af1d2e..fcb56ff 100644 --- a/common/quic_rgb_tmpl.c +++ b/common/quic_rgb_tmpl.c @@ -26,13 +26,7 @@ #undef QUIC_RGB32 #define PIXEL rgb32_pixel_t #define FNAME(name) quic_rgb32_##name -#define golomb_coding golomb_coding_8bpc -#define golomb_decoding golomb_decoding_8bpc -#define update_model update_model_8bpc -#define find_bucket find_bucket_8bpc -#define family family_8bpc #define BPC 8 -#define BPC_MASK 0xffU #define COMPRESS_IMP #define SET_r(pix, val) ((pix)->r = val) #define GET_r(pix) ((pix)->r) @@ -47,13 +41,7 @@ #undef QUIC_RGB24 #define PIXEL rgb24_pixel_t #define FNAME(name) quic_rgb24_##name -#define golomb_coding golomb_coding_8bpc -#define golomb_decoding golomb_decoding_8bpc -#define update_model update_model_8bpc -#define find_bucket find_bucket_8bpc -#define family family_8bpc #define BPC 8 -#define BPC_MASK 0xffU #define COMPRESS_IMP #define SET_r(pix, val) ((pix)->r = val) #define GET_r(pix) ((pix)->r) @@ -68,13 +56,7 @@ #undef QUIC_RGB16 #define PIXEL rgb16_pixel_t #define FNAME(name) quic_rgb16_##name -#define golomb_coding golomb_coding_5bpc -#define golomb_decoding golomb_decoding_5bpc -#define update_model update_model_5bpc -#define find_bucket find_bucket_5bpc -#define family family_5bpc #define BPC 5 -#define BPC_MASK 0x1fU #define COMPRESS_IMP #define SET_r(pix, val) (*(pix) = (*(pix) & ~(0x1f << 10)) | ((val) << 10)) #define GET_r(pix) ((*(pix) >> 10) & 0x1f) @@ -89,14 +71,7 @@ #undef QUIC_RGB16_TO_32 #define PIXEL rgb32_pixel_t #define FNAME(name) quic_rgb16_to_32_##name -#define golomb_coding golomb_coding_5bpc -#define golomb_decoding golomb_decoding_5bpc -#define update_model update_model_5bpc -#define find_bucket find_bucket_5bpc -#define family family_5bpc #define BPC 5 -#define BPC_MASK 0x1fU - #define SET_r(pix, val) ((pix)->r = ((val) << 3) | (((val) & 0x1f) >> 2)) #define GET_r(pix) ((pix)->r >> 3) #define SET_g(pix, val) ((pix)->g = ((val) << 3) | (((val) & 0x1f) >> 2)) @@ -113,6 +88,23 @@ (GET_r(p1) == GET_r(p2) && GET_g(p1) == GET_g(p2) && \ GET_b(p1) == GET_b(p2)) +#if BPC == 5 +# define golomb_coding golomb_coding_5bpc +# define golomb_decoding golomb_decoding_5bpc +# define update_model update_model_5bpc +# define find_bucket find_bucket_5bpc +# define family family_5bpc +# define BPC_MASK 0x1fU +#elif BPC == 8 +# define golomb_coding golomb_coding_8bpc +# define golomb_decoding golomb_decoding_8bpc +# define update_model update_model_8bpc +# define find_bucket find_bucket_8bpc +# define family family_8bpc +# define BPC_MASK 0xffU +#else +# error BPC must be 5 or 8 +#endif #define _PIXEL_A(channel, curr) ((unsigned int)GET_##channel((curr) - 1)) #define _PIXEL_B(channel, prev) ((unsigned int)GET_##channel(prev)) diff --git a/common/quic_tmpl.c b/common/quic_tmpl.c index a7be9af..225a292 100644 --- a/common/quic_tmpl.c +++ b/common/quic_tmpl.c @@ -36,20 +36,23 @@ #define FNAME_DECL(name) FNAME(name) FARGS_DECL #define FNAME_CALL(name) FNAME(name) FARGS_CALL -#define golomb_coding golomb_coding_8bpc -#define golomb_decoding golomb_decoding_8bpc -#define update_model update_model_8bpc -#define find_bucket find_bucket_8bpc -#define family family_8bpc - #define BPC 8 -#define BPC_MASK 0xffU #define SET_a(pix, val) ((pix)->a = val) #define GET_a(pix) ((pix)->a) #define SAME_PIXEL(p1, p2) \ (GET_a(p1) == GET_a(p2)) +#if BPC == 8 +# define golomb_coding golomb_coding_8bpc +# define golomb_decoding golomb_decoding_8bpc +# define update_model update_model_8bpc +# define find_bucket find_bucket_8bpc +# define family family_8bpc +# define BPC_MASK 0xffU +#else +# error BPC must be 8 +#endif #define _PIXEL_A(channel, curr) ((unsigned int)GET_##channel((curr) - 1)) #define _PIXEL_B(channel, prev) ((unsigned int)GET_##channel(prev)) |