kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some symbol and Makefile issues

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@886 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-04-23 16:23:12 +00:00
parent d19769f687
commit 7d1c585587
8 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
codecs/Makefile
View File

@@ -40,30 +40,30 @@ all: $(CODECS)
clean:
rm -f *.so *.o
! [ -d g723.1 ] || make -C g723.1 clean
! [ -d g723.1b ] || make -C g723.1b clean
make -C gsm clean
make -C mp3 clean
make -C lpc10 clean
make -C ilbc clean
! [ -d g723.1 ] || $(MAKE) -C g723.1 clean
! [ -d g723.1b ] || $(MAKE) -C g723.1b clean
$(MAKE) -C gsm clean
$(MAKE) -C mp3 clean
$(MAKE) -C lpc10 clean
$(MAKE) -C ilbc clean
$(LIBG723):
make -C g723.1 all
$(MAKE) -C g723.1 all
gsm/lib/libgsm.a:
make -C gsm lib/libgsm.a
$(MAKE) -C gsm lib/libgsm.a
$(LIBG723B):
make -C g723.1b all
$(MAKE) -C g723.1b all
$(LIBMP3):
make -C mp3 all
$(MAKE) -C mp3 all
$(LIBLPC10):
make -C lpc10 all
$(MAKE) -C lpc10 all
$(LIBILBC):
make -C ilbc all
$(MAKE) -C ilbc all
codec_ilbc.so: codec_ilbc.o $(LIBILBC)
$(CC) -shared -Xlinker -x -o $@ $< $(LIBILBC)

4
codecs/gsm/Makefile
View File

@@ -351,12 +351,12 @@ $(LIB):
gsminstall:
-if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \
make $(GSM_INSTALL_TARGETS) ; \
$(MAKE) $(GSM_INSTALL_TARGETS) ; \
fi
toastinstall:
-if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then \
make $(TOAST_INSTALL_TARGETS); \
$(MAKE) $(TOAST_INSTALL_TARGETS); \
fi
gsmuninstall:

6
codecs/ilbc/LPCencode.c
View File

@@ -41,13 +41,13 @@ void SimpleAnalysis(
is = LPC_LOOKBACK;
if (k < (LPC_N - 1)) {
window(temp, lpc_winTbl, lpc_buffer, BLOCKL);
lbc_window(temp, lpc_winTbl, lpc_buffer, BLOCKL);
} else {
window(temp, lpc_asymwinTbl, lpc_buffer + is, BLOCKL);
lbc_window(temp, lpc_asymwinTbl, lpc_buffer + is, BLOCKL);
}
autocorr(r, temp, BLOCKL, LPC_FILTERORDER);
window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1);
lbc_window(r, r, lpc_lagwinTbl, LPC_FILTERORDER + 1);
levdurb(lp, temp, r, LPC_FILTERORDER);
bwexpand(lp2, lp, LPC_CHIRP_SYNTDENUM, LPC_FILTERORDER+1);

2
codecs/ilbc/helpfun.c
View File

@@ -42,7 +42,7 @@ void autocorr(
* window multiplication
*---------------------------------------------------------------*/
void window(
void lbc_window(
float *z, /* (o) the windowed data */
const float *x, /* (i) the original data vector */
const float *y, /* (i) the window */

2
codecs/ilbc/helpfun.h
View File

@@ -21,7 +21,7 @@ void autocorr(
int order /* largest lag for calculated autocorrelations */
);
void window(
void lbc_window(
float *z, /* (o) the windowed data */
const float *x, /* (i) the original data vector */
const float *y, /* (i) the window */