From 0fa5481d13cf36b567e0ef59421802aaa5ce969f Mon Sep 17 00:00:00 2001 From: markster Date: Thu, 12 Apr 2001 21:27:47 +0000 Subject: Version 0.1.8 from FTP git-svn-id: http://svn.digium.com/svn/asterisk/trunk@273 f38db490-d61c-443f-a65b-d21fe96a405b --- codecs/lpc10/placea.c | 24 +++++++++++++++--------- codecs/lpc10/placev.c | 18 ++++++++++++------ include/asterisk/file.h | 1 + 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/codecs/lpc10/placea.c b/codecs/lpc10/placea.c index 83e107d9e..c08f12d87 100755 --- a/codecs/lpc10/placea.c +++ b/codecs/lpc10/placea.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.6 2000/01/05 08:20:39 markster -Version 0.1.7 from FTP +Revision 1.7 2001/04/12 21:27:53 markster +Version 0.1.8 from FTP + +Revision 1.3 2001/04/12 21:27:53 markh +app_record now supports wildcards of sort so your output file is not overwritten every time it's run. File.h got a documentation update on the ast_fileexists to include the return call. Watch out for the placea.c placev.c code, it's updates have not been tested yet. Just a few parenthesis to make it compile nicer on newer gcc versions with all the -W flags set. Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *a /* PLACEA Version 48 */ /* $Log$ - * Revision 1.6 2000/01/05 08:20:39 markster - * Version 0.1.7 from FTP + * Revision 1.7 2001/04/12 21:27:53 markster + * Version 0.1.8 from FTP * +/* Revision 1.3 2001/04/12 21:27:53 markh +/* app_record now supports wildcards of sort so your output file is not overwritten every time it's run. File.h got a documentation update on the ast_fileexists to include the return call. Watch out for the placea.c placev.c code, it's updates have not been tested yet. Just a few parenthesis to make it compile nicer on newer gcc versions with all the -W flags set. +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -140,18 +146,18 @@ extern int placea_(integer *ipitch, integer *voibuf, integer *obound, integer *a /* is not altered from MAXWIN, since this would defeat the purpose */ /* of phase-synchronous placement. */ /* Check for case 1 and case 2 */ - allv = voibuf[(*af - 2 << 1) + 2] == 1; - allv = allv && voibuf[(*af - 1 << 1) + 1] == 1; - allv = allv && voibuf[(*af - 1 << 1) + 2] == 1; + allv = voibuf[((*af - 2) << 1) + 2] == 1; + allv = allv && voibuf[((*af - 1) << 1) + 1] == 1; + allv = allv && voibuf[((*af - 1) << 1) + 2] == 1; allv = allv && voibuf[(*af << 1) + 1] == 1; allv = allv && voibuf[(*af << 1) + 2] == 1; winv = voibuf[(*af << 1) + 1] == 1 || voibuf[(*af << 1) + 2] == 1; if (allv || winv && *obound == 0) { /* APHASE: Phase synchronous window placement. */ /* Get minimum lower index of the window. */ - i__ = (lrange + *ipitch - 1 - awin[(*af - 1 << 1) + 1]) / *ipitch; + i__ = (lrange + *ipitch - 1 - awin[((*af - 1) << 1) + 1]) / *ipitch; i__ *= *ipitch; - i__ += awin[(*af - 1 << 1) + 1]; + i__ += awin[((*af - 1) << 1) + 1]; /* L = the actual length of this frame's analysis window. */ l = *maxwin; /* Calculate the location where a perfectly centered window would star diff --git a/codecs/lpc10/placev.c b/codecs/lpc10/placev.c index bf2c8056e..c6fb87d68 100755 --- a/codecs/lpc10/placev.c +++ b/codecs/lpc10/placev.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.6 2000/01/05 08:20:39 markster -Version 0.1.7 from FTP +Revision 1.7 2001/04/12 21:27:53 markster +Version 0.1.8 from FTP + +Revision 1.3 2001/04/12 21:27:53 markh +app_record now supports wildcards of sort so your output file is not overwritten every time it's run. File.h got a documentation update on the ast_fileexists to include the return call. Watch out for the placea.c placev.c code, it's updates have not been tested yet. Just a few parenthesis to make it compile nicer on newer gcc versions with all the -W flags set. Revision 1.2 2000/01/05 08:20:39 markster Some OSS fixes and a few lpc changes to make it actually work @@ -29,9 +32,12 @@ extern int placev_(integer *osbuf, integer *osptr, integer *oslen, integer *obou /* PLACEV Version 48 */ /* $Log$ - * Revision 1.6 2000/01/05 08:20:39 markster - * Version 0.1.7 from FTP + * Revision 1.7 2001/04/12 21:27:53 markster + * Version 0.1.8 from FTP * +/* Revision 1.3 2001/04/12 21:27:53 markh +/* app_record now supports wildcards of sort so your output file is not overwritten every time it's run. File.h got a documentation update on the ast_fileexists to include the return call. Watch out for the placea.c placev.c code, it's updates have not been tested yet. Just a few parenthesis to make it compile nicer on newer gcc versions with all the -W flags set. +/* /* Revision 1.2 2000/01/05 08:20:39 markster /* Some OSS fixes and a few lpc changes to make it actually work /* @@ -181,7 +187,7 @@ t*/ /* Function Body */ /* Computing MAX */ - i__1 = vwin[(*af - 1 << 1) + 2] + 1, i__2 = (*af - 2) * *lframe + 1; + i__1 = vwin[((*af - 1) << 1) + 2] + 1, i__2 = (*af - 2) * *lframe + 1; lrange = max(i__1,i__2); hrange = *af * *lframe; /* Compute OSPTR1, so the following code only looks at relevant onsets. */ @@ -195,7 +201,7 @@ L90: /* Check for case 1 first (fast case): */ if (osptr1 <= 1 || osbuf[osptr1 - 1] < lrange) { /* Computing MAX */ - i__1 = vwin[(*af - 1 << 1) + 2] + 1; + i__1 = vwin[((*af - 1) << 1) + 2] + 1; vwin[(*af << 1) + 1] = max(i__1,*dvwinl); vwin[(*af << 1) + 2] = vwin[(*af << 1) + 1] + *maxwin - 1; *obound = 0; diff --git a/include/asterisk/file.h b/include/asterisk/file.h index 25e38e29f..5e424358b 100755 --- a/include/asterisk/file.h +++ b/include/asterisk/file.h @@ -50,6 +50,7 @@ int ast_streamfile(struct ast_channel *c, char *filename, char *preflang); int ast_stopstream(struct ast_channel *c); /* See if a given file exists in a given format. If fmt is NULL, any format is accepted.*/ +/* Returns -1 if file does not exist */ int ast_fileexists(char *filename, char *fmt, char *preflang); /* Rename a given file in a given format, or if fmt is NULL, then do so for all */ -- cgit v1.2.3