diff options
| -rw-r--r-- | src/libFLAC/ia32/stream_encoder_asm.nasm | 5 | ||||
| -rw-r--r-- | src/libFLAC/include/private/stream_encoder.h | 4 | ||||
| -rw-r--r-- | src/libFLAC/stream_encoder.c | 12 | ||||
| -rw-r--r-- | src/libFLAC/stream_encoder_intrin_sse2.c | 2 | ||||
| -rw-r--r-- | src/libFLAC/stream_encoder_intrin_ssse3.c | 2 |
5 files changed, 12 insertions, 13 deletions
diff --git a/src/libFLAC/ia32/stream_encoder_asm.nasm b/src/libFLAC/ia32/stream_encoder_asm.nasm index dc952424..4cbcc44a 100644 --- a/src/libFLAC/ia32/stream_encoder_asm.nasm +++ b/src/libFLAC/ia32/stream_encoder_asm.nasm @@ -35,14 +35,13 @@ data_section -cglobal precompute_partition_info_sums_32bit_asm_ia32_ +cglobal FLAC__precompute_partition_info_sums_32bit_asm_ia32_ code_section ; ********************************************************************** ; -; void FLAC__bool FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter) ; void precompute_partition_info_sums_32bit_( ; const FLAC__int32 residual[], ; FLAC__uint64 abs_residual_partition_sums[], @@ -53,7 +52,7 @@ cglobal precompute_partition_info_sums_32bit_asm_ia32_ ; ) ; ALIGN 16 -cident precompute_partition_info_sums_32bit_asm_ia32_ +cident FLAC__precompute_partition_info_sums_32bit_asm_ia32_ ;; peppered throughout the code at major checkpoints are keys like this as to where things are at that point in time ;; [esp + 4] const FLAC__int32 residual[] diff --git a/src/libFLAC/include/private/stream_encoder.h b/src/libFLAC/include/private/stream_encoder.h index 3b1c82a7..ee7d9788 100644 --- a/src/libFLAC/include/private/stream_encoder.h +++ b/src/libFLAC/include/private/stream_encoder.h @@ -41,11 +41,11 @@ #include "share/compat.h" #include "FLAC/format.h" -extern void precompute_partition_info_sums_intrin_sse2(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], +extern void FLAC__precompute_partition_info_sums_intrin_sse2(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], unsigned residual_samples, unsigned predictor_order, unsigned min_partition_order, unsigned max_partition_order, unsigned bps); #ifdef FLAC__SSSE3_SUPPORTED -extern void precompute_partition_info_sums_intrin_ssse3(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], +extern void FLAC__precompute_partition_info_sums_intrin_ssse3(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], unsigned residual_samples, unsigned predictor_order, unsigned min_partition_order, unsigned max_partition_order, unsigned bps); #endif diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c index 5129b271..191d0f20 100644 --- a/src/libFLAC/stream_encoder.c +++ b/src/libFLAC/stream_encoder.c @@ -952,18 +952,18 @@ static FLAC__StreamEncoderInitStatus init_stream_internal_( # if defined FLAC__CPU_IA32 # ifdef FLAC__SSSE3_SUPPORTED if(encoder->private_->cpuinfo.ia32.ssse3) - encoder->private_->local_precompute_partition_info_sums = precompute_partition_info_sums_intrin_ssse3; + encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_ssse3; else # endif if(encoder->private_->cpuinfo.ia32.sse2) - encoder->private_->local_precompute_partition_info_sums = precompute_partition_info_sums_intrin_sse2; + encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_sse2; # elif defined FLAC__CPU_X86_64 # ifdef FLAC__SSSE3_SUPPORTED if(encoder->private_->cpuinfo.x86_64.ssse3) - encoder->private_->local_precompute_partition_info_sums = precompute_partition_info_sums_intrin_ssse3; + encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_ssse3; else # endif - encoder->private_->local_precompute_partition_info_sums = precompute_partition_info_sums_intrin_sse2; + encoder->private_->local_precompute_partition_info_sums = FLAC__precompute_partition_info_sums_intrin_sse2; # endif /* FLAC__CPU_... */ } #endif /* !FLAC__NO_ASM && FLAC__HAS_X86INTRIN */ @@ -3794,7 +3794,7 @@ unsigned find_best_partition_order_( } #if defined(FLAC__CPU_IA32) && !defined FLAC__NO_ASM && defined FLAC__HAS_NASM && 0 -extern void precompute_partition_info_sums_32bit_asm_ia32_( +extern void FLAC__precompute_partition_info_sums_32bit_asm_ia32_( const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], unsigned blocksize, @@ -3823,7 +3823,7 @@ void precompute_partition_info_sums_( /* slightly pessimistic but still catches all common cases */ /* WATCHOUT: "+ bps" is an assumption that the average residual magnitude will not be more than "bps" bits */ if(bps <= 16) { - precompute_partition_info_sums_32bit_asm_ia32_(residual, abs_residual_partition_sums, residual_samples + predictor_order, predictor_order, min_partition_order, max_partition_order); + FLAC__precompute_partition_info_sums_32bit_asm_ia32_(residual, abs_residual_partition_sums, residual_samples + predictor_order, predictor_order, min_partition_order, max_partition_order); return; } #endif diff --git a/src/libFLAC/stream_encoder_intrin_sse2.c b/src/libFLAC/stream_encoder_intrin_sse2.c index 406ae733..ac2e69f7 100644 --- a/src/libFLAC/stream_encoder_intrin_sse2.c +++ b/src/libFLAC/stream_encoder_intrin_sse2.c @@ -42,7 +42,7 @@ #include "FLAC/assert.h" #include "private/stream_encoder.h" -void precompute_partition_info_sums_intrin_sse2(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], +void FLAC__precompute_partition_info_sums_intrin_sse2(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], unsigned residual_samples, unsigned predictor_order, unsigned min_partition_order, unsigned max_partition_order, unsigned bps) { const unsigned default_partition_samples = (residual_samples + predictor_order) >> max_partition_order; diff --git a/src/libFLAC/stream_encoder_intrin_ssse3.c b/src/libFLAC/stream_encoder_intrin_ssse3.c index 15f9ff01..35f3b23a 100644 --- a/src/libFLAC/stream_encoder_intrin_ssse3.c +++ b/src/libFLAC/stream_encoder_intrin_ssse3.c @@ -45,7 +45,7 @@ #include "FLAC/assert.h" #include "private/stream_encoder.h" -void precompute_partition_info_sums_intrin_ssse3(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], +void FLAC__precompute_partition_info_sums_intrin_ssse3(const FLAC__int32 residual[], FLAC__uint64 abs_residual_partition_sums[], unsigned residual_samples, unsigned predictor_order, unsigned min_partition_order, unsigned max_partition_order, unsigned bps) { const unsigned default_partition_samples = (residual_samples + predictor_order) >> max_partition_order; |