daiduo/TurboPFor-Integer-Compression
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Variable Byte

Browse Source
This commit is contained in:
powturbo
2015-06-25 10:16:18 +02:00
parent 4c59d2ba70
commit bb0c16ad8c
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
vint.c
View File

@ -41,7 +41,7 @@
else if(!(__x & (1<<1))) { __x = (*(unsigned short *)__ip) >> 2; __ip += 2; __act;}\ else if(!(__x & (1<<1))) { __x = (*(unsigned short *)__ip) >> 2; __ip += 2; __act;}\
else if(!(__x & (1<<2))) { __x = (*(unsigned *)__ip & 0xffffffu) >> 3; __ip += 3; __act;}\ else if(!(__x & (1<<2))) { __x = (*(unsigned *)__ip & 0xffffffu) >> 3; __ip += 3; __act;}\
else if(!(__x & (1<<3))) { __x = (*(unsigned *)__ip) >> 4; __ip += 4; __act;}\ else if(!(__x & (1<<3))) { __x = (*(unsigned *)__ip) >> 4; __ip += 4; __act;}\
else { __x = (*(unsigned *)__ip) >> 4 | *(__ip+4) << 28; __ip += 5; __act;}\ else { __x = (unsigned long long)(*(unsigned *)__ip) >> 4 | (unsigned long long)(__ip[4]) << 28; __ip += 5; __act;}\
} while(0) } while(0)
#define vbputu32(__op, __x) { unsigned _x_ = __x; _vbputu32(__op, _x_, ;); } #define vbputu32(__op, __x) { unsigned _x_ = __x; _vbputu32(__op, _x_, ;); }
@ -139,13 +139,18 @@ unsigned char *vbddec32(unsigned char *__restrict in, unsigned n, unsigned *__re
} }
//----------------------------------strictly increasing (never remaining constant or decreasing) integer lists--------------------------------------------------------- //----------------------------------strictly increasing (never remaining constant or decreasing) integer lists---------------------------------------------------------
#define VINT_Z
unsigned char *vbd1enc32(unsigned *__restrict in, unsigned n, unsigned char *__restrict out, unsigned start) { unsigned char *vbd1enc32(unsigned *__restrict in, unsigned n, unsigned char *__restrict out, unsigned start) {
unsigned *ip, v, b = 0; unsigned char *op = out; unsigned *ip, v, b = 0;
v = ((*in) - start - 1)<<1; if(n == 1) v |= 1; unsigned char *op = out;
_vbputu32(op, v, ;); #ifdef VINT_Z
v = in[0] - start - 1;
unsigned long long u = (unsigned long long)v<<1;
if(n == 1) u |= 1;
_vbputu32(op, u, ;);
if(!--n) return op; if(!--n) return op;
start = *in++; start = *in++;
#endif
for(ip = in; ip != in + (n&~(4-1)); ) { for(ip = in; ip != in + (n&~(4-1)); ) {
v = (*ip)-start-1; start = *ip++; _vbputu32(op, v, ;); b |= v; v = (*ip)-start-1; start = *ip++; _vbputu32(op, v, ;); b |= v;
v = (*ip)-start-1; start = *ip++; _vbputu32(op, v, ;); b |= v; v = (*ip)-start-1; start = *ip++; _vbputu32(op, v, ;); b |= v;
@ -153,17 +158,21 @@ unsigned char *vbd1enc32(unsigned *__restrict in, unsigned n, unsigned char *__r
v = (*ip)-start-1; start = *ip++; _vbputu32(op, v, ;); b |= v; v = (*ip)-start-1; start = *ip++; _vbputu32(op, v, ;); b |= v;
} }
while(ip != in+n) { v = (*ip)-start-1; start = *ip++; _vbputu32(op, v, ;); b |= v; } while(ip != in+n) { v = (*ip)-start-1; start = *ip++; _vbputu32(op, v, ;); b |= v; }
#ifdef VINT_Z
if(!b) { if(!b) {
v = in[-1] << 1 | 1; u = (unsigned long long)in[-1] << 1 | 1;
_vbputu32(out, v, ;); _vbputu32(out, u, ;);
return out; return out;
} }
#endif
return op; return op;
} }
unsigned char *vbd1dec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out, unsigned start) { unsigned x,*op; unsigned char *vbd1dec32(unsigned char *__restrict in, unsigned n, unsigned *__restrict out, unsigned start) {
_vbgetu32(in, x, ;); *out = (start += (x>>1)+1); unsigned x,*op;
if(x & 1) { #ifdef VINT_Z
unsigned long long u; _vbgetu32(in, u, ;); x = u>>1; *out = (start += x+1);
if(u & 1) {
#ifdef __SSE2__ #ifdef __SSE2__
out++; --n; BITDIZERO32(out, n, start, 1); out++; --n; BITDIZERO32(out, n, start, 1);
#else #else
@ -172,7 +181,8 @@ unsigned char *vbd1dec32(unsigned char *__restrict in, unsigned n, unsigned *__r
return in; return in;
} }
out++; --n; out++; --n;
#endif
for(op = out; op != out+(n&~(8-1)); ) { for(op = out; op != out+(n&~(8-1)); ) {
_vbgetu32(in, x, ++x); *op++ = (start += x); _vbgetu32(in, x, ++x); *op++ = (start += x);
_vbgetu32(in, x, ++x); *op++ = (start += x); _vbgetu32(in, x, ++x); *op++ = (start += x);