From 5200d52515328dbd76d6c4555c88bf6e960351e2 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Fri, 23 Feb 2001 21:08:04 +0000 Subject: [PATCH] add padding argument --- src/flac/encode.c | 21 +++++++++++---------- src/flac/encode.h | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/flac/encode.c b/src/flac/encode.c index a57696a..be7caf0 100644 --- a/src/flac/encode.c +++ b/src/flac/encode.c @@ -82,7 +82,7 @@ static int32 *input[FLAC__MAX_CHANNELS]; /* local routines */ static bool init(encoder_wrapper_struct *encoder_wrapper); -static bool init_encoder(bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, unsigned channels, unsigned bps, unsigned sample_rate, encoder_wrapper_struct *encoder_wrapper); +static bool init_encoder(bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, unsigned channels, unsigned bps, unsigned sample_rate, unsigned padding, encoder_wrapper_struct *encoder_wrapper); static void format_input(unsigned wide_samples, bool is_big_endian, bool is_unsigned_samples, unsigned channels, unsigned bps, encoder_wrapper_struct *encoder_wrapper); static FLAC__EncoderWriteStatus write_callback(const FLAC__Encoder *encoder, const byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data); static void metadata_callback(const FLAC__Encoder *encoder, const FLAC__StreamMetaData *metadata, void *client_data); @@ -94,7 +94,7 @@ static void print_stats(const encoder_wrapper_struct *encoder_wrapper); static bool read_little_endian_uint16(FILE *f, uint16 *val, bool eof_ok); static bool read_little_endian_uint32(FILE *f, uint32 *val, bool eof_ok); -int encode_wav(const char *infile, const char *outfile, bool verbose, uint64 skip, bool verify, bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision) +int encode_wav(const char *infile, const char *outfile, bool verbose, uint64 skip, bool verify, bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, unsigned padding) { encoder_wrapper_struct encoder_wrapper; FILE *fin; @@ -246,7 +246,7 @@ int encode_wav(const char *infile, const char *outfile, bool verbose, uint64 ski encoder_wrapper.total_samples_to_encode = data_bytes / bytes_per_wide_sample - skip; encoder_wrapper.unencoded_size = encoder_wrapper.total_samples_to_encode * bytes_per_wide_sample + 44; /* 44 for the size of the WAV headers */ - if(!init_encoder(lax, do_mid_side, loose_mid_side, do_exhaustive_model_search, do_qlp_coeff_prec_search, rice_optimization_level, max_lpc_order, blocksize, qlp_coeff_precision, channels, bps, sample_rate, &encoder_wrapper)) + if(!init_encoder(lax, do_mid_side, loose_mid_side, do_exhaustive_model_search, do_qlp_coeff_prec_search, rice_optimization_level, max_lpc_order, blocksize, qlp_coeff_precision, channels, bps, sample_rate, padding, &encoder_wrapper)) goto wav_abort_; encoder_wrapper.verify_fifo.into_frames = true; @@ -323,7 +323,7 @@ wav_abort_: return 1; } -int encode_raw(const char *infile, const char *outfile, bool verbose, uint64 skip, bool verify, bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, bool is_big_endian, bool is_unsigned_samples, unsigned channels, unsigned bps, unsigned sample_rate) +int encode_raw(const char *infile, const char *outfile, bool verbose, uint64 skip, bool verify, bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, unsigned padding, bool is_big_endian, bool is_unsigned_samples, unsigned channels, unsigned bps, unsigned sample_rate) { encoder_wrapper_struct encoder_wrapper; FILE *fin; @@ -399,7 +399,7 @@ int encode_raw(const char *infile, const char *outfile, bool verbose, uint64 ski fseek(fin, 0, SEEK_SET); } - if(!init_encoder(lax, do_mid_side, loose_mid_side, do_exhaustive_model_search, do_qlp_coeff_prec_search, rice_optimization_level, max_lpc_order, blocksize, qlp_coeff_precision, channels, bps, sample_rate, &encoder_wrapper)) + if(!init_encoder(lax, do_mid_side, loose_mid_side, do_exhaustive_model_search, do_qlp_coeff_prec_search, rice_optimization_level, max_lpc_order, blocksize, qlp_coeff_precision, channels, bps, sample_rate, padding, &encoder_wrapper)) goto raw_abort_; encoder_wrapper.verify_fifo.into_frames = true; @@ -487,7 +487,7 @@ bool init(encoder_wrapper_struct *encoder_wrapper) return true; } -bool init_encoder(bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, unsigned channels, unsigned bps, unsigned sample_rate, encoder_wrapper_struct *encoder_wrapper) +bool init_encoder(bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, unsigned channels, unsigned bps, unsigned sample_rate, unsigned padding, encoder_wrapper_struct *encoder_wrapper) { if(channels != 2 || bps > 16) do_mid_side = loose_mid_side = false; @@ -532,6 +532,7 @@ bool init_encoder(bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhau encoder_wrapper->encoder->do_qlp_coeff_prec_search = do_qlp_coeff_prec_search; encoder_wrapper->encoder->rice_optimization_level = rice_optimization_level; encoder_wrapper->encoder->total_samples_estimate = encoder_wrapper->total_samples_to_encode; + encoder_wrapper->encoder->padding = padding; if(FLAC__encoder_init(encoder_wrapper->encoder, write_callback, metadata_callback, encoder_wrapper) != FLAC__ENCODER_OK) { fprintf(stderr, "ERROR initializing encoder, state = %d\n", encoder_wrapper->encoder->state); @@ -627,9 +628,9 @@ void metadata_callback(const FLAC__Encoder *encoder, const FLAC__StreamMetaData encoder_wrapper_struct *encoder_wrapper = (encoder_wrapper_struct *)client_data; byte b; FILE *f; - const uint64 samples = metadata->data.encoding.total_samples; - const unsigned min_framesize = metadata->data.encoding.min_framesize; - const unsigned max_framesize = metadata->data.encoding.max_framesize; + const uint64 samples = metadata->data.stream_info.total_samples; + const unsigned min_framesize = metadata->data.stream_info.min_framesize; + const unsigned max_framesize = metadata->data.stream_info.max_framesize; (void)encoder; /* silence compiler warning about unused parameter */ @@ -646,7 +647,7 @@ void metadata_callback(const FLAC__Encoder *encoder, const FLAC__StreamMetaData */ if(-1 == fseek(f, 26, SEEK_SET)) goto samples_; - fwrite(metadata->data.encoding.md5sum, 1, 16, f); + fwrite(metadata->data.stream_info.md5sum, 1, 16, f); samples_: if(-1 == fseek(f, 21, SEEK_SET)) goto framesize_; diff --git a/src/flac/encode.h b/src/flac/encode.h index 41ffa44..5b146d0b 100644 --- a/src/flac/encode.h +++ b/src/flac/encode.h @@ -21,7 +21,7 @@ #include "FLAC/ordinals.h" -int encode_wav(const char *infile, const char *outfile, bool verbose, uint64 skip, bool verify, bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision); -int encode_raw(const char *infile, const char *outfile, bool verbose, uint64 skip, bool verify, bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, bool is_big_endian, bool is_unsigned_samples, unsigned channels, unsigned bps, unsigned sample_rate); +int encode_wav(const char *infile, const char *outfile, bool verbose, uint64 skip, bool verify, bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, unsigned padding); +int encode_raw(const char *infile, const char *outfile, bool verbose, uint64 skip, bool verify, bool lax, bool do_mid_side, bool loose_mid_side, bool do_exhaustive_model_search, bool do_qlp_coeff_prec_search, unsigned rice_optimization_level, unsigned max_lpc_order, unsigned blocksize, unsigned qlp_coeff_precision, unsigned padding, bool is_big_endian, bool is_unsigned_samples, unsigned channels, unsigned bps, unsigned sample_rate); #endif -- 2.7.4