mirror of
https://git.tukaani.org/xz.git
synced 2024-04-04 12:36:23 +02:00
liblzma: Pass the Filter ID to LZ encoder and decoder.
This allows using two Filter IDs with the same initialization function and data structures.
This commit is contained in:
parent
1663c7676b
commit
218394958c
14 changed files with 26 additions and 12 deletions
|
@ -132,6 +132,7 @@ alone_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
|
|
||||||
lzma_filter_info filters[2] = {
|
lzma_filter_info filters[2] = {
|
||||||
{
|
{
|
||||||
|
.id = LZMA_FILTER_LZMA1,
|
||||||
.init = &lzma_lzma_decoder_init,
|
.init = &lzma_lzma_decoder_init,
|
||||||
.options = &coder->options,
|
.options = &coder->options,
|
||||||
}, {
|
}, {
|
||||||
|
|
|
@ -129,6 +129,7 @@ alone_encoder_init(lzma_next_coder *next, const lzma_allocator *allocator,
|
||||||
// Initialize the LZMA encoder.
|
// Initialize the LZMA encoder.
|
||||||
const lzma_filter_info filters[2] = {
|
const lzma_filter_info filters[2] = {
|
||||||
{
|
{
|
||||||
|
.id = LZMA_FILTER_LZMA1,
|
||||||
.init = &lzma_lzma_encoder_init,
|
.init = &lzma_lzma_encoder_init,
|
||||||
.options = (void *)(options),
|
.options = (void *)(options),
|
||||||
}, {
|
}, {
|
||||||
|
|
|
@ -162,8 +162,11 @@ typedef void (*lzma_end_function)(
|
||||||
/// an array of lzma_filter_info structures. This array is used with
|
/// an array of lzma_filter_info structures. This array is used with
|
||||||
/// lzma_next_filter_init to initialize the filter chain.
|
/// lzma_next_filter_init to initialize the filter chain.
|
||||||
struct lzma_filter_info_s {
|
struct lzma_filter_info_s {
|
||||||
/// Filter ID. This is used only by the encoder
|
/// Filter ID. This can be used to share the same initiazation
|
||||||
/// with lzma_filters_update().
|
/// function *and* data structures with different Filter IDs
|
||||||
|
/// (LZMA_FILTER_LZMA1EXT does it), and also by the encoder
|
||||||
|
/// with lzma_filters_update() if filter chain is updated
|
||||||
|
/// in the middle of a raw stream or Block (LZMA_SYNC_FLUSH).
|
||||||
lzma_vli id;
|
lzma_vli id;
|
||||||
|
|
||||||
/// Pointer to function used to initialize the filter.
|
/// Pointer to function used to initialize the filter.
|
||||||
|
|
|
@ -231,6 +231,7 @@ lzip_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
|
|
||||||
const lzma_filter_info filters[2] = {
|
const lzma_filter_info filters[2] = {
|
||||||
{
|
{
|
||||||
|
.id = LZMA_FILTER_LZMA1,
|
||||||
.init = &lzma_lzma_decoder_init,
|
.init = &lzma_lzma_decoder_init,
|
||||||
.options = &coder->options,
|
.options = &coder->options,
|
||||||
}, {
|
}, {
|
||||||
|
|
|
@ -95,6 +95,7 @@ microlzma_decode(void *coder_ptr, const lzma_allocator *allocator,
|
||||||
options.dict_size = coder->dict_size;
|
options.dict_size = coder->dict_size;
|
||||||
lzma_filter_info filters[2] = {
|
lzma_filter_info filters[2] = {
|
||||||
{
|
{
|
||||||
|
.id = LZMA_FILTER_LZMA1,
|
||||||
.init = &lzma_lzma_decoder_init,
|
.init = &lzma_lzma_decoder_init,
|
||||||
.options = &options,
|
.options = &options,
|
||||||
}, {
|
}, {
|
||||||
|
|
|
@ -116,6 +116,7 @@ microlzma_encoder_init(lzma_next_coder *next, const lzma_allocator *allocator,
|
||||||
// Initialize the LZMA encoder.
|
// Initialize the LZMA encoder.
|
||||||
const lzma_filter_info filters[2] = {
|
const lzma_filter_info filters[2] = {
|
||||||
{
|
{
|
||||||
|
.id = LZMA_FILTER_LZMA1,
|
||||||
.init = &lzma_lzma_encoder_init,
|
.init = &lzma_lzma_encoder_init,
|
||||||
.options = (void *)(options),
|
.options = (void *)(options),
|
||||||
}, {
|
}, {
|
||||||
|
|
|
@ -212,7 +212,8 @@ extern lzma_ret
|
||||||
lzma_lz_decoder_init(lzma_next_coder *next, const lzma_allocator *allocator,
|
lzma_lz_decoder_init(lzma_next_coder *next, const lzma_allocator *allocator,
|
||||||
const lzma_filter_info *filters,
|
const lzma_filter_info *filters,
|
||||||
lzma_ret (*lz_init)(lzma_lz_decoder *lz,
|
lzma_ret (*lz_init)(lzma_lz_decoder *lz,
|
||||||
const lzma_allocator *allocator, const void *options,
|
const lzma_allocator *allocator,
|
||||||
|
lzma_vli id, const void *options,
|
||||||
lzma_lz_options *lz_options))
|
lzma_lz_options *lz_options))
|
||||||
{
|
{
|
||||||
// Allocate the base structure if it isn't already allocated.
|
// Allocate the base structure if it isn't already allocated.
|
||||||
|
@ -236,7 +237,7 @@ lzma_lz_decoder_init(lzma_next_coder *next, const lzma_allocator *allocator,
|
||||||
// us the dictionary size.
|
// us the dictionary size.
|
||||||
lzma_lz_options lz_options;
|
lzma_lz_options lz_options;
|
||||||
return_if_error(lz_init(&coder->lz, allocator,
|
return_if_error(lz_init(&coder->lz, allocator,
|
||||||
filters[0].options, &lz_options));
|
filters[0].id, filters[0].options, &lz_options));
|
||||||
|
|
||||||
// If the dictionary size is very small, increase it to 4096 bytes.
|
// If the dictionary size is very small, increase it to 4096 bytes.
|
||||||
// This is to prevent constant wrapping of the dictionary, which
|
// This is to prevent constant wrapping of the dictionary, which
|
||||||
|
|
|
@ -87,7 +87,8 @@ extern lzma_ret lzma_lz_decoder_init(lzma_next_coder *next,
|
||||||
const lzma_allocator *allocator,
|
const lzma_allocator *allocator,
|
||||||
const lzma_filter_info *filters,
|
const lzma_filter_info *filters,
|
||||||
lzma_ret (*lz_init)(lzma_lz_decoder *lz,
|
lzma_ret (*lz_init)(lzma_lz_decoder *lz,
|
||||||
const lzma_allocator *allocator, const void *options,
|
const lzma_allocator *allocator,
|
||||||
|
lzma_vli id, const void *options,
|
||||||
lzma_lz_options *lz_options));
|
lzma_lz_options *lz_options));
|
||||||
|
|
||||||
extern uint64_t lzma_lz_decoder_memusage(size_t dictionary_size);
|
extern uint64_t lzma_lz_decoder_memusage(size_t dictionary_size);
|
||||||
|
|
|
@ -544,7 +544,8 @@ extern lzma_ret
|
||||||
lzma_lz_encoder_init(lzma_next_coder *next, const lzma_allocator *allocator,
|
lzma_lz_encoder_init(lzma_next_coder *next, const lzma_allocator *allocator,
|
||||||
const lzma_filter_info *filters,
|
const lzma_filter_info *filters,
|
||||||
lzma_ret (*lz_init)(lzma_lz_encoder *lz,
|
lzma_ret (*lz_init)(lzma_lz_encoder *lz,
|
||||||
const lzma_allocator *allocator, const void *options,
|
const lzma_allocator *allocator,
|
||||||
|
lzma_vli id, const void *options,
|
||||||
lzma_lz_options *lz_options))
|
lzma_lz_options *lz_options))
|
||||||
{
|
{
|
||||||
#if defined(HAVE_SMALL) && !defined(HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR)
|
#if defined(HAVE_SMALL) && !defined(HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR)
|
||||||
|
@ -585,7 +586,7 @@ lzma_lz_encoder_init(lzma_next_coder *next, const lzma_allocator *allocator,
|
||||||
// Initialize the LZ-based encoder.
|
// Initialize the LZ-based encoder.
|
||||||
lzma_lz_options lz_options;
|
lzma_lz_options lz_options;
|
||||||
return_if_error(lz_init(&coder->lz, allocator,
|
return_if_error(lz_init(&coder->lz, allocator,
|
||||||
filters[0].options, &lz_options));
|
filters[0].id, filters[0].options, &lz_options));
|
||||||
|
|
||||||
// Setup the size information into coder->mf and deallocate
|
// Setup the size information into coder->mf and deallocate
|
||||||
// old buffers if they have wrong size.
|
// old buffers if they have wrong size.
|
||||||
|
|
|
@ -311,7 +311,8 @@ extern lzma_ret lzma_lz_encoder_init(
|
||||||
lzma_next_coder *next, const lzma_allocator *allocator,
|
lzma_next_coder *next, const lzma_allocator *allocator,
|
||||||
const lzma_filter_info *filters,
|
const lzma_filter_info *filters,
|
||||||
lzma_ret (*lz_init)(lzma_lz_encoder *lz,
|
lzma_ret (*lz_init)(lzma_lz_encoder *lz,
|
||||||
const lzma_allocator *allocator, const void *options,
|
const lzma_allocator *allocator,
|
||||||
|
lzma_vli id, const void *options,
|
||||||
lzma_lz_options *lz_options));
|
lzma_lz_options *lz_options));
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -226,7 +226,8 @@ lzma2_decoder_end(void *coder_ptr, const lzma_allocator *allocator)
|
||||||
|
|
||||||
static lzma_ret
|
static lzma_ret
|
||||||
lzma2_decoder_init(lzma_lz_decoder *lz, const lzma_allocator *allocator,
|
lzma2_decoder_init(lzma_lz_decoder *lz, const lzma_allocator *allocator,
|
||||||
const void *opt, lzma_lz_options *lz_options)
|
lzma_vli id lzma_attribute((__unused__)), const void *opt,
|
||||||
|
lzma_lz_options *lz_options)
|
||||||
{
|
{
|
||||||
lzma_lzma2_coder *coder = lz->coder;
|
lzma_lzma2_coder *coder = lz->coder;
|
||||||
if (coder == NULL) {
|
if (coder == NULL) {
|
||||||
|
|
|
@ -310,7 +310,8 @@ lzma2_encoder_options_update(void *coder_ptr, const lzma_filter *filter)
|
||||||
|
|
||||||
static lzma_ret
|
static lzma_ret
|
||||||
lzma2_encoder_init(lzma_lz_encoder *lz, const lzma_allocator *allocator,
|
lzma2_encoder_init(lzma_lz_encoder *lz, const lzma_allocator *allocator,
|
||||||
const void *options, lzma_lz_options *lz_options)
|
lzma_vli id lzma_attribute((__unused__)), const void *options,
|
||||||
|
lzma_lz_options *lz_options)
|
||||||
{
|
{
|
||||||
if (options == NULL)
|
if (options == NULL)
|
||||||
return LZMA_PROG_ERROR;
|
return LZMA_PROG_ERROR;
|
||||||
|
|
|
@ -1014,7 +1014,7 @@ lzma_lzma_decoder_create(lzma_lz_decoder *lz, const lzma_allocator *allocator,
|
||||||
/// the LZ initialization).
|
/// the LZ initialization).
|
||||||
static lzma_ret
|
static lzma_ret
|
||||||
lzma_decoder_init(lzma_lz_decoder *lz, const lzma_allocator *allocator,
|
lzma_decoder_init(lzma_lz_decoder *lz, const lzma_allocator *allocator,
|
||||||
const void *options, lzma_lz_options *lz_options)
|
lzma_vli id, const void *options, lzma_lz_options *lz_options)
|
||||||
{
|
{
|
||||||
if (!is_lclppb_valid(options))
|
if (!is_lclppb_valid(options))
|
||||||
return LZMA_PROG_ERROR;
|
return LZMA_PROG_ERROR;
|
||||||
|
|
|
@ -680,7 +680,7 @@ lzma_lzma_encoder_create(void **coder_ptr,
|
||||||
|
|
||||||
static lzma_ret
|
static lzma_ret
|
||||||
lzma_encoder_init(lzma_lz_encoder *lz, const lzma_allocator *allocator,
|
lzma_encoder_init(lzma_lz_encoder *lz, const lzma_allocator *allocator,
|
||||||
const void *options, lzma_lz_options *lz_options)
|
lzma_vli id, const void *options, lzma_lz_options *lz_options)
|
||||||
{
|
{
|
||||||
lz->code = &lzma_encode;
|
lz->code = &lzma_encode;
|
||||||
lz->set_out_limit = &lzma_lzma_set_out_limit;
|
lz->set_out_limit = &lzma_lzma_set_out_limit;
|
||||||
|
|
Loading…
Reference in a new issue