You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
142 lines
7.8 KiB
142 lines
7.8 KiB
diff -up gpac/modules/amr_dec/amr_dec.c.amr gpac/modules/amr_dec/amr_dec.c
|
|
--- gpac/modules/amr_dec/amr_dec.c.amr 2008-02-17 23:43:55.000000000 +0100
|
|
+++ gpac/modules/amr_dec/amr_dec.c 2008-02-17 23:44:20.000000000 +0100
|
|
@@ -29,8 +29,8 @@
|
|
#include <gpac/modules/service.h>
|
|
#include <gpac/constants.h>
|
|
|
|
-#include "amr_nb/sp_dec.h"
|
|
-#include "amr_nb/d_homing.h"
|
|
+#include <amrnb/sp_dec.h>
|
|
+#include <amrnb/d_homing.h>
|
|
|
|
|
|
/*default size in CU of composition memory for audio*/
|
|
diff -up gpac/modules/amr_dec/Makefile.amr gpac/modules/amr_dec/Makefile
|
|
--- gpac/modules/amr_dec/Makefile.amr 2008-02-17 23:39:25.000000000 +0100
|
|
+++ gpac/modules/amr_dec/Makefile 2008-02-17 23:43:23.000000000 +0100
|
|
@@ -17,30 +17,30 @@ LDFLAGS+=-pg
|
|
endif
|
|
|
|
#common obj
|
|
-OBJS=amr_in.o amr_dec.o \
|
|
- ./amr_nb/agc.o ./amr_nb/autocorr.o ./amr_nb/az_lsp.o ./amr_nb/bits2prm.o ./amr_nb/cl_ltp.o \
|
|
- ./amr_nb/convolve.o ./amr_nb/c1035pf.o ./amr_nb/d_plsf.o ./amr_nb/d_plsf_5.o ./amr_nb/d_gain_c.o \
|
|
- ./amr_nb/d_gain_p.o ./amr_nb/dec_lag6.o ./amr_nb/d1035pf.o ./amr_nb/cor_h.o ./amr_nb/enc_lag3.o \
|
|
- ./amr_nb/enc_lag6.o ./amr_nb/g_code.o ./amr_nb/g_pitch.o ./amr_nb/int_lpc.o ./amr_nb/inter_36.o \
|
|
- ./amr_nb/inv_sqrt.o ./amr_nb/lag_wind.o ./amr_nb/levinson.o ./amr_nb/lsp_az.o ./amr_nb/lsp_lsf.o \
|
|
- ./amr_nb/ol_ltp.o ./amr_nb/pitch_fr.o ./amr_nb/pitch_ol.o ./amr_nb/pow2.o ./amr_nb/pre_big.o \
|
|
- ./amr_nb/pre_proc.o ./amr_nb/pred_lt.o ./amr_nb/preemph.o ./amr_nb/prm2bits.o ./amr_nb/pstfilt.o \
|
|
- ./amr_nb/q_gain_c.o ./amr_nb/q_gain_p.o ./amr_nb/q_plsf.o ./amr_nb/q_plsf_5.o ./amr_nb/lsfwt.o \
|
|
- ./amr_nb/reorder.o ./amr_nb/residu.o ./amr_nb/lsp.o ./amr_nb/lpc.o ./amr_nb/ec_gains.o \
|
|
- ./amr_nb/spreproc.o ./amr_nb/syn_filt.o ./amr_nb/weight_a.o ./amr_nb/qua_gain.o \
|
|
- ./amr_nb/gc_pred.o ./amr_nb/q_plsf_3.o ./amr_nb/post_pro.o ./amr_nb/dec_lag3.o ./amr_nb/dec_gain.o \
|
|
- ./amr_nb/d_plsf_3.o ./amr_nb/d4_17pf.o ./amr_nb/c4_17pf.o ./amr_nb/d3_14pf.o ./amr_nb/c3_14pf.o \
|
|
- ./amr_nb/d2_11pf.o ./amr_nb/c2_11pf.o ./amr_nb/d2_9pf.o ./amr_nb/c2_9pf.o ./amr_nb/cbsearch.o \
|
|
- ./amr_nb/spstproc.o ./amr_nb/gain_q.o ./amr_nb/cod_amr.o ./amr_nb/dec_amr.o ./amr_nb/sp_enc.o \
|
|
- ./amr_nb/sp_dec.o ./amr_nb/ph_disp.o ./amr_nb/g_adapt.o ./amr_nb/calc_en.o ./amr_nb/qgain795.o \
|
|
- ./amr_nb/qgain475.o ./amr_nb/sqrt_l.o ./amr_nb/set_sign.o ./amr_nb/s10_8pf.o ./amr_nb/bgnscd.o \
|
|
- ./amr_nb/gmed_n.o ./amr_nb/mac_32.o ./amr_nb/ex_ctrl.o ./amr_nb/c_g_aver.o ./amr_nb/lsp_avg.o \
|
|
- ./amr_nb/int_lsf.o ./amr_nb/c8_31pf.o ./amr_nb/d8_31pf.o ./amr_nb/p_ol_wgh.o ./amr_nb/ton_stab.o \
|
|
- ./amr_nb/vad1.o ./amr_nb/dtx_enc.o ./amr_nb/dtx_dec.o ./amr_nb/a_refl.o ./amr_nb/b_cn_cod.o \
|
|
- ./amr_nb/calc_cor.o ./amr_nb/hp_max.o ./amr_nb/vadname.o ./amr_nb/vad2.o ./amr_nb/r_fft.o \
|
|
- ./amr_nb/lflg_upd.o ./amr_nb/e_homing.o ./amr_nb/d_homing.o ./amr_nb/basicop2.o \
|
|
- ./amr_nb/count.o ./amr_nb/oper_32b.o ./amr_nb/copy.o ./amr_nb/log2.o \
|
|
- ./amr_nb/set_zero.o ./amr_nb/strfunc.o ./amr_nb/n_proc.o ./amr_nb/sid_sync.o
|
|
+OBJS=amr_in.o amr_dec.o
|
|
+# ./amr_nb/agc.o ./amr_nb/autocorr.o ./amr_nb/az_lsp.o ./amr_nb/bits2prm.o ./amr_nb/cl_ltp.o \
|
|
+# ./amr_nb/convolve.o ./amr_nb/c1035pf.o ./amr_nb/d_plsf.o ./amr_nb/d_plsf_5.o ./amr_nb/d_gain_c.o \
|
|
+# ./amr_nb/d_gain_p.o ./amr_nb/dec_lag6.o ./amr_nb/d1035pf.o ./amr_nb/cor_h.o ./amr_nb/enc_lag3.o \
|
|
+# ./amr_nb/enc_lag6.o ./amr_nb/g_code.o ./amr_nb/g_pitch.o ./amr_nb/int_lpc.o ./amr_nb/inter_36.o \
|
|
+# ./amr_nb/inv_sqrt.o ./amr_nb/lag_wind.o ./amr_nb/levinson.o ./amr_nb/lsp_az.o ./amr_nb/lsp_lsf.o \
|
|
+# ./amr_nb/ol_ltp.o ./amr_nb/pitch_fr.o ./amr_nb/pitch_ol.o ./amr_nb/pow2.o ./amr_nb/pre_big.o \
|
|
+# ./amr_nb/pre_proc.o ./amr_nb/pred_lt.o ./amr_nb/preemph.o ./amr_nb/prm2bits.o ./amr_nb/pstfilt.o \
|
|
+# ./amr_nb/q_gain_c.o ./amr_nb/q_gain_p.o ./amr_nb/q_plsf.o ./amr_nb/q_plsf_5.o ./amr_nb/lsfwt.o \
|
|
+# ./amr_nb/reorder.o ./amr_nb/residu.o ./amr_nb/lsp.o ./amr_nb/lpc.o ./amr_nb/ec_gains.o \
|
|
+# ./amr_nb/spreproc.o ./amr_nb/syn_filt.o ./amr_nb/weight_a.o ./amr_nb/qua_gain.o \
|
|
+# ./amr_nb/gc_pred.o ./amr_nb/q_plsf_3.o ./amr_nb/post_pro.o ./amr_nb/dec_lag3.o ./amr_nb/dec_gain.o \
|
|
+# ./amr_nb/d_plsf_3.o ./amr_nb/d4_17pf.o ./amr_nb/c4_17pf.o ./amr_nb/d3_14pf.o ./amr_nb/c3_14pf.o \
|
|
+# ./amr_nb/d2_11pf.o ./amr_nb/c2_11pf.o ./amr_nb/d2_9pf.o ./amr_nb/c2_9pf.o ./amr_nb/cbsearch.o \
|
|
+# ./amr_nb/spstproc.o ./amr_nb/gain_q.o ./amr_nb/cod_amr.o ./amr_nb/dec_amr.o ./amr_nb/sp_enc.o \
|
|
+# ./amr_nb/sp_dec.o ./amr_nb/ph_disp.o ./amr_nb/g_adapt.o ./amr_nb/calc_en.o ./amr_nb/qgain795.o \
|
|
+# ./amr_nb/qgain475.o ./amr_nb/sqrt_l.o ./amr_nb/set_sign.o ./amr_nb/s10_8pf.o ./amr_nb/bgnscd.o \
|
|
+# ./amr_nb/gmed_n.o ./amr_nb/mac_32.o ./amr_nb/ex_ctrl.o ./amr_nb/c_g_aver.o ./amr_nb/lsp_avg.o \
|
|
+# ./amr_nb/int_lsf.o ./amr_nb/c8_31pf.o ./amr_nb/d8_31pf.o ./amr_nb/p_ol_wgh.o ./amr_nb/ton_stab.o \
|
|
+# ./amr_nb/vad1.o ./amr_nb/dtx_enc.o ./amr_nb/dtx_dec.o ./amr_nb/a_refl.o ./amr_nb/b_cn_cod.o \
|
|
+# ./amr_nb/calc_cor.o ./amr_nb/hp_max.o ./amr_nb/vadname.o ./amr_nb/vad2.o ./amr_nb/r_fft.o \
|
|
+# ./amr_nb/lflg_upd.o ./amr_nb/e_homing.o ./amr_nb/d_homing.o ./amr_nb/basicop2.o \
|
|
+# ./amr_nb/count.o ./amr_nb/oper_32b.o ./amr_nb/copy.o ./amr_nb/log2.o \
|
|
+# ./amr_nb/set_zero.o ./amr_nb/strfunc.o ./amr_nb/n_proc.o ./amr_nb/sid_sync.o
|
|
|
|
|
|
SRCS := $(OBJS:.o=.c)
|
|
@@ -55,12 +55,14 @@ OBJSPIC=$(OBJS:.o=.opic)
|
|
else
|
|
OBJSPIC=$(OBJS)
|
|
endif
|
|
+AMR_NB_LIBS=-lamrnb
|
|
+AMR_WB_LIBS=-lamrwb
|
|
|
|
all: $(LIB)
|
|
|
|
|
|
$(LIB): $(OBJS)
|
|
- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
|
|
+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
|
|
|
|
|
|
%.o: %.c
|
|
diff -up gpac/modules/amr_float_dec/Makefile.amr gpac/modules/amr_float_dec/Makefile
|
|
--- gpac/modules/amr_float_dec/Makefile.amr 2008-02-17 23:26:57.000000000 +0100
|
|
+++ gpac/modules/amr_float_dec/Makefile 2008-02-17 23:35:00.000000000 +0100
|
|
@@ -21,16 +21,18 @@ OBJS=../amr_dec/amr_in.o amr_float_dec.o
|
|
#AMR NB obj
|
|
CFLAGS+=-DGPAC_HAS_AMR_FT
|
|
ifeq ($(CONFIG_AMR_NB_FT), yes)
|
|
-OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
|
|
+#OBJS+=./amr_nb_ft/interf_dec.o ./amr_nb_ft/interf_enc.o ./amr_nb_ft/sp_dec.o ./amr_nb_ft/sp_enc.o
|
|
+AMR_NB_LIBS=-lamrnb
|
|
endif
|
|
|
|
|
|
#AMR WB obj
|
|
CFLAGS+=-DGPAC_HAS_AMR_FT_WB
|
|
ifeq ($(CONFIG_AMR_WB_FT), yes)
|
|
-OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
|
|
- ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
|
|
- ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o
|
|
+#OBJS+=./amr_wb_ft/dec_acelp.o ./amr_wb_ft/dec_dtx.o ./amr_wb_ft/dec_gain.o ./amr_wb_ft/dec_if.o ./amr_wb_ft/dec_lpc.o ./amr_wb_ft/dec_main.o \
|
|
+# ./amr_wb_ft/dec_rom.o ./amr_wb_ft/dec_util.o ./amr_wb_ft/enc_acelp.o ./amr_wb_ft/enc_dtx.o ./amr_wb_ft/enc_gain.o ./amr_wb_ft/enc_if.o \
|
|
+# ./amr_wb_ft/enc_lpc.o ./amr_wb_ft/enc_main.o ./amr_wb_ft/enc_rom.o ./amr_wb_ft/enc_util.o ./amr_wb_ft/if_rom.o
|
|
+AMR_WB_LIBS=-lamrwb
|
|
endif
|
|
|
|
|
|
@@ -51,7 +53,7 @@ all: $(LIB)
|
|
|
|
|
|
$(LIB): $(OBJSPIC)
|
|
- $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS) -L../../bin/gcc -lgpac
|
|
+ $(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJSPIC) $(AMR_NB_LIBS) $(AMR_WB_LIBS) $(EXTRALIBS) -L../../bin/gcc -lgpac
|
|
|
|
|
|
%.o: %.c
|
|
diff -up gpac/modules/amr_float_dec/amr_float_dec.c.amr gpac/modules/amr_float_dec/amr_float_dec.c
|
|
--- gpac/modules/amr_float_dec/amr_float_dec.c.amr 2006-12-13 16:12:05.000000000 +0100
|
|
+++ gpac/modules/amr_float_dec/amr_float_dec.c 2008-02-17 23:38:03.000000000 +0100
|
|
@@ -31,12 +31,12 @@
|
|
|
|
#ifdef GPAC_HAS_AMR_FT
|
|
/*AMR NB*/
|
|
-#include "amr_nb_ft/interf_dec.h"
|
|
+#include "amrnb/interf_dec.h"
|
|
#endif
|
|
|
|
#ifdef GPAC_HAS_AMR_FT_WB
|
|
/*AMR WB*/
|
|
-#include "amr_wb_ft/dec_if.h"
|
|
+#include "amrwb/dec_if.h"
|
|
#endif
|
|
|
|
/*default size in CU of composition memory for audio*/
|