From 36e1ad9b5d1e9a33caedb9809663249d1c9c125c Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Mon, 7 Nov 2011 15:27:11 +0000 Subject: [PATCH] Restructuring and removing ilbc_test.gypi. According to project structure discussed with Andrew. We want to flatten out the hierarchy and minimize the number of GYP files. No changes at all are being made in the source files; they are just moved. The only modified files are the GYP file and Android.mk Kevin: I updated relative paths in Android.mk so please verify it is correct, since I don't know how to build that. Review URL: http://webrtc-codereview.appspot.com/256006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@894 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_coding/codecs/iLBC/ilbc_test.gypi | 32 ------------------- .../{iLBC/main/source => ilbc}/Android.mk | 7 ++-- .../{iLBC/main/source => ilbc}/abs_quant.c | 0 .../{iLBC/main/source => ilbc}/abs_quant.h | 0 .../main/source => ilbc}/abs_quant_loop.c | 0 .../main/source => ilbc}/abs_quant_loop.h | 0 .../main/source => ilbc}/augmented_cb_corr.c | 0 .../main/source => ilbc}/augmented_cb_corr.h | 0 .../{iLBC/main/source => ilbc}/bw_expand.c | 0 .../{iLBC/main/source => ilbc}/bw_expand.h | 0 .../{iLBC/main/source => ilbc}/cb_construct.c | 0 .../{iLBC/main/source => ilbc}/cb_construct.h | 0 .../main/source => ilbc}/cb_mem_energy.c | 0 .../main/source => ilbc}/cb_mem_energy.h | 0 .../cb_mem_energy_augmentation.c | 0 .../cb_mem_energy_augmentation.h | 0 .../main/source => ilbc}/cb_mem_energy_calc.c | 0 .../main/source => ilbc}/cb_mem_energy_calc.h | 0 .../{iLBC/main/source => ilbc}/cb_search.c | 0 .../{iLBC/main/source => ilbc}/cb_search.h | 0 .../main/source => ilbc}/cb_search_core.c | 0 .../main/source => ilbc}/cb_search_core.h | 0 .../source => ilbc}/cb_update_best_index.c | 0 .../source => ilbc}/cb_update_best_index.h | 0 .../{iLBC/main/source => ilbc}/chebyshev.c | 0 .../{iLBC/main/source => ilbc}/chebyshev.h | 0 .../{iLBC/main/source => ilbc}/comp_corr.c | 0 .../{iLBC/main/source => ilbc}/comp_corr.h | 0 .../main/source => ilbc}/complexityMeasures.m | 0 .../{iLBC/main/source => ilbc}/constants.c | 0 .../{iLBC/main/source => ilbc}/constants.h | 0 .../source => ilbc}/create_augmented_vec.c | 0 .../source => ilbc}/create_augmented_vec.h | 0 .../{iLBC/main/source => ilbc}/decode.c | 0 .../{iLBC/main/source => ilbc}/decode.h | 0 .../main/source => ilbc}/decode_residual.c | 0 .../main/source => ilbc}/decode_residual.h | 0 .../source => ilbc}/decoder_interpolate_lsf.c | 0 .../source => ilbc}/decoder_interpolate_lsf.h | 0 .../{iLBC/main/source => ilbc}/defines.h | 0 .../{iLBC/main/source => ilbc}/do_plc.c | 0 .../{iLBC/main/source => ilbc}/do_plc.h | 0 .../main => ilbc}/documentation/rfc3951.txt | 0 .../main => ilbc}/documentation/rfc3952.txt | 0 .../{iLBC/main/source => ilbc}/encode.c | 0 .../{iLBC/main/source => ilbc}/encode.h | 0 .../main/source => ilbc}/energy_inverse.c | 0 .../main/source => ilbc}/energy_inverse.h | 0 .../{iLBC/main/source => ilbc}/enh_upsample.c | 0 .../{iLBC/main/source => ilbc}/enh_upsample.h | 0 .../{iLBC/main/source => ilbc}/enhancer.c | 0 .../{iLBC/main/source => ilbc}/enhancer.h | 0 .../main/source => ilbc}/enhancer_interface.c | 0 .../main/source => ilbc}/enhancer_interface.h | 0 .../main/source => ilbc}/filtered_cb_vecs.c | 0 .../main/source => ilbc}/filtered_cb_vecs.h | 0 .../main/source => ilbc}/frame_classify.c | 0 .../main/source => ilbc}/frame_classify.h | 0 .../{iLBC/main/source => ilbc}/gain_dequant.c | 0 .../{iLBC/main/source => ilbc}/gain_dequant.h | 0 .../{iLBC/main/source => ilbc}/gain_quant.c | 0 .../{iLBC/main/source => ilbc}/gain_quant.h | 0 .../{iLBC/main/source => ilbc}/get_cd_vec.c | 0 .../{iLBC/main/source => ilbc}/get_cd_vec.h | 0 .../{iLBC/main/source => ilbc}/get_lsp_poly.c | 0 .../{iLBC/main/source => ilbc}/get_lsp_poly.h | 0 .../{iLBC/main/source => ilbc}/get_sync_seq.c | 0 .../{iLBC/main/source => ilbc}/get_sync_seq.h | 0 .../{iLBC/main/source => ilbc}/hp_input.c | 0 .../{iLBC/main/source => ilbc}/hp_input.h | 0 .../{iLBC/main/source => ilbc}/hp_output.c | 0 .../{iLBC/main/source => ilbc}/hp_output.h | 0 .../codecs/{iLBC/main/source => ilbc}/ilbc.c | 0 .../{iLBC/main/source => ilbc}/ilbc.gypi | 28 ++++++++++++---- .../main/source => ilbc}/index_conv_dec.c | 0 .../main/source => ilbc}/index_conv_dec.h | 0 .../main/source => ilbc}/index_conv_enc.c | 0 .../main/source => ilbc}/index_conv_enc.h | 0 .../{iLBC/main/source => ilbc}/init_decode.c | 0 .../{iLBC/main/source => ilbc}/init_decode.h | 0 .../{iLBC/main/source => ilbc}/init_encode.c | 0 .../{iLBC/main/source => ilbc}/init_encode.h | 0 .../{iLBC/main => ilbc}/interface/ilbc.h | 0 .../{iLBC/main/source => ilbc}/interpolate.c | 0 .../{iLBC/main/source => ilbc}/interpolate.h | 0 .../source => ilbc}/interpolate_samples.c | 0 .../source => ilbc}/interpolate_samples.h | 0 .../{iLBC/main/source => ilbc}/lpc_encode.c | 0 .../{iLBC/main/source => ilbc}/lpc_encode.h | 0 .../{iLBC/main/source => ilbc}/lsf_check.c | 0 .../{iLBC/main/source => ilbc}/lsf_check.h | 0 .../lsf_interpolate_to_poly_dec.c | 0 .../lsf_interpolate_to_poly_dec.h | 0 .../lsf_interpolate_to_poly_enc.c | 0 .../lsf_interpolate_to_poly_enc.h | 0 .../{iLBC/main/source => ilbc}/lsf_to_lsp.c | 0 .../{iLBC/main/source => ilbc}/lsf_to_lsp.h | 0 .../{iLBC/main/source => ilbc}/lsf_to_poly.c | 0 .../{iLBC/main/source => ilbc}/lsf_to_poly.h | 0 .../{iLBC/main/source => ilbc}/lsp_to_lsf.c | 0 .../{iLBC/main/source => ilbc}/lsp_to_lsf.h | 0 .../{iLBC/main/source => ilbc}/my_corr.c | 0 .../{iLBC/main/source => ilbc}/my_corr.h | 0 .../main/source => ilbc}/nearest_neighbor.c | 0 .../main/source => ilbc}/nearest_neighbor.h | 0 .../{iLBC/main/source => ilbc}/pack_bits.c | 0 .../{iLBC/main/source => ilbc}/pack_bits.h | 0 .../{iLBC/main/source => ilbc}/poly_to_lsf.c | 0 .../{iLBC/main/source => ilbc}/poly_to_lsf.h | 0 .../{iLBC/main/source => ilbc}/poly_to_lsp.c | 0 .../{iLBC/main/source => ilbc}/poly_to_lsp.h | 0 .../{iLBC/main/source => ilbc}/refiner.c | 0 .../{iLBC/main/source => ilbc}/refiner.h | 0 .../source => ilbc}/simple_interpolate_lsf.c | 0 .../source => ilbc}/simple_interpolate_lsf.h | 0 .../source => ilbc}/simple_lpc_analysis.c | 0 .../source => ilbc}/simple_lpc_analysis.h | 0 .../main/source => ilbc}/simple_lsf_dequant.c | 0 .../main/source => ilbc}/simple_lsf_dequant.h | 0 .../main/source => ilbc}/simple_lsf_quant.c | 0 .../main/source => ilbc}/simple_lsf_quant.h | 0 .../{iLBC/main/source => ilbc}/smooth.c | 0 .../{iLBC/main/source => ilbc}/smooth.h | 0 .../main/source => ilbc}/smooth_out_data.c | 0 .../main/source => ilbc}/smooth_out_data.h | 0 .../{iLBC/main/source => ilbc}/sort_sq.c | 0 .../{iLBC/main/source => ilbc}/sort_sq.h | 0 .../{iLBC/main/source => ilbc}/split_vq.c | 0 .../{iLBC/main/source => ilbc}/split_vq.h | 0 .../main/source => ilbc}/state_construct.c | 0 .../main/source => ilbc}/state_construct.h | 0 .../{iLBC/main/source => ilbc}/state_search.c | 0 .../{iLBC/main/source => ilbc}/state_search.h | 0 .../{iLBC/main/source => ilbc}/swap_bytes.c | 0 .../{iLBC/main/source => ilbc}/swap_bytes.h | 0 .../{iLBC/main => ilbc}/test/Android.mk | 8 ++--- .../{iLBC/main => ilbc}/test/iLBC_test.c | 0 .../{iLBC/main => ilbc}/test/iLBC_testLib.c | 0 .../main => ilbc}/test/iLBC_testprogram.c | 0 .../main => ilbc}/test/iLBCtestscript.txt | 0 .../{iLBC/main/source => ilbc}/unpack_bits.c | 0 .../{iLBC/main/source => ilbc}/unpack_bits.h | 0 .../codecs/{iLBC/main/source => ilbc}/vq3.c | 0 .../codecs/{iLBC/main/source => ilbc}/vq3.h | 0 .../codecs/{iLBC/main/source => ilbc}/vq4.c | 0 .../codecs/{iLBC/main/source => ilbc}/vq4.h | 0 .../{iLBC/main/source => ilbc}/window32_w32.c | 0 .../{iLBC/main/source => ilbc}/window32_w32.h | 0 .../{iLBC/main/source => ilbc}/xcorr_coef.c | 0 .../{iLBC/main/source => ilbc}/xcorr_coef.h | 0 src/modules/modules.gyp | 3 +- 151 files changed, 29 insertions(+), 49 deletions(-) delete mode 100644 src/modules/audio_coding/codecs/iLBC/ilbc_test.gypi rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/Android.mk (91%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/abs_quant.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/abs_quant.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/abs_quant_loop.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/abs_quant_loop.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/augmented_cb_corr.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/augmented_cb_corr.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/bw_expand.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/bw_expand.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_construct.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_construct.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_mem_energy.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_mem_energy.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_mem_energy_augmentation.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_mem_energy_augmentation.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_mem_energy_calc.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_mem_energy_calc.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_search.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_search.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_search_core.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_search_core.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_update_best_index.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/cb_update_best_index.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/chebyshev.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/chebyshev.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/comp_corr.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/comp_corr.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/complexityMeasures.m (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/constants.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/constants.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/create_augmented_vec.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/create_augmented_vec.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/decode.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/decode.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/decode_residual.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/decode_residual.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/decoder_interpolate_lsf.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/decoder_interpolate_lsf.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/defines.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/do_plc.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/do_plc.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main => ilbc}/documentation/rfc3951.txt (100%) rename src/modules/audio_coding/codecs/{iLBC/main => ilbc}/documentation/rfc3952.txt (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/encode.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/encode.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/energy_inverse.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/energy_inverse.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/enh_upsample.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/enh_upsample.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/enhancer.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/enhancer.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/enhancer_interface.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/enhancer_interface.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/filtered_cb_vecs.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/filtered_cb_vecs.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/frame_classify.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/frame_classify.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/gain_dequant.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/gain_dequant.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/gain_quant.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/gain_quant.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/get_cd_vec.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/get_cd_vec.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/get_lsp_poly.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/get_lsp_poly.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/get_sync_seq.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/get_sync_seq.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/hp_input.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/hp_input.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/hp_output.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/hp_output.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/ilbc.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/ilbc.gypi (90%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/index_conv_dec.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/index_conv_dec.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/index_conv_enc.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/index_conv_enc.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/init_decode.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/init_decode.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/init_encode.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/init_encode.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main => ilbc}/interface/ilbc.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/interpolate.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/interpolate.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/interpolate_samples.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/interpolate_samples.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lpc_encode.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lpc_encode.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lsf_check.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lsf_check.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lsf_interpolate_to_poly_dec.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lsf_interpolate_to_poly_dec.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lsf_interpolate_to_poly_enc.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lsf_interpolate_to_poly_enc.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lsf_to_lsp.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lsf_to_lsp.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lsf_to_poly.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lsf_to_poly.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lsp_to_lsf.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/lsp_to_lsf.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/my_corr.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/my_corr.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/nearest_neighbor.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/nearest_neighbor.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/pack_bits.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/pack_bits.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/poly_to_lsf.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/poly_to_lsf.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/poly_to_lsp.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/poly_to_lsp.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/refiner.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/refiner.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/simple_interpolate_lsf.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/simple_interpolate_lsf.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/simple_lpc_analysis.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/simple_lpc_analysis.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/simple_lsf_dequant.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/simple_lsf_dequant.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/simple_lsf_quant.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/simple_lsf_quant.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/smooth.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/smooth.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/smooth_out_data.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/smooth_out_data.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/sort_sq.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/sort_sq.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/split_vq.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/split_vq.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/state_construct.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/state_construct.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/state_search.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/state_search.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/swap_bytes.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/swap_bytes.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main => ilbc}/test/Android.mk (86%) rename src/modules/audio_coding/codecs/{iLBC/main => ilbc}/test/iLBC_test.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main => ilbc}/test/iLBC_testLib.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main => ilbc}/test/iLBC_testprogram.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main => ilbc}/test/iLBCtestscript.txt (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/unpack_bits.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/unpack_bits.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/vq3.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/vq3.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/vq4.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/vq4.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/window32_w32.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/window32_w32.h (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/xcorr_coef.c (100%) rename src/modules/audio_coding/codecs/{iLBC/main/source => ilbc}/xcorr_coef.h (100%) diff --git a/src/modules/audio_coding/codecs/iLBC/ilbc_test.gypi b/src/modules/audio_coding/codecs/iLBC/ilbc_test.gypi deleted file mode 100644 index 806d1f7dd..000000000 --- a/src/modules/audio_coding/codecs/iLBC/ilbc_test.gypi +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. -# -# Use of this source code is governed by a BSD-style license -# that can be found in the LICENSE file in the root of the source -# tree. An additional intellectual property rights grant can be found -# in the file PATENTS. All contributing project authors may -# be found in the AUTHORS file in the root of the source tree. - -{ - 'targets': [ - # ilbc_test - { - 'target_name': 'iLBCtest', - 'type': 'executable', - 'dependencies': [ - 'iLBC', - ], - 'include_dirs': [ - './main/interface', - ], - 'sources': [ - './main/test/iLBC_test.c', - ], - }, - ], -} - -# Local Variables: -# tab-width:2 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=2 shiftwidth=2: diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/Android.mk b/src/modules/audio_coding/codecs/ilbc/Android.mk similarity index 91% rename from src/modules/audio_coding/codecs/iLBC/main/source/Android.mk rename to src/modules/audio_coding/codecs/ilbc/Android.mk index 52efa6a4f..ce0fcfbbc 100644 --- a/src/modules/audio_coding/codecs/iLBC/main/source/Android.mk +++ b/src/modules/audio_coding/codecs/ilbc/Android.mk @@ -10,7 +10,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -include $(LOCAL_PATH)/../../../../../../../android-webrtc.mk +include $(LOCAL_PATH)/../../../../../android-webrtc.mk LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := libwebrtc_ilbc @@ -91,9 +91,8 @@ LOCAL_CFLAGS := \ $(MY_WEBRTC_COMMON_DEFS) LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../interface \ - $(LOCAL_PATH)/../../../../../.. \ - $(LOCAL_PATH)/../../../../../../common_audio/signal_processing_library/main/interface + $(LOCAL_PATH)/../../../.. \ + $(LOCAL_PATH)/../../../../common_audio/signal_processing_library/main/interface LOCAL_SHARED_LIBRARIES := \ libcutils \ diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/abs_quant.c b/src/modules/audio_coding/codecs/ilbc/abs_quant.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/abs_quant.c rename to src/modules/audio_coding/codecs/ilbc/abs_quant.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/abs_quant.h b/src/modules/audio_coding/codecs/ilbc/abs_quant.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/abs_quant.h rename to src/modules/audio_coding/codecs/ilbc/abs_quant.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/abs_quant_loop.c b/src/modules/audio_coding/codecs/ilbc/abs_quant_loop.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/abs_quant_loop.c rename to src/modules/audio_coding/codecs/ilbc/abs_quant_loop.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/abs_quant_loop.h b/src/modules/audio_coding/codecs/ilbc/abs_quant_loop.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/abs_quant_loop.h rename to src/modules/audio_coding/codecs/ilbc/abs_quant_loop.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/augmented_cb_corr.c b/src/modules/audio_coding/codecs/ilbc/augmented_cb_corr.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/augmented_cb_corr.c rename to src/modules/audio_coding/codecs/ilbc/augmented_cb_corr.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/augmented_cb_corr.h b/src/modules/audio_coding/codecs/ilbc/augmented_cb_corr.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/augmented_cb_corr.h rename to src/modules/audio_coding/codecs/ilbc/augmented_cb_corr.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/bw_expand.c b/src/modules/audio_coding/codecs/ilbc/bw_expand.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/bw_expand.c rename to src/modules/audio_coding/codecs/ilbc/bw_expand.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/bw_expand.h b/src/modules/audio_coding/codecs/ilbc/bw_expand.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/bw_expand.h rename to src/modules/audio_coding/codecs/ilbc/bw_expand.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_construct.c b/src/modules/audio_coding/codecs/ilbc/cb_construct.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_construct.c rename to src/modules/audio_coding/codecs/ilbc/cb_construct.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_construct.h b/src/modules/audio_coding/codecs/ilbc/cb_construct.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_construct.h rename to src/modules/audio_coding/codecs/ilbc/cb_construct.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_mem_energy.c b/src/modules/audio_coding/codecs/ilbc/cb_mem_energy.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_mem_energy.c rename to src/modules/audio_coding/codecs/ilbc/cb_mem_energy.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_mem_energy.h b/src/modules/audio_coding/codecs/ilbc/cb_mem_energy.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_mem_energy.h rename to src/modules/audio_coding/codecs/ilbc/cb_mem_energy.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_mem_energy_augmentation.c b/src/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_mem_energy_augmentation.c rename to src/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_mem_energy_augmentation.h b/src/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_mem_energy_augmentation.h rename to src/modules/audio_coding/codecs/ilbc/cb_mem_energy_augmentation.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_mem_energy_calc.c b/src/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_mem_energy_calc.c rename to src/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_mem_energy_calc.h b/src/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_mem_energy_calc.h rename to src/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_search.c b/src/modules/audio_coding/codecs/ilbc/cb_search.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_search.c rename to src/modules/audio_coding/codecs/ilbc/cb_search.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_search.h b/src/modules/audio_coding/codecs/ilbc/cb_search.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_search.h rename to src/modules/audio_coding/codecs/ilbc/cb_search.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_search_core.c b/src/modules/audio_coding/codecs/ilbc/cb_search_core.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_search_core.c rename to src/modules/audio_coding/codecs/ilbc/cb_search_core.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_search_core.h b/src/modules/audio_coding/codecs/ilbc/cb_search_core.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_search_core.h rename to src/modules/audio_coding/codecs/ilbc/cb_search_core.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_update_best_index.c b/src/modules/audio_coding/codecs/ilbc/cb_update_best_index.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_update_best_index.c rename to src/modules/audio_coding/codecs/ilbc/cb_update_best_index.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/cb_update_best_index.h b/src/modules/audio_coding/codecs/ilbc/cb_update_best_index.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/cb_update_best_index.h rename to src/modules/audio_coding/codecs/ilbc/cb_update_best_index.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/chebyshev.c b/src/modules/audio_coding/codecs/ilbc/chebyshev.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/chebyshev.c rename to src/modules/audio_coding/codecs/ilbc/chebyshev.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/chebyshev.h b/src/modules/audio_coding/codecs/ilbc/chebyshev.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/chebyshev.h rename to src/modules/audio_coding/codecs/ilbc/chebyshev.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/comp_corr.c b/src/modules/audio_coding/codecs/ilbc/comp_corr.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/comp_corr.c rename to src/modules/audio_coding/codecs/ilbc/comp_corr.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/comp_corr.h b/src/modules/audio_coding/codecs/ilbc/comp_corr.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/comp_corr.h rename to src/modules/audio_coding/codecs/ilbc/comp_corr.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/complexityMeasures.m b/src/modules/audio_coding/codecs/ilbc/complexityMeasures.m similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/complexityMeasures.m rename to src/modules/audio_coding/codecs/ilbc/complexityMeasures.m diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/constants.c b/src/modules/audio_coding/codecs/ilbc/constants.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/constants.c rename to src/modules/audio_coding/codecs/ilbc/constants.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/constants.h b/src/modules/audio_coding/codecs/ilbc/constants.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/constants.h rename to src/modules/audio_coding/codecs/ilbc/constants.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/create_augmented_vec.c b/src/modules/audio_coding/codecs/ilbc/create_augmented_vec.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/create_augmented_vec.c rename to src/modules/audio_coding/codecs/ilbc/create_augmented_vec.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/create_augmented_vec.h b/src/modules/audio_coding/codecs/ilbc/create_augmented_vec.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/create_augmented_vec.h rename to src/modules/audio_coding/codecs/ilbc/create_augmented_vec.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/decode.c b/src/modules/audio_coding/codecs/ilbc/decode.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/decode.c rename to src/modules/audio_coding/codecs/ilbc/decode.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/decode.h b/src/modules/audio_coding/codecs/ilbc/decode.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/decode.h rename to src/modules/audio_coding/codecs/ilbc/decode.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/decode_residual.c b/src/modules/audio_coding/codecs/ilbc/decode_residual.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/decode_residual.c rename to src/modules/audio_coding/codecs/ilbc/decode_residual.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/decode_residual.h b/src/modules/audio_coding/codecs/ilbc/decode_residual.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/decode_residual.h rename to src/modules/audio_coding/codecs/ilbc/decode_residual.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/decoder_interpolate_lsf.c b/src/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/decoder_interpolate_lsf.c rename to src/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/decoder_interpolate_lsf.h b/src/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/decoder_interpolate_lsf.h rename to src/modules/audio_coding/codecs/ilbc/decoder_interpolate_lsf.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/defines.h b/src/modules/audio_coding/codecs/ilbc/defines.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/defines.h rename to src/modules/audio_coding/codecs/ilbc/defines.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/do_plc.c b/src/modules/audio_coding/codecs/ilbc/do_plc.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/do_plc.c rename to src/modules/audio_coding/codecs/ilbc/do_plc.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/do_plc.h b/src/modules/audio_coding/codecs/ilbc/do_plc.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/do_plc.h rename to src/modules/audio_coding/codecs/ilbc/do_plc.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/documentation/rfc3951.txt b/src/modules/audio_coding/codecs/ilbc/documentation/rfc3951.txt similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/documentation/rfc3951.txt rename to src/modules/audio_coding/codecs/ilbc/documentation/rfc3951.txt diff --git a/src/modules/audio_coding/codecs/iLBC/main/documentation/rfc3952.txt b/src/modules/audio_coding/codecs/ilbc/documentation/rfc3952.txt similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/documentation/rfc3952.txt rename to src/modules/audio_coding/codecs/ilbc/documentation/rfc3952.txt diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/encode.c b/src/modules/audio_coding/codecs/ilbc/encode.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/encode.c rename to src/modules/audio_coding/codecs/ilbc/encode.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/encode.h b/src/modules/audio_coding/codecs/ilbc/encode.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/encode.h rename to src/modules/audio_coding/codecs/ilbc/encode.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/energy_inverse.c b/src/modules/audio_coding/codecs/ilbc/energy_inverse.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/energy_inverse.c rename to src/modules/audio_coding/codecs/ilbc/energy_inverse.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/energy_inverse.h b/src/modules/audio_coding/codecs/ilbc/energy_inverse.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/energy_inverse.h rename to src/modules/audio_coding/codecs/ilbc/energy_inverse.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/enh_upsample.c b/src/modules/audio_coding/codecs/ilbc/enh_upsample.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/enh_upsample.c rename to src/modules/audio_coding/codecs/ilbc/enh_upsample.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/enh_upsample.h b/src/modules/audio_coding/codecs/ilbc/enh_upsample.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/enh_upsample.h rename to src/modules/audio_coding/codecs/ilbc/enh_upsample.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/enhancer.c b/src/modules/audio_coding/codecs/ilbc/enhancer.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/enhancer.c rename to src/modules/audio_coding/codecs/ilbc/enhancer.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/enhancer.h b/src/modules/audio_coding/codecs/ilbc/enhancer.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/enhancer.h rename to src/modules/audio_coding/codecs/ilbc/enhancer.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/enhancer_interface.c b/src/modules/audio_coding/codecs/ilbc/enhancer_interface.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/enhancer_interface.c rename to src/modules/audio_coding/codecs/ilbc/enhancer_interface.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/enhancer_interface.h b/src/modules/audio_coding/codecs/ilbc/enhancer_interface.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/enhancer_interface.h rename to src/modules/audio_coding/codecs/ilbc/enhancer_interface.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/filtered_cb_vecs.c b/src/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/filtered_cb_vecs.c rename to src/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/filtered_cb_vecs.h b/src/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/filtered_cb_vecs.h rename to src/modules/audio_coding/codecs/ilbc/filtered_cb_vecs.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/frame_classify.c b/src/modules/audio_coding/codecs/ilbc/frame_classify.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/frame_classify.c rename to src/modules/audio_coding/codecs/ilbc/frame_classify.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/frame_classify.h b/src/modules/audio_coding/codecs/ilbc/frame_classify.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/frame_classify.h rename to src/modules/audio_coding/codecs/ilbc/frame_classify.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/gain_dequant.c b/src/modules/audio_coding/codecs/ilbc/gain_dequant.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/gain_dequant.c rename to src/modules/audio_coding/codecs/ilbc/gain_dequant.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/gain_dequant.h b/src/modules/audio_coding/codecs/ilbc/gain_dequant.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/gain_dequant.h rename to src/modules/audio_coding/codecs/ilbc/gain_dequant.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/gain_quant.c b/src/modules/audio_coding/codecs/ilbc/gain_quant.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/gain_quant.c rename to src/modules/audio_coding/codecs/ilbc/gain_quant.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/gain_quant.h b/src/modules/audio_coding/codecs/ilbc/gain_quant.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/gain_quant.h rename to src/modules/audio_coding/codecs/ilbc/gain_quant.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/get_cd_vec.c b/src/modules/audio_coding/codecs/ilbc/get_cd_vec.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/get_cd_vec.c rename to src/modules/audio_coding/codecs/ilbc/get_cd_vec.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/get_cd_vec.h b/src/modules/audio_coding/codecs/ilbc/get_cd_vec.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/get_cd_vec.h rename to src/modules/audio_coding/codecs/ilbc/get_cd_vec.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/get_lsp_poly.c b/src/modules/audio_coding/codecs/ilbc/get_lsp_poly.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/get_lsp_poly.c rename to src/modules/audio_coding/codecs/ilbc/get_lsp_poly.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/get_lsp_poly.h b/src/modules/audio_coding/codecs/ilbc/get_lsp_poly.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/get_lsp_poly.h rename to src/modules/audio_coding/codecs/ilbc/get_lsp_poly.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/get_sync_seq.c b/src/modules/audio_coding/codecs/ilbc/get_sync_seq.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/get_sync_seq.c rename to src/modules/audio_coding/codecs/ilbc/get_sync_seq.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/get_sync_seq.h b/src/modules/audio_coding/codecs/ilbc/get_sync_seq.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/get_sync_seq.h rename to src/modules/audio_coding/codecs/ilbc/get_sync_seq.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/hp_input.c b/src/modules/audio_coding/codecs/ilbc/hp_input.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/hp_input.c rename to src/modules/audio_coding/codecs/ilbc/hp_input.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/hp_input.h b/src/modules/audio_coding/codecs/ilbc/hp_input.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/hp_input.h rename to src/modules/audio_coding/codecs/ilbc/hp_input.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/hp_output.c b/src/modules/audio_coding/codecs/ilbc/hp_output.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/hp_output.c rename to src/modules/audio_coding/codecs/ilbc/hp_output.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/hp_output.h b/src/modules/audio_coding/codecs/ilbc/hp_output.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/hp_output.h rename to src/modules/audio_coding/codecs/ilbc/hp_output.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/ilbc.c b/src/modules/audio_coding/codecs/ilbc/ilbc.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/ilbc.c rename to src/modules/audio_coding/codecs/ilbc/ilbc.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/ilbc.gypi b/src/modules/audio_coding/codecs/ilbc/ilbc.gypi similarity index 90% rename from src/modules/audio_coding/codecs/iLBC/main/source/ilbc.gypi rename to src/modules/audio_coding/codecs/ilbc/ilbc.gypi index d56875097..82483c6d0 100644 --- a/src/modules/audio_coding/codecs/iLBC/main/source/ilbc.gypi +++ b/src/modules/audio_coding/codecs/ilbc/ilbc.gypi @@ -15,15 +15,15 @@ '<(webrtc_root)/common_audio/common_audio.gyp:spl', ], 'include_dirs': [ - '../interface', + 'interface', ], 'direct_dependent_settings': { 'include_dirs': [ - '../interface', + 'interface', ], }, 'sources': [ - '../interface/ilbc.h', + 'interface/ilbc.h', 'abs_quant.c', 'abs_quant_loop.c', 'augmented_cb_corr.c', @@ -162,9 +162,25 @@ 'vq4.h', 'window32_w32.h', 'xcorr_coef.h', - ], - }, - ], + ], # sources + }, # iLBC + ], # targets + 'conditions': [ + ['build_with_chromium==0', { + 'targets': [ + { + 'target_name': 'iLBCtest', + 'type': 'executable', + 'dependencies': [ + 'iLBC', + ], + 'sources': [ + 'test/iLBC_test.c', + ], + }, # iLBCtest + ], # targets + }], # build_with_chromium + ], # conditions } # Local Variables: diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/index_conv_dec.c b/src/modules/audio_coding/codecs/ilbc/index_conv_dec.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/index_conv_dec.c rename to src/modules/audio_coding/codecs/ilbc/index_conv_dec.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/index_conv_dec.h b/src/modules/audio_coding/codecs/ilbc/index_conv_dec.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/index_conv_dec.h rename to src/modules/audio_coding/codecs/ilbc/index_conv_dec.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/index_conv_enc.c b/src/modules/audio_coding/codecs/ilbc/index_conv_enc.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/index_conv_enc.c rename to src/modules/audio_coding/codecs/ilbc/index_conv_enc.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/index_conv_enc.h b/src/modules/audio_coding/codecs/ilbc/index_conv_enc.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/index_conv_enc.h rename to src/modules/audio_coding/codecs/ilbc/index_conv_enc.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/init_decode.c b/src/modules/audio_coding/codecs/ilbc/init_decode.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/init_decode.c rename to src/modules/audio_coding/codecs/ilbc/init_decode.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/init_decode.h b/src/modules/audio_coding/codecs/ilbc/init_decode.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/init_decode.h rename to src/modules/audio_coding/codecs/ilbc/init_decode.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/init_encode.c b/src/modules/audio_coding/codecs/ilbc/init_encode.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/init_encode.c rename to src/modules/audio_coding/codecs/ilbc/init_encode.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/init_encode.h b/src/modules/audio_coding/codecs/ilbc/init_encode.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/init_encode.h rename to src/modules/audio_coding/codecs/ilbc/init_encode.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/interface/ilbc.h b/src/modules/audio_coding/codecs/ilbc/interface/ilbc.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/interface/ilbc.h rename to src/modules/audio_coding/codecs/ilbc/interface/ilbc.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/interpolate.c b/src/modules/audio_coding/codecs/ilbc/interpolate.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/interpolate.c rename to src/modules/audio_coding/codecs/ilbc/interpolate.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/interpolate.h b/src/modules/audio_coding/codecs/ilbc/interpolate.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/interpolate.h rename to src/modules/audio_coding/codecs/ilbc/interpolate.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/interpolate_samples.c b/src/modules/audio_coding/codecs/ilbc/interpolate_samples.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/interpolate_samples.c rename to src/modules/audio_coding/codecs/ilbc/interpolate_samples.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/interpolate_samples.h b/src/modules/audio_coding/codecs/ilbc/interpolate_samples.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/interpolate_samples.h rename to src/modules/audio_coding/codecs/ilbc/interpolate_samples.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lpc_encode.c b/src/modules/audio_coding/codecs/ilbc/lpc_encode.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lpc_encode.c rename to src/modules/audio_coding/codecs/ilbc/lpc_encode.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lpc_encode.h b/src/modules/audio_coding/codecs/ilbc/lpc_encode.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lpc_encode.h rename to src/modules/audio_coding/codecs/ilbc/lpc_encode.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lsf_check.c b/src/modules/audio_coding/codecs/ilbc/lsf_check.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lsf_check.c rename to src/modules/audio_coding/codecs/ilbc/lsf_check.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lsf_check.h b/src/modules/audio_coding/codecs/ilbc/lsf_check.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lsf_check.h rename to src/modules/audio_coding/codecs/ilbc/lsf_check.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lsf_interpolate_to_poly_dec.c b/src/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lsf_interpolate_to_poly_dec.c rename to src/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lsf_interpolate_to_poly_dec.h b/src/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lsf_interpolate_to_poly_dec.h rename to src/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_dec.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lsf_interpolate_to_poly_enc.c b/src/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lsf_interpolate_to_poly_enc.c rename to src/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lsf_interpolate_to_poly_enc.h b/src/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lsf_interpolate_to_poly_enc.h rename to src/modules/audio_coding/codecs/ilbc/lsf_interpolate_to_poly_enc.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lsf_to_lsp.c b/src/modules/audio_coding/codecs/ilbc/lsf_to_lsp.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lsf_to_lsp.c rename to src/modules/audio_coding/codecs/ilbc/lsf_to_lsp.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lsf_to_lsp.h b/src/modules/audio_coding/codecs/ilbc/lsf_to_lsp.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lsf_to_lsp.h rename to src/modules/audio_coding/codecs/ilbc/lsf_to_lsp.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lsf_to_poly.c b/src/modules/audio_coding/codecs/ilbc/lsf_to_poly.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lsf_to_poly.c rename to src/modules/audio_coding/codecs/ilbc/lsf_to_poly.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lsf_to_poly.h b/src/modules/audio_coding/codecs/ilbc/lsf_to_poly.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lsf_to_poly.h rename to src/modules/audio_coding/codecs/ilbc/lsf_to_poly.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lsp_to_lsf.c b/src/modules/audio_coding/codecs/ilbc/lsp_to_lsf.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lsp_to_lsf.c rename to src/modules/audio_coding/codecs/ilbc/lsp_to_lsf.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/lsp_to_lsf.h b/src/modules/audio_coding/codecs/ilbc/lsp_to_lsf.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/lsp_to_lsf.h rename to src/modules/audio_coding/codecs/ilbc/lsp_to_lsf.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/my_corr.c b/src/modules/audio_coding/codecs/ilbc/my_corr.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/my_corr.c rename to src/modules/audio_coding/codecs/ilbc/my_corr.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/my_corr.h b/src/modules/audio_coding/codecs/ilbc/my_corr.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/my_corr.h rename to src/modules/audio_coding/codecs/ilbc/my_corr.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/nearest_neighbor.c b/src/modules/audio_coding/codecs/ilbc/nearest_neighbor.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/nearest_neighbor.c rename to src/modules/audio_coding/codecs/ilbc/nearest_neighbor.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/nearest_neighbor.h b/src/modules/audio_coding/codecs/ilbc/nearest_neighbor.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/nearest_neighbor.h rename to src/modules/audio_coding/codecs/ilbc/nearest_neighbor.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/pack_bits.c b/src/modules/audio_coding/codecs/ilbc/pack_bits.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/pack_bits.c rename to src/modules/audio_coding/codecs/ilbc/pack_bits.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/pack_bits.h b/src/modules/audio_coding/codecs/ilbc/pack_bits.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/pack_bits.h rename to src/modules/audio_coding/codecs/ilbc/pack_bits.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/poly_to_lsf.c b/src/modules/audio_coding/codecs/ilbc/poly_to_lsf.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/poly_to_lsf.c rename to src/modules/audio_coding/codecs/ilbc/poly_to_lsf.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/poly_to_lsf.h b/src/modules/audio_coding/codecs/ilbc/poly_to_lsf.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/poly_to_lsf.h rename to src/modules/audio_coding/codecs/ilbc/poly_to_lsf.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/poly_to_lsp.c b/src/modules/audio_coding/codecs/ilbc/poly_to_lsp.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/poly_to_lsp.c rename to src/modules/audio_coding/codecs/ilbc/poly_to_lsp.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/poly_to_lsp.h b/src/modules/audio_coding/codecs/ilbc/poly_to_lsp.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/poly_to_lsp.h rename to src/modules/audio_coding/codecs/ilbc/poly_to_lsp.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/refiner.c b/src/modules/audio_coding/codecs/ilbc/refiner.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/refiner.c rename to src/modules/audio_coding/codecs/ilbc/refiner.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/refiner.h b/src/modules/audio_coding/codecs/ilbc/refiner.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/refiner.h rename to src/modules/audio_coding/codecs/ilbc/refiner.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/simple_interpolate_lsf.c b/src/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/simple_interpolate_lsf.c rename to src/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/simple_interpolate_lsf.h b/src/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/simple_interpolate_lsf.h rename to src/modules/audio_coding/codecs/ilbc/simple_interpolate_lsf.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/simple_lpc_analysis.c b/src/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/simple_lpc_analysis.c rename to src/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/simple_lpc_analysis.h b/src/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/simple_lpc_analysis.h rename to src/modules/audio_coding/codecs/ilbc/simple_lpc_analysis.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/simple_lsf_dequant.c b/src/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/simple_lsf_dequant.c rename to src/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/simple_lsf_dequant.h b/src/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/simple_lsf_dequant.h rename to src/modules/audio_coding/codecs/ilbc/simple_lsf_dequant.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/simple_lsf_quant.c b/src/modules/audio_coding/codecs/ilbc/simple_lsf_quant.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/simple_lsf_quant.c rename to src/modules/audio_coding/codecs/ilbc/simple_lsf_quant.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/simple_lsf_quant.h b/src/modules/audio_coding/codecs/ilbc/simple_lsf_quant.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/simple_lsf_quant.h rename to src/modules/audio_coding/codecs/ilbc/simple_lsf_quant.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/smooth.c b/src/modules/audio_coding/codecs/ilbc/smooth.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/smooth.c rename to src/modules/audio_coding/codecs/ilbc/smooth.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/smooth.h b/src/modules/audio_coding/codecs/ilbc/smooth.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/smooth.h rename to src/modules/audio_coding/codecs/ilbc/smooth.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/smooth_out_data.c b/src/modules/audio_coding/codecs/ilbc/smooth_out_data.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/smooth_out_data.c rename to src/modules/audio_coding/codecs/ilbc/smooth_out_data.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/smooth_out_data.h b/src/modules/audio_coding/codecs/ilbc/smooth_out_data.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/smooth_out_data.h rename to src/modules/audio_coding/codecs/ilbc/smooth_out_data.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/sort_sq.c b/src/modules/audio_coding/codecs/ilbc/sort_sq.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/sort_sq.c rename to src/modules/audio_coding/codecs/ilbc/sort_sq.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/sort_sq.h b/src/modules/audio_coding/codecs/ilbc/sort_sq.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/sort_sq.h rename to src/modules/audio_coding/codecs/ilbc/sort_sq.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/split_vq.c b/src/modules/audio_coding/codecs/ilbc/split_vq.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/split_vq.c rename to src/modules/audio_coding/codecs/ilbc/split_vq.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/split_vq.h b/src/modules/audio_coding/codecs/ilbc/split_vq.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/split_vq.h rename to src/modules/audio_coding/codecs/ilbc/split_vq.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/state_construct.c b/src/modules/audio_coding/codecs/ilbc/state_construct.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/state_construct.c rename to src/modules/audio_coding/codecs/ilbc/state_construct.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/state_construct.h b/src/modules/audio_coding/codecs/ilbc/state_construct.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/state_construct.h rename to src/modules/audio_coding/codecs/ilbc/state_construct.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/state_search.c b/src/modules/audio_coding/codecs/ilbc/state_search.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/state_search.c rename to src/modules/audio_coding/codecs/ilbc/state_search.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/state_search.h b/src/modules/audio_coding/codecs/ilbc/state_search.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/state_search.h rename to src/modules/audio_coding/codecs/ilbc/state_search.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/swap_bytes.c b/src/modules/audio_coding/codecs/ilbc/swap_bytes.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/swap_bytes.c rename to src/modules/audio_coding/codecs/ilbc/swap_bytes.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/swap_bytes.h b/src/modules/audio_coding/codecs/ilbc/swap_bytes.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/swap_bytes.h rename to src/modules/audio_coding/codecs/ilbc/swap_bytes.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/test/Android.mk b/src/modules/audio_coding/codecs/ilbc/test/Android.mk similarity index 86% rename from src/modules/audio_coding/codecs/iLBC/main/test/Android.mk rename to src/modules/audio_coding/codecs/ilbc/test/Android.mk index 6b05197a6..7ee3e9224 100644 --- a/src/modules/audio_coding/codecs/iLBC/main/test/Android.mk +++ b/src/modules/audio_coding/codecs/ilbc/test/Android.mk @@ -11,7 +11,7 @@ LOCAL_PATH:= $(call my-dir) # iLBC test app include $(CLEAR_VARS) -include $(LOCAL_PATH)/../../../../../../../android-webrtc.mk +include $(LOCAL_PATH)/../../../../../../android-webrtc.mk LOCAL_MODULE_TAGS := tests LOCAL_CPP_EXTENSION := .cc @@ -23,8 +23,7 @@ LOCAL_CFLAGS := \ $(MY_WEBRTC_COMMON_DEFS) LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../interface \ - $(LOCAL_PATH)/../../../../../.. + $(LOCAL_PATH)/../../../../.. LOCAL_SHARED_LIBRARIES := \ libutils \ @@ -51,8 +50,7 @@ LOCAL_CFLAGS := \ $(MY_WEBRTC_COMMON_DEFS) LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../interface \ - $(LOCAL_PATH)/../../../../../.. + $(LOCAL_PATH)/../../../../.. LOCAL_SHARED_LIBRARIES := \ libutils \ diff --git a/src/modules/audio_coding/codecs/iLBC/main/test/iLBC_test.c b/src/modules/audio_coding/codecs/ilbc/test/iLBC_test.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/test/iLBC_test.c rename to src/modules/audio_coding/codecs/ilbc/test/iLBC_test.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/test/iLBC_testLib.c b/src/modules/audio_coding/codecs/ilbc/test/iLBC_testLib.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/test/iLBC_testLib.c rename to src/modules/audio_coding/codecs/ilbc/test/iLBC_testLib.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/test/iLBC_testprogram.c b/src/modules/audio_coding/codecs/ilbc/test/iLBC_testprogram.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/test/iLBC_testprogram.c rename to src/modules/audio_coding/codecs/ilbc/test/iLBC_testprogram.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/test/iLBCtestscript.txt b/src/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/test/iLBCtestscript.txt rename to src/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/unpack_bits.c b/src/modules/audio_coding/codecs/ilbc/unpack_bits.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/unpack_bits.c rename to src/modules/audio_coding/codecs/ilbc/unpack_bits.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/unpack_bits.h b/src/modules/audio_coding/codecs/ilbc/unpack_bits.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/unpack_bits.h rename to src/modules/audio_coding/codecs/ilbc/unpack_bits.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/vq3.c b/src/modules/audio_coding/codecs/ilbc/vq3.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/vq3.c rename to src/modules/audio_coding/codecs/ilbc/vq3.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/vq3.h b/src/modules/audio_coding/codecs/ilbc/vq3.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/vq3.h rename to src/modules/audio_coding/codecs/ilbc/vq3.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/vq4.c b/src/modules/audio_coding/codecs/ilbc/vq4.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/vq4.c rename to src/modules/audio_coding/codecs/ilbc/vq4.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/vq4.h b/src/modules/audio_coding/codecs/ilbc/vq4.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/vq4.h rename to src/modules/audio_coding/codecs/ilbc/vq4.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/window32_w32.c b/src/modules/audio_coding/codecs/ilbc/window32_w32.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/window32_w32.c rename to src/modules/audio_coding/codecs/ilbc/window32_w32.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/window32_w32.h b/src/modules/audio_coding/codecs/ilbc/window32_w32.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/window32_w32.h rename to src/modules/audio_coding/codecs/ilbc/window32_w32.h diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/xcorr_coef.c b/src/modules/audio_coding/codecs/ilbc/xcorr_coef.c similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/xcorr_coef.c rename to src/modules/audio_coding/codecs/ilbc/xcorr_coef.c diff --git a/src/modules/audio_coding/codecs/iLBC/main/source/xcorr_coef.h b/src/modules/audio_coding/codecs/ilbc/xcorr_coef.h similarity index 100% rename from src/modules/audio_coding/codecs/iLBC/main/source/xcorr_coef.h rename to src/modules/audio_coding/codecs/ilbc/xcorr_coef.h diff --git a/src/modules/modules.gyp b/src/modules/modules.gyp index 88ff3c633..c5b0bc266 100644 --- a/src/modules/modules.gyp +++ b/src/modules/modules.gyp @@ -12,7 +12,7 @@ 'audio_coding/codecs/CNG/main/source/cng.gypi', 'audio_coding/codecs/G711/main/source/g711.gypi', 'audio_coding/codecs/G722/main/source/g722.gypi', - 'audio_coding/codecs/iLBC/main/source/ilbc.gypi', + 'audio_coding/codecs/ilbc/ilbc.gypi', 'audio_coding/codecs/iSAC/main/source/isac.gypi', 'audio_coding/codecs/iSAC/fix/source/isacfix.gypi', 'audio_coding/codecs/PCM16B/main/source/pcm16b.gypi', @@ -43,7 +43,6 @@ 'conditions': [ ['build_with_chromium==0', { 'includes': [ - 'audio_coding/codecs/iLBC/ilbc_test.gypi', 'audio_coding/codecs/iSAC/isac_test.gypi', 'audio_coding/codecs/iSAC/isacfix_test.gypi', 'audio_coding/NetEQ/main/neteq_tests.gypi',