ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2025-12-06 07:12:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move zpaq compression to new libzpaq library back end.

Browse source
This commit is contained in:
Con Kolivas 2012-03-16 14:04:16 +11:00
parent 73df7ebcd3
commit f8d05b9a66
3 changed files with 62 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
libzpaq/libzpaq.h
View file

@ -438,4 +438,35 @@ void compress(Reader* in, Writer* out, int level);
} // namespace libzpaq } // namespace libzpaq
typedef unsigned char uchar;
struct bufRead: public libzpaq::Reader {
uchar *s_buf;
long long *s_len;
bufRead(uchar *buf_, long long *n_): s_buf(buf_), s_len(n_) {}
int get() {
if (*s_len > 0) {
(*s_len)--;
return ((int)(uchar)*s_buf++);
}
return -1;
} // read and return byte 0..255, or -1 at EOF
};
struct bufWrite: public libzpaq::Writer {
uchar *c_buf;
long long *c_len;
bufWrite(uchar *buf_, long long *n_): c_buf(buf_), c_len(n_) {}
void put(int c) {
c_buf[(*c_len)++] = (uchar)c;
}
};
extern "C" void zpaq_compress(uchar *c_buf, long long *c_len, uchar *s_buf, long long s_len, int level) {
bufRead bufR(s_buf, &s_len);
bufWrite bufW(c_buf, c_len);
compress (&bufR, &bufW, level);
}
#endif // LIBZPAQ_H #endif // LIBZPAQ_H

1
lrzip.h
View file

@ -42,4 +42,5 @@ void clear_tmpinbuf(rzip_control *control);
bool clear_tmpinfile(rzip_control *control); bool clear_tmpinfile(rzip_control *control);
void close_tmpinbuf(rzip_control *control); void close_tmpinbuf(rzip_control *control);
bool initialize_control(rzip_control *control); bool initialize_control(rzip_control *control);
extern void zpaq_compress(uchar *c_buf, long long *c_len, uchar *s_buf, long long s_len, int level);
#endif #endif

30
stream.c
View file

@ -239,6 +239,35 @@ static inline int fake_open_memstream_update_buffer(FILE *fp, uchar **buf, size_
length in c_len length in c_len
*/ */
static int zpaq_compress_buf(rzip_control *control, struct compress_thread *cthread, long thread)
{
i64 c_len = 0;
uchar *c_buf;
c_buf = malloc(cthread->s_len + control->page_size);
if (!c_buf) {
print_err("Unable to allocate c_buf in zpaq_compress_buf\n");
return -1;
}
zpaq_compress(c_buf, &c_len, cthread->s_buf, cthread->s_len, control->compression_level / 4 + 1);
if (unlikely(c_len >= cthread->c_len)) {
print_maxverbose("Incompressible block\n");
/* Incompressible, leave as CTYPE_NONE */
free(c_buf);
return 0;
}
cthread->c_len = c_len;
free(cthread->s_buf);
cthread->s_buf = c_buf;
cthread->c_type = CTYPE_ZPAQ;
return 0;
}
#if 0
static int zpaq_compress_buf(rzip_control *control, struct compress_thread *cthread, long thread) static int zpaq_compress_buf(rzip_control *control, struct compress_thread *cthread, long thread)
{ {
uchar *c_buf = NULL; uchar *c_buf = NULL;
@ -285,6 +314,7 @@ static int zpaq_compress_buf(rzip_control *control, struct compress_thread *cthr
cthread->c_type = CTYPE_ZPAQ; cthread->c_type = CTYPE_ZPAQ;
return 0; return 0;
} }
#endif
static int bzip2_compress_buf(rzip_control *control, struct compress_thread *cthread) static int bzip2_compress_buf(rzip_control *control, struct compress_thread *cthread)
{ {