Add FLAC__ prefix to precompute_partition_info_sums....
authorErik de Castro Lopo <erikd@mega-nerd.com>
Tue, 7 Jan 2014 10:14:55 +0000 (21:14 +1100)
committerErik de Castro Lopo <erikd@mega-nerd.com>
Tue, 7 Jan 2014 10:27:00 +0000 (21:27 +1100)
Most non-static functions have FLAC__ prefix, but they were missing
from the precompute_partition_info_sums_* functions.

Patch-from: lvqcl <lvqcl.mail@gmail.com>

src/libFLAC/ia32/stream_encoder_asm.nasm
src/libFLAC/include/private/stream_encoder.h
src/libFLAC/stream_encoder.c
src/libFLAC/stream_encoder_intrin_sse2.c
src/libFLAC/stream_encoder_intrin_ssse3.c

index dc95242..4cbcc44 100644 (file)
 
        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[]
index 3b1c82a..ee7d978 100644 (file)
 #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
 
index 5129b27..191d0f2 100644 (file)
@@ -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
index 406ae73..ac2e69f 100644 (file)
@@ -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;
index 15f9ff0..35f3b23 100644 (file)
@@ -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;