Skip to content

Commit

Permalink
Merge pull request #26400 from akien-mga/opus-sources-list
Browse files Browse the repository at this point in the history 
opus: Better sync sources list with upstream buildsystem
  • Loading branch information
@akien-mga
akien-mga authored Feb 28, 2019
2 parents 996af80 + b09f3f9 commit 5a6bcff
Show file tree
Hide file tree
Showing 5 changed files with 157 additions and 3,874 deletions.
299 changes: 153 additions & 146 deletions modules/opus/SCsub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,187 +12,194 @@ if env['builtin_opus']:
thirdparty_dir = "#thirdparty/opus/"

thirdparty_sources = [
"silk/tables_other.c",
"silk/sum_sqr_shift.c",
"silk/PLC.c",
"silk/dec_API.c",
"silk/decode_pulses.c",
"silk/inner_prod_aligned.c",
"silk/init_encoder.c",
"silk/interpolate.c",
"silk/stereo_encode_pred.c",
"silk/decode_frame.c",
"silk/NLSF_del_dec_quant.c",
"silk/VAD.c",
"silk/resampler_private_AR2.c",
"silk/NLSF_unpack.c",
"silk/resampler_down2.c",
"silk/sort.c",
"silk/resampler_private_IIR_FIR.c",
"silk/resampler_down2_3.c",
"silk/resampler_private_up2_HQ.c",
"silk/tables_gain.c",
"silk/stereo_find_predictor.c",
"silk/stereo_quant_pred.c",
"silk/NLSF_stabilize.c",
"silk/ana_filt_bank_1.c",
"silk/check_control_input.c",
"silk/bwexpander.c",
"silk/A2NLSF.c",
"silk/LPC_inv_pred_gain.c",
"silk/log2lin.c",
"silk/process_NLSFs.c",
"silk/sigm_Q15.c",
"silk/VQ_WMat_EC.c",
"silk/quant_LTP_gains.c",
"silk/resampler_private_down_FIR.c",
"silk/NLSF_decode.c",
"silk/control_codec.c",
"silk/NLSF_VQ_weights_laroia.c",
"silk/decode_pitch.c",
"silk/stereo_decode_pred.c",
"silk/tables_pulses_per_block.c",

# Sync with opus_sources.mk
"opus.c",
"opus_decoder.c",
"opus_encoder.c",
"opus_multistream.c",
"opus_multistream_encoder.c",
"opus_multistream_decoder.c",
"repacketizer.c",

"analysis.c",
"mlp.c",
"mlp_data.c",

# Sync with libopusfile Makefile.am
"info.c",
"internal.c",
"opusfile.c",
"stream.c",

# Sync with celt_sources.mk
"celt/bands.c",
"celt/celt.c",
"celt/celt_encoder.c",
"celt/celt_decoder.c",
"celt/cwrs.c",
"celt/entcode.c",
"celt/entdec.c",
"celt/entenc.c",
"celt/kiss_fft.c",
"celt/laplace.c",
"celt/mathops.c",
"celt/mdct.c",
"celt/modes.c",
"celt/pitch.c",
"celt/celt_lpc.c",
"celt/quant_bands.c",
"celt/rate.c",
"celt/vq.c",
#"celt/arm/arm_celt_map.c",
#"celt/arm/armcpu.c",
#"celt/arm/celt_ne10_fft.c",
#"celt/arm/celt_ne10_mdct.c",
#"celt/arm/celt_neon_intr.c",

# Sync with silk_sources.mk
"silk/CNG.c",
"silk/code_signs.c",
"silk/init_decoder.c",
"silk/table_LSF_cos.c",
"silk/decode_core.c",
"silk/code_signs.c",
"silk/enc_API.c",
"silk/tables_LTP.c",
"silk/pitch_est_tables.c",
"silk/biquad_alt.c",
"silk/encode_indices.c",
"silk/tables_NLSF_CB_WB.c",
"silk/debug.c",
"silk/decode_frame.c",
"silk/decode_parameters.c",
"silk/tables_pitch_lag.c",
"silk/NLSF2A.c",
"silk/resampler.c",
"silk/decode_indices.c",
"silk/NLSF_VQ.c",
"silk/bwexpander_32.c",
"silk/tables_NLSF_CB_NB_MB.c",
"silk/decode_pulses.c",
"silk/decoder_set_fs.c",
"silk/dec_API.c",
"silk/enc_API.c",
"silk/encode_indices.c",
"silk/encode_pulses.c",
"silk/gain_quant.c",
"silk/interpolate.c",
"silk/LP_variable_cutoff.c",
"silk/NLSF_decode.c",
"silk/NSQ.c",
"silk/NSQ_del_dec.c",
"silk/control_SNR.c",
"silk/PLC.c",
"silk/shell_coder.c",
"silk/tables_gain.c",
"silk/tables_LTP.c",
"silk/tables_NLSF_CB_NB_MB.c",
"silk/tables_NLSF_CB_WB.c",
"silk/tables_other.c",
"silk/tables_pitch_lag.c",
"silk/tables_pulses_per_block.c",
"silk/VAD.c",
"silk/control_audio_bandwidth.c",
"silk/quant_LTP_gains.c",
"silk/VQ_WMat_EC.c",
"silk/HP_variable_cutoff.c",
"silk/NLSF_encode.c",
"silk/stereo_MS_to_LR.c",
"silk/NLSF_VQ.c",
"silk/NLSF_unpack.c",
"silk/NLSF_del_dec_quant.c",
"silk/process_NLSFs.c",
"silk/stereo_LR_to_MS.c",
"silk/HP_variable_cutoff.c",
"silk/stereo_MS_to_LR.c",
"silk/check_control_input.c",
"silk/control_SNR.c",
"silk/init_encoder.c",
"silk/control_codec.c",
"silk/A2NLSF.c",
"silk/ana_filt_bank_1.c",
"silk/biquad_alt.c",
"silk/bwexpander_32.c",
"silk/bwexpander.c",
"silk/debug.c",
"silk/decode_pitch.c",
"silk/inner_prod_aligned.c",
"silk/lin2log.c",
"silk/log2lin.c",
"silk/LPC_analysis_filter.c",
"silk/CNG.c",
"silk/decoder_set_fs.c",
"silk/LPC_inv_pred_gain.c",
"silk/table_LSF_cos.c",
"silk/NLSF2A.c",
"silk/NLSF_stabilize.c",
"silk/NLSF_VQ_weights_laroia.c",
"silk/pitch_est_tables.c",
"silk/resampler.c",
"silk/resampler_down2_3.c",
"silk/resampler_down2.c",
"silk/resampler_private_AR2.c",
"silk/resampler_private_down_FIR.c",
"silk/resampler_private_IIR_FIR.c",
"silk/resampler_private_up2_HQ.c",
"silk/resampler_rom.c",
"silk/control_audio_bandwidth.c",
"silk/lin2log.c",
"silk/LP_variable_cutoff.c",
"silk/NSQ.c",
"silk/gain_quant.c",
"celt/laplace.c",
"celt/vq.c",
"celt/quant_bands.c",
"celt/kiss_fft.c",
"celt/entcode.c",
"celt/entenc.c",
"celt/celt_lpc.c",
"celt/pitch.c",
"celt/rate.c",
"celt/mathops.c",
#"celt/arm/armcpu.c",
#"celt/arm/celt_neon_intr.c",
#"celt/arm/celt_ne10_mdct.c",
#"celt/arm/celt_ne10_fft.c",
#"celt/arm/arm_celt_map.c",
"celt/celt_encoder.c",
"celt/celt.c",
"celt/bands.c",
"celt/cwrs.c",
"celt/entdec.c",
"celt/celt_decoder.c",
"celt/mdct.c",
"celt/modes.c",
"repacketizer.c",
"mlp_data.c",
"opus_multistream.c",
"opusfile.c",
"opus_encoder.c",
"analysis.c",
"mlp.c",
"info.c",
"stream.c",
"opus_decoder.c",
"internal.c",
"wincerts.c",
"opus.c",
"opus_multistream_encoder.c",
"http.c",
"opus_multistream_decoder.c"
"silk/sigm_Q15.c",
"silk/sort.c",
"silk/sum_sqr_shift.c",
"silk/stereo_decode_pred.c",
"silk/stereo_encode_pred.c",
"silk/stereo_find_predictor.c",
"silk/stereo_quant_pred.c",
]

opus_sources_silk = []

if("opus_fixed_point" in env and env.opus_fixed_point == "yes"):
env_opus.Append(CFLAGS=["-DFIXED_POINT"])
opus_sources_silk = [
"silk/fixed/schur64_FIX.c",
"silk/fixed/residual_energy16_FIX.c",
"silk/fixed/LTP_analysis_filter_FIX.c",
"silk/fixed/LTP_scale_ctrl_FIX.c",
"silk/fixed/corrMatrix_FIX.c",
"silk/fixed/encode_frame_FIX.c",
"silk/fixed/regularize_correlations_FIX.c",
"silk/fixed/apply_sine_window_FIX.c",
"silk/fixed/solve_LS_FIX.c",
"silk/fixed/schur_FIX.c",
"silk/fixed/pitch_analysis_core_FIX.c",
"silk/fixed/noise_shape_analysis_FIX.c",
"silk/fixed/find_LPC_FIX.c",
"silk/fixed/find_LTP_FIX.c",
"silk/fixed/vector_ops_FIX.c",
"silk/fixed/autocorr_FIX.c",
"silk/fixed/warped_autocorrelation_FIX.c",
"silk/fixed/find_pitch_lags_FIX.c",
"silk/fixed/k2a_Q16_FIX.c",
"silk/fixed/LTP_scale_ctrl_FIX.c",
"silk/fixed/corrMatrix_FIX.c",
"silk/fixed/find_pred_coefs_FIX.c",
"silk/fixed/noise_shape_analysis_FIX.c",
"silk/fixed/prefilter_FIX.c",
"silk/fixed/find_LPC_FIX.c",
"silk/fixed/residual_energy_FIX.c",
"silk/fixed/process_gains_FIX.c",
"silk/fixed/LTP_analysis_filter_FIX.c",
"silk/fixed/k2a_FIX.c",
"silk/fixed/regularize_correlations_FIX.c",
"silk/fixed/residual_energy16_FIX.c",
"silk/fixed/residual_energy_FIX.c",
"silk/fixed/solve_LS_FIX.c",
"silk/fixed/warped_autocorrelation_FIX.c",
"silk/fixed/apply_sine_window_FIX.c",
"silk/fixed/autocorr_FIX.c",
"silk/fixed/burg_modified_FIX.c",
"silk/fixed/find_pred_coefs_FIX.c"
"silk/fixed/k2a_FIX.c",
"silk/fixed/k2a_Q16_FIX.c",
"silk/fixed/pitch_analysis_core_FIX.c",
"silk/fixed/vector_ops_FIX.c",
"silk/fixed/schur64_FIX.c",
"silk/fixed/schur_FIX.c",
]
else:
opus_sources_silk = [
"silk/float/LTP_scale_ctrl_FLP.c",
"silk/float/regularize_correlations_FLP.c",
"silk/float/apply_sine_window_FLP.c",
"silk/float/corrMatrix_FLP.c",
"silk/float/encode_frame_FLP.c",
"silk/float/find_LPC_FLP.c",
"silk/float/find_LTP_FLP.c",
"silk/float/find_pitch_lags_FLP.c",
"silk/float/find_pred_coefs_FLP.c",
"silk/float/LPC_analysis_filter_FLP.c",
"silk/float/levinsondurbin_FLP.c",
"silk/float/schur_FLP.c",
"silk/float/scale_vector_FLP.c",
"silk/float/apply_sine_window_FLP.c",
"silk/float/pitch_analysis_core_FLP.c",
"silk/float/wrappers_FLP.c",
"silk/float/bwexpander_FLP.c",
"silk/float/warped_autocorrelation_FLP.c",
"silk/float/LTP_analysis_filter_FLP.c",
"silk/float/LTP_scale_ctrl_FLP.c",
"silk/float/noise_shape_analysis_FLP.c",
"silk/float/prefilter_FLP.c",
"silk/float/process_gains_FLP.c",
"silk/float/regularize_correlations_FLP.c",
"silk/float/residual_energy_FLP.c",
"silk/float/solve_LS_FLP.c",
"silk/float/find_LPC_FLP.c",
"silk/float/warped_autocorrelation_FLP.c",
"silk/float/wrappers_FLP.c",
"silk/float/autocorrelation_FLP.c",
"silk/float/find_pred_coefs_FLP.c",
"silk/float/find_pitch_lags_FLP.c",
"silk/float/burg_modified_FLP.c",
"silk/float/find_LTP_FLP.c",
"silk/float/bwexpander_FLP.c",
"silk/float/energy_FLP.c",
"silk/float/sort_FLP.c",
"silk/float/LPC_inv_pred_gain_FLP.c",
"silk/float/k2a_FLP.c",
"silk/float/noise_shape_analysis_FLP.c",
"silk/float/inner_product_FLP.c",
"silk/float/process_gains_FLP.c",
"silk/float/encode_frame_FLP.c",
"silk/float/k2a_FLP.c",
"silk/float/levinsondurbin_FLP.c",
"silk/float/LPC_inv_pred_gain_FLP.c",
"silk/float/pitch_analysis_core_FLP.c",
"silk/float/scale_copy_vector_FLP.c",
"silk/float/residual_energy_FLP.c",
"silk/float/LTP_analysis_filter_FLP.c",
"silk/float/prefilter_FLP.c"
"silk/float/scale_vector_FLP.c",
"silk/float/schur_FLP.c",
"silk/float/sort_FLP.c",
]

thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources + opus_sources_silk]
Expand Down
6 changes: 4 additions & 2 deletions thirdparty/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,11 @@ Files extracted from the upstream source:

Files extracted from upstream source:

- all .c and .h files in src/ (both opus and opusfile),
except `opus_demo.c`
- all .c and .h files in src/ (both opus and opusfile)
- all .h files in include/ (both opus and opusfile) as opus/
- remove unused `opus_demo.c`,
- remove `http.c`, `wincerts.c` and `winerrno.h` (part of
unused libopusurl)
- celt/ and silk/ subfolders
- COPYING

Expand Down
Loading

0 comments on commit 5a6bcff

Please sign in to comment.