Move some LZMA2 constants to lzma2_encoder.h so that they

can be used outside lzma2_encoder.c.
This commit is contained in:
Lasse Collin 2009-01-19 14:00:33 +02:00
parent 00be5d2e09
commit 4810b6bc25
3 changed files with 16 additions and 14 deletions

View File

@ -24,19 +24,6 @@
#include "lzma2_encoder.h" #include "lzma2_encoder.h"
/// Maximum number of bytes of actual data per chunk (no headers)
#define LZMA2_CHUNK_MAX (UINT32_C(1) << 16)
/// Maximum uncompressed size of LZMA chunk (no headers)
#define LZMA2_UNCOMPRESSED_MAX (UINT32_C(1) << 21)
/// Maximum size of LZMA2 headers
#define LZMA2_HEADER_MAX 6
/// Size of a header for uncompressed chunk
#define LZMA2_HEADER_UNCOMPRESSED 3
struct lzma_coder_s { struct lzma_coder_s {
enum { enum {
SEQ_INIT, SEQ_INIT,

View File

@ -23,6 +23,20 @@
#include "common.h" #include "common.h"
/// Maximum number of bytes of actual data per chunk (no headers)
#define LZMA2_CHUNK_MAX (UINT32_C(1) << 16)
/// Maximum uncompressed size of LZMA chunk (no headers)
#define LZMA2_UNCOMPRESSED_MAX (UINT32_C(1) << 21)
/// Maximum size of LZMA2 headers
#define LZMA2_HEADER_MAX 6
/// Size of a header for uncompressed chunk
#define LZMA2_HEADER_UNCOMPRESSED 3
extern lzma_ret lzma_lzma2_encoder_init( extern lzma_ret lzma_lzma2_encoder_init(
lzma_next_coder *next, lzma_allocator *allocator, lzma_next_coder *next, lzma_allocator *allocator,
const lzma_filter_info *filters); const lzma_filter_info *filters);

View File

@ -18,6 +18,7 @@
// //
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
#include "lzma2_encoder.h"
#include "lzma_encoder_private.h" #include "lzma_encoder_private.h"
#include "fastpos.h" #include "fastpos.h"
@ -342,7 +343,7 @@ lzma_lzma_encode(lzma_coder *restrict coder, lzma_mf *restrict mf,
if (limit != UINT32_MAX if (limit != UINT32_MAX
&& (mf->read_pos - mf->read_ahead >= limit && (mf->read_pos - mf->read_ahead >= limit
|| *out_pos + rc_pending(&coder->rc) || *out_pos + rc_pending(&coder->rc)
>= (UINT32_C(1) << 16) >= LZMA2_CHUNK_MAX
- LOOP_INPUT_MAX)) - LOOP_INPUT_MAX))
break; break;