From 8e4f5a8f53fcd078cc3ed2bb72cb304d55a173c2 Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin Date: Sat, 30 Apr 2011 00:35:55 -0400 Subject: merging the file list for autotools and the draft --- Makefile.am | 169 ++--------------------------------------------------- doc/build_draft.sh | 3 +- opus_sources.mk | 3 +- silk_sources.mk | 2 +- 4 files changed, 8 insertions(+), 169 deletions(-) diff --git a/Makefile.am b/Makefile.am index bfdc5f40..d3685ce0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,172 +2,11 @@ lib_LTLIBRARIES = libopus.la INCLUDES = -I$(top_srcdir)/libcelt -I$(top_srcdir)/silk -libopus_la_SOURCES = libcelt/bands.c \ -libcelt/celt.c \ -libcelt/cwrs.c \ -libcelt/entcode.c \ -libcelt/entdec.c \ -libcelt/entenc.c \ -libcelt/kiss_fft.c \ -libcelt/laplace.c \ -libcelt/mathops.c \ -libcelt/mdct.c \ -libcelt/modes.c \ -libcelt/pitch.c \ -libcelt/plc.c \ -libcelt/quant_bands.c \ -libcelt/rate.c \ -libcelt/vq.c +include celt_sources.mk +include silk_sources.mk +include opus_sources.mk -libopus_la_SOURCES += src/opus_decoder.c \ -src/opus_encoder.c -libopus_la_SOURCES += \ -silk/SKP_Silk_CNG.c \ -silk/SKP_Silk_code_signs.c \ -silk/SKP_Silk_create_init_destroy.c \ -silk/SKP_Silk_decode_core.c \ -silk/SKP_Silk_decode_frame.c \ -silk/SKP_Silk_decode_parameters.c \ -silk/SKP_Silk_decode_indices.c \ -silk/SKP_Silk_decode_pulses.c \ -silk/SKP_Silk_decoder_set_fs.c \ -silk/SKP_Silk_dec_API.c \ -silk/SKP_Silk_enc_API.c \ -silk/SKP_Silk_encode_indices.c \ -silk/SKP_Silk_encode_pulses.c \ -silk/SKP_Silk_gain_quant.c \ -silk/SKP_Silk_interpolate.c \ -silk/SKP_Silk_LP_variable_cutoff.c \ -silk/SKP_Silk_NLSF2A_stable.c \ -silk/SKP_Silk_NLSF_decode.c \ -silk/SKP_Silk_NSQ.c \ -silk/SKP_Silk_NSQ_del_dec.c \ -silk/SKP_Silk_PLC.c \ -silk/SKP_Silk_shell_coder.c \ -silk/SKP_Silk_tables_gain.c \ -silk/SKP_Silk_tables_LTP.c \ -silk/SKP_Silk_tables_NLSF_CB_NB_MB.c \ -silk/SKP_Silk_tables_NLSF_CB_WB.c \ -silk/SKP_Silk_tables_other.c \ -silk/SKP_Silk_tables_pitch_lag.c \ -silk/SKP_Silk_tables_pulses_per_block.c \ -silk/SKP_Silk_VAD.c \ -silk/SKP_Silk_control_audio_bandwidth.c \ -silk/SKP_Silk_quant_LTP_gains.c \ -silk/SKP_Silk_VQ_WMat_EC.c \ -silk/SKP_Silk_HP_variable_cutoff.c \ -silk/SKP_Silk_NLSF_encode.c \ -silk/SKP_Silk_NLSF_VQ.c \ -silk/SKP_Silk_NLSF_unpack.c \ -silk/SKP_Silk_NLSF_del_dec_quant.c \ -silk/SKP_Silk_process_NLSFs.c \ -silk/SKP_Silk_stereo_LR_to_MS.c \ -silk/SKP_Silk_stereo_MS_to_LR.c \ -silk/SKP_Silk_check_control_input.c \ -silk/SKP_Silk_control_SNR.c \ -silk/SKP_Silk_init_encoder.c \ -silk/SKP_Silk_control_codec.c \ -silk/SKP_Silk_A2NLSF.c \ -silk/SKP_Silk_ana_filt_bank_1.c \ -silk/SKP_Silk_apply_sine_window.c \ -silk/SKP_Silk_array_maxabs.c \ -silk/SKP_Silk_autocorr.c \ -silk/SKP_Silk_biquad_alt.c \ -silk/SKP_Silk_burg_modified.c \ -silk/SKP_Silk_bwexpander_32.c \ -silk/SKP_Silk_bwexpander.c \ -silk/SKP_Silk_debug.c \ -silk/SKP_Silk_decode_pitch.c \ -silk/SKP_Silk_inner_prod_aligned.c \ -silk/SKP_Silk_k2a.c \ -silk/SKP_Silk_k2a_Q16.c \ -silk/SKP_Silk_lin2log.c \ -silk/SKP_Silk_log2lin.c \ -silk/SKP_Silk_LPC_analysis_filter.c \ -silk/SKP_Silk_LPC_inv_pred_gain.c \ -silk/SKP_Silk_LPC_stabilize.c \ -silk/SKP_Silk_LPC_synthesis_filter.c \ -silk/SKP_Silk_LPC_synthesis_order16.c \ -silk/SKP_Silk_LSF_cos_table.c \ -silk/SKP_Silk_NLSF2A.c \ -silk/SKP_Silk_NLSF_stabilize.c \ -silk/SKP_Silk_NLSF_VQ_weights_laroia.c \ -silk/SKP_Silk_pitch_analysis_core.c \ -silk/SKP_Silk_pitch_est_tables.c \ -silk/SKP_Silk_resampler.c \ -silk/SKP_Silk_resampler_down2_3.c \ -silk/SKP_Silk_resampler_down2.c \ -silk/SKP_Silk_resampler_down3.c \ -silk/SKP_Silk_resampler_private_AR2.c \ -silk/SKP_Silk_resampler_private_ARMA4.c \ -silk/SKP_Silk_resampler_private_copy.c \ -silk/SKP_Silk_resampler_private_down4.c \ -silk/SKP_Silk_resampler_private_down_FIR.c \ -silk/SKP_Silk_resampler_private_IIR_FIR.c \ -silk/SKP_Silk_resampler_private_up2_HQ.c \ -silk/SKP_Silk_resampler_private_up4.c \ -silk/SKP_Silk_resampler_rom.c \ -silk/SKP_Silk_resampler_up2.c \ -silk/SKP_Silk_scale_copy_vector16.c \ -silk/SKP_Silk_scale_vector.c \ -silk/SKP_Silk_schur64.c \ -silk/SKP_Silk_schur.c \ -silk/SKP_Silk_sigm_Q15.c \ -silk/SKP_Silk_sort.c \ -silk/SKP_Silk_sum_sqr_shift.c \ -silk/SKP_Silk_autocorrelation_FLP.c \ -silk/SKP_Silk_burg_modified_FLP.c \ -silk/SKP_Silk_bwexpander_FLP.c \ -silk/SKP_Silk_energy_FLP.c \ -silk/SKP_Silk_inner_product_FLP.c \ -silk/SKP_Silk_k2a_FLP.c \ -silk/SKP_Silk_levinsondurbin_FLP.c \ -silk/SKP_Silk_LPC_inv_pred_gain_FLP.c \ -silk/SKP_Silk_pitch_analysis_core_FLP.c \ -silk/SKP_Silk_scale_copy_vector_FLP.c \ -silk/SKP_Silk_scale_vector_FLP.c \ -silk/SKP_Silk_schur_FLP.c \ -silk/SKP_Silk_sort_FLP.c - -if FIXED_POINT -libopus_la_SOURCES += \ -silk/fixed/SKP_Silk_LTP_analysis_filter_FIX.c \ -silk/fixed/SKP_Silk_LTP_scale_ctrl_FIX.c \ -silk/fixed/SKP_Silk_corrMatrix_FIX.c \ -silk/fixed/SKP_Silk_encode_frame_FIX.c \ -silk/fixed/SKP_Silk_find_LPC_FIX.c \ -silk/fixed/SKP_Silk_find_LTP_FIX.c \ -silk/fixed/SKP_Silk_find_pitch_lags_FIX.c \ -silk/fixed/SKP_Silk_find_pred_coefs_FIX.c \ -silk/fixed/SKP_Silk_noise_shape_analysis_FIX.c \ -silk/fixed/SKP_Silk_prefilter_FIX.c \ -silk/fixed/SKP_Silk_process_gains_FIX.c \ -silk/fixed/SKP_Silk_regularize_correlations_FIX.c \ -silk/fixed/SKP_Silk_residual_energy16_FIX.c \ -silk/fixed/SKP_Silk_residual_energy_FIX.c \ -silk/fixed/SKP_Silk_solve_LS_FIX.c \ -silk/fixed/SKP_Silk_warped_autocorrelation_FIX.c -else -libopus_la_SOURCES += \ -silk/float/SKP_Silk_apply_sine_window_FLP.c \ -silk/float/SKP_Silk_corrMatrix_FLP.c \ -silk/float/SKP_Silk_encode_frame_FLP.c \ -silk/float/SKP_Silk_find_LPC_FLP.c \ -silk/float/SKP_Silk_find_LTP_FLP.c \ -silk/float/SKP_Silk_find_pitch_lags_FLP.c \ -silk/float/SKP_Silk_find_pred_coefs_FLP.c \ -silk/float/SKP_Silk_LPC_analysis_filter_FLP.c \ -silk/float/SKP_Silk_LTP_analysis_filter_FLP.c \ -silk/float/SKP_Silk_LTP_scale_ctrl_FLP.c \ -silk/float/SKP_Silk_noise_shape_analysis_FLP.c \ -silk/float/SKP_Silk_prefilter_FLP.c \ -silk/float/SKP_Silk_process_gains_FLP.c \ -silk/float/SKP_Silk_regularize_correlations_FLP.c \ -silk/float/SKP_Silk_residual_energy_FLP.c \ -silk/float/SKP_Silk_solve_LS_FLP.c \ -silk/float/SKP_Silk_warped_autocorrelation_FLP.c \ -silk/float/SKP_Silk_wrappers_FLP.c -endif +libopus_la_SOURCES = $(CELT_SOURCES) $(SILK_SOURCES) $(OPUS_SOURCES) pkginclude_HEADERS = src/opus.h diff --git a/doc/build_draft.sh b/doc/build_draft.sh index a81a7062..29e90127 100755 --- a/doc/build_draft.sh +++ b/doc/build_draft.sh @@ -13,9 +13,10 @@ tar xzf ../tmp_draft.tar.gz cp ../Makefile.draft Makefile cp ../opus_sources.mk . cp ../celt_sources.mk . -cp ../silk_sources.mk . +cat ../silk_sources.mk | sed 's/^if /ifdef /' > silk_sources.mk cp ../README.draft README cp ../COPYING COPYING +cp ../src/test_opus.c src/ cd .. tar czf opus_source.tar.gz opus_source diff --git a/opus_sources.mk b/opus_sources.mk index 67e872f6..077d2117 100644 --- a/opus_sources.mk +++ b/opus_sources.mk @@ -1,3 +1,2 @@ OPUS_SOURCES = src/opus_decoder.c \ -src/opus_encoder.c \ -src/test_opus.c +src/opus_encoder.c diff --git a/silk_sources.mk b/silk_sources.mk index feb2d631..f4641d99 100644 --- a/silk_sources.mk +++ b/silk_sources.mk @@ -106,7 +106,7 @@ silk/SKP_Silk_scale_vector_FLP.c \ silk/SKP_Silk_schur_FLP.c \ silk/SKP_Silk_sort_FLP.c -ifdef FIXED_POINT +if FIXED_POINT SILK_SOURCES += \ silk/fixed/SKP_Silk_LTP_analysis_filter_FIX.c \ silk/fixed/SKP_Silk_LTP_scale_ctrl_FIX.c \ -- cgit v1.2.3