claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

gate cpu-specific code with FLAC__NO_ASM

Browse Source
This commit is contained in:
Josh Coalson
2001-05-25 00:04:45 +00:00
parent febdca986a
commit a3f7c2c76c
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libFLAC/encoder.c
View File

@@ -21,7 +21,6 @@
#include <stdio.h>
#include <stdlib.h> /* for malloc() */
#include <string.h> /* for memcpy() */
#include "FLAC/config.h"
#include "FLAC/encoder.h"
#include "FLAC/seek_table.h"
#include "private/bitbuffer.h"
@@ -326,7 +325,8 @@ FLAC__EncoderState FLAC__encoder_init(FLAC__Encoder *encoder, FLAC__EncoderWrite
encoder->guts->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation;
encoder->guts->local_fixed_compute_best_predictor = FLAC__fixed_compute_best_predictor;
/* now override with asm where appropriate */
if(encoder->guts->cpuinfo.use_asm) {
#ifndef FLAC__NO_ASM
assert(encoder->guts->cpuinfo.use_asm);
#ifdef FLAC__CPU_IA32
assert(encoder->guts->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
#ifdef FLAC__HAS_NASM
@@ -344,7 +344,7 @@ fprintf(stderr,"@@@ got _asm_i386 of lpc_compute_autocorrelation()\n");
fprintf(stderr,"@@@ got _asm_i386_mmx_cmov of fixed_compute_best_predictor()\n");}
#endif
#endif
}
#endif
if(encoder->bits_per_sample + FLAC__bitmath_ilog2(encoder->blocksize)+1 > 30)
encoder->guts->use_slow = true;

5
src/libFLAC/stream_decoder.c
View File

@@ -167,7 +167,8 @@ FLAC__StreamDecoderState FLAC__stream_decoder_init(
/* first default to the non-asm routines */
decoder->guts->local_lpc_restore_signal = FLAC__lpc_restore_signal;
/* now override with asm where appropriate */
if(decoder->guts->cpuinfo.use_asm) {
#ifndef FLAC__NO_ASM
assert(decoder->guts->cpuinfo.use_asm);
#ifdef FLAC__CPU_IA32
assert(decoder->guts->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
#ifdef FLAC__HAS_NASM
@@ -181,7 +182,7 @@ fprintf(stderr,"@@@ got _asm_i386 of lpc_restore_signal()\n");
decoder->guts->local_lpc_restore_signal = FLAC__lpc_restore_signal_asm_i386;
#endif
#endif
}
#endif
return decoder->state;
}