diff options
Diffstat (limited to 'src/libfaad')
| -rw-r--r-- | src/libfaad/Makefile.am | 102 | ||||
| -rw-r--r-- | src/libfaad/xine_faad_decoder.c | 11 |
2 files changed, 57 insertions, 56 deletions
diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am index d1a4ed865..379033b15 100644 --- a/src/libfaad/Makefile.am +++ b/src/libfaad/Makefile.am @@ -1,59 +1,11 @@ include $(top_srcdir)/misc/Makefile.common -SUBDIRS = codebook - -if BUILD_FAAD -faad_module = xineplug_decode_faad.la -endif - -xineplug_LTLIBRARIES = $(faad_module) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_LDFLAGS = $(xineplug_ldflags) VPATH = @srcdir@:@srcdir@/codebook: -xineplug_decode_faad_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -fno-strict-aliasing -xineplug_decode_faad_la_SOURCES = \ - bits.c \ - cfft.c \ - common.c \ - decoder.c \ - drc.c \ - drm_dec.c \ - error.c \ - filtbank.c \ - hcr.c \ - huffman.c \ - ic_predict.c \ - is.c \ - lt_predict.c \ - mdct.c \ - mp4.c \ - ms.c \ - output.c \ - pns.c \ - ps_dec.c \ - ps_syntax.c \ - pulse.c \ - rvlc.c \ - sbr_dct.c \ - sbr_dec.c \ - sbr_e_nf.c \ - sbr_fbt.c \ - sbr_hfadj.c \ - sbr_hfgen.c \ - sbr_huff.c \ - sbr_qmf.c \ - sbr_syntax.c \ - sbr_tf_grid.c \ - specrec.c \ - ssr.c \ - ssr_fb.c \ - ssr_ipqf.c \ - syntax.c \ - tns.c \ - xine_faad_decoder.c - -xineplug_decode_faad_la_LDFLAGS = $(xineplug_ldflags) -xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) +SUBDIRS = codebook noinst_HEADERS = \ analysis.h \ @@ -104,3 +56,51 @@ noinst_HEADERS = \ structs.h \ syntax.h \ tns.h + +if ENABLE_FAAD +xineplug_LTLIBRARIES = xineplug_decode_faad.la +endif + +xineplug_decode_faad_la_SOURCES = \ + bits.c \ + cfft.c \ + common.c \ + decoder.c \ + drc.c \ + drm_dec.c \ + error.c \ + filtbank.c \ + hcr.c \ + huffman.c \ + ic_predict.c \ + is.c \ + lt_predict.c \ + mdct.c \ + mp4.c \ + ms.c \ + output.c \ + pns.c \ + ps_dec.c \ + ps_syntax.c \ + pulse.c \ + rvlc.c \ + sbr_dct.c \ + sbr_dec.c \ + sbr_e_nf.c \ + sbr_fbt.c \ + sbr_hfadj.c \ + sbr_hfgen.c \ + sbr_huff.c \ + sbr_qmf.c \ + sbr_syntax.c \ + sbr_tf_grid.c \ + specrec.c \ + ssr.c \ + ssr_fb.c \ + ssr_ipqf.c \ + syntax.c \ + tns.c \ + xine_faad_decoder.c + +xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) +xineplug_decode_faad_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing diff --git a/src/libfaad/xine_faad_decoder.c b/src/libfaad/xine_faad_decoder.c index aa528a34d..169874a44 100644 --- a/src/libfaad/xine_faad_decoder.c +++ b/src/libfaad/xine_faad_decoder.c @@ -75,7 +75,6 @@ typedef struct faad_decoder_s { int bits_per_sample; unsigned char num_channels; int sbr; - uint32_t ao_cap_mode; int output_open; @@ -177,16 +176,18 @@ static int faad_open_dec( faad_decoder_t *this ) { } static int faad_open_output( faad_decoder_t *this ) { + int ao_cap_mode; + this->rec_audio_src_size = this->num_channels * FAAD_MIN_STREAMSIZE; switch( this->num_channels ) { case 1: - this->ao_cap_mode=AO_CAP_MODE_MONO; + ao_cap_mode=AO_CAP_MODE_MONO; break; case 6: if(this->stream->audio_out->get_capabilities(this->stream->audio_out) & AO_CAP_MODE_5_1CHANNEL) { - this->ao_cap_mode = AO_CAP_MODE_5_1CHANNEL; + ao_cap_mode = AO_CAP_MODE_5_1CHANNEL; break; } else { this->faac_cfg = NeAACDecGetCurrentConfiguration(this->faac_dec); @@ -195,7 +196,7 @@ static int faad_open_output( faad_decoder_t *this ) { this->num_channels = 2; } case 2: - this->ao_cap_mode=AO_CAP_MODE_STEREO; + ao_cap_mode=AO_CAP_MODE_STEREO; break; } @@ -203,7 +204,7 @@ static int faad_open_output( faad_decoder_t *this ) { this->stream, this->bits_per_sample, this->rate, - this->ao_cap_mode) ; + ao_cap_mode) ; return this->output_open; } |