ref: 6ada3918c43f59d76d2e0a5e29c2564c15778a0a
parent: 2db10552706cecbedd76af3987249e9bdb21d6ae
author: robs <robs>
date: Tue Dec 30 04:16:30 EST 2008
no need for ding; sox can do it
--- a/test/Copyright
+++ /dev/null
@@ -1,340 +1,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,28 +3,20 @@
# Uncomment the following if you need a specific compiler.
#CC=gcc
-CFLAGS:=-O2 -Wall -L../
+CFLAGS:=-O2 -Wall
LDFLAGS:=-s
LIBS:=-lm
-all: ding model lding lmodel corr
+all: model lmodel corr
corr: corr.c
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
-ding: ding.c
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
-
model: model.c
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
-lding: ding.c
- $(CC) $(CFLAGS) -DLSAMPL $(LDFLAGS) -o $@ $< $(LIBS)
-
lmodel: model.c
$(CC) $(CFLAGS) -DLSAMPL $(LDFLAGS) -o $@ $< $(LIBS)
clean:
- rm -f ding lding model lmodel corr *~ A B
- rm -rf d
-
+ rm -f model lmodel corr *~ A B
--- a/test/README
+++ b/test/README
@@ -1,19 +1,17 @@
-Here are some helper programs for checking filter and
-rate conversion accuracy of sox. The programs in the
-test subdirectory which I (Stanley J. Brooks) wrote are
-covered by the GPL. See the Copyright file for details.
-Sox itself is not covered by the GPL, but something similar.
+Here are some helper programs for checking filter and rate conversion
+accuracy of sox. The programs in the test subdirectory which I
+(Stanley J. Brooks) wrote are covered by the GPL. See the
+../LICENSE.GPL file for details. Sox is also covered by the GPL.
-To use this stuff, first cd to this test subdirectory
-and run make, which should produce the ding,lding,
-model, and lmodel executables.
+To use this stuff, first cd to this test subdirectory and run make,
+which should produce the corr, model, and lmodel executables.
Now to test something...
Say you want to compare the 'band' effect to the 'filter' effect...
-./ltest band 800 200 >A
-./ltest filter 600-1000 >B
+./ltest.pl band 800 200 >A
+./ltest.pl filter 600-1000 >B
gnuplot responseAB
plots the response curves with y being power-gain in dB,
@@ -24,8 +22,8 @@
with linear (default) interpolation versus -qs quadratic
interpolation with Nuttall window...
-./ltest -l resample >A
-./ltest -l resample -qs 0.80 0 >B
+./ltest.pl -l resample >A
+./ltest.pl -l resample -qs 0.80 0 >B
gnuplot plotAB
The script wtest.pl is for testing sox's adpcm and gsm wav support.
@@ -37,7 +35,8 @@
-g Use sox wav-gsm6.10
If using sox, you may also append an optional effect, eg:
./wtest -g filter 0-3500 >A
-will apply a lowpass filter with 6dB corner at 3500 Hz before the compression phase.
+will apply a lowpass filter with 6dB corner at 3500 Hz before the
+compression phase.
Then, as above, 'gnuplot plotA' will graph dB gain and dB error-level
vs. freq for you.
@@ -55,8 +54,8 @@
What ltest does:
-It uses the 'ding' program to synthesize a sineusoid input file for the
-frequencies 0.00 0.01 ... 0.99 of the Nyquist frequency. This input
+It uses sox to synthesize a sineusoid input file for the
+frequencies 0.01 ... 0.99 of the Nyquist frequency. This input
has:
400 samples samples of silence,
4000 samples with smooth envelope rising to volume -v0.5
--- a/test/ding.c
+++ /dev/null
@@ -1,331 +1,0 @@
-/*
- ding.c -- program to generate testpatterns for DSP code.
-
- Copyright (C) 1999 Stanley J. Brooks <stabro@megsinet.net>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-
-#include <string.h>
-// for open,read,write:
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#define FLOAT double
-
-#ifndef LSAMPL
-# define SAMPL short
-# define MAXSAMPL 0x7fff
-# define MINSAMPL -0x7fff
-#else
-# define SAMPL long
-# define MAXSAMPL 0x7fffffff
-# define MINSAMPL -0x7fffffff
-#endif
-
-struct _Env {- struct _Env *next;
- int r; /* rise */
- int m; /* middle */
- int f; /* fall */
- int e; /* end */
- FLOAT frq; /* frequency */
- FLOAT b; /* bend (not quite implemented) */
- FLOAT v; /* volume */
- FLOAT d; /* decay */
- FLOAT x,y; /* current x,y */
- FLOAT phx,phy;/* per-sample phase multiplier cos(PI*frq),sin(PI*frq) */
-};
-
-const struct _Env EnvTemplate = {NULL,0,0,0,0,0.0,0.0,0.5,1.0,0.0,1.0,1.0,0.0};-
-struct _Env * Env0 = NULL; /* 1st */
-struct _Env * EnvL = NULL; /* last */
-
-struct _Env *env_new(struct _Env *L)
-{- struct _Env *E;
- E = (struct _Env *) malloc(sizeof(struct _Env));
- if (E) {- memcpy(E, (L)? L : &EnvTemplate, sizeof(struct _Env));
- }
- return E;
-}
-
-static void env_init(struct _Env *E)
-{- if (0<E->frq && E->frq<1) {- E->x = 1; E->y = 0;
- } else {- E->x = 0; E->y = 1;
- }
- E->phx = cos(E->frq*M_PI);
- E->phy = sin(E->frq*M_PI);
-}
-
-static void env_post(struct _Env *E, int k)
-{- double x1;
- x1 = E->x*E->phx - E->y*E->phy;
- E->y = E->x*E->phy + E->y*E->phx;
- E->x = x1;
- /* update (x,y) for next tic */
- if (!(k&0x0f)) { /* norm correction each 16 samples */- x1 = 1/sqrt(E->x*E->x+E->y*E->y);
- E->x *= x1;
- E->y *= x1;
- }
-}
-
-/* rise/fall function, monotonic [0,1] -> [1-0] */
-static inline double ramp(double s)
-{- return 0.5*(1 + cos(M_PI * s));
-}
-
-static double env(struct _Env *Env, int k)
-{- double u = 0;
- //if (k >= Env->r && k < Env->e) {- if (k<Env->m) {- u = Env->v * ramp((double)(Env->m-k)/(Env->m-Env->r));
- }else if (k<Env->f) {- u = Env->v;
- Env->v *= Env->d;
- }else{- u = Env->v * ramp((double)(k-Env->f)/(Env->e-Env->f));
- }
- u *= Env->y;
- env_post(Env,k);
- //}
- return u;
-}
-
-static void Usage(void)__attribute__((noreturn));
-
-static void Usage(void)
-{- fprintf(stderr, "Usage: ./ding [options] [<in-file>] <out-file>\n");
- fprintf(stderr, " Options:\n");
- fprintf(stderr, " -f <freq> float, frequency = freq*nyquist_rate\n");
- fprintf(stderr, " [-v <vol>] float, volume, 1.00 is max\n");
- fprintf(stderr, " [-d <decay>] float, per-sample decay factor\n");
- fprintf(stderr, " [-e start:attack:duration:mute] ints \n");
- exit(-1);
-}
-
-static int ReadN(int fd, SAMPL *v, int n)
-{- int r,m;
- static SAMPL frag=0;
- static int fraglen=0;
- char *q;
-
- q=(char*)v;
- if (fraglen)
- memcpy(q, (char*)&frag, fraglen);
-
- m = n*sizeof(SAMPL) - fraglen;
- q += fraglen;
- if (fd>=0) {- do {- r = read(fd, q, m);
- }while(r==-1 && errno==EINTR);
- if (r==-1) {- perror("Error reading fd1"); exit(-1);- }
- }else{- bzero(q,m);
- r = m;
- }
- r += fraglen;
- fraglen = r%sizeof(SAMPL);
- if (fraglen)
- memcpy((char*)&frag, (char*)v, fraglen);
-
- return (r/sizeof(SAMPL));
-}
-
-#define BSIZ 0x10000
-
-int main(int argct, char **argv)
-{- int optc;
- int fd1,fd2;
- char *fnam1,*fnam2;
- int len, st;
- SAMPL *ibuff,max,min;
- int poflo,moflo;
- FLOAT Vol0=1;
- struct _Env *E;
-
- /* Parse the options */
- E = NULL;
- len = 0;
- while ((optc = getopt(argct, argv, "d:e:f:v:h")) != -1) {- char *p;
- switch(optc) {- case 'd':
- if (!E) {- fprintf(stderr,"option -f must precede -%c\n", optc);
- Usage();
- }
- E->d = strtod(optarg,&p);
- if (p==optarg || *p) {- fprintf(stderr,"option -%c expects float value (%s)\n", optc, optarg);
- Usage();
- }
- break;
- case 'f':
- E = env_new(EnvL);
- if (EnvL) EnvL->next = E;
- EnvL = E;
- if (!Env0) Env0 = E;
-
- E->frq = strtod(optarg,&p);
- if (p==optarg || *p) {- fprintf(stderr,"option -%c expects float value (%s)\n", optc, optarg);
- Usage();
- }
- break;
- case 'e':
- {- int t[5], tmin=0;
- int i,ct=0;
-
- if (!E) {- fprintf(stderr,"option -f must precede -%c\n", optc);
- Usage();
- }
- for (p=optarg,ct=0; ct<5; p++) {- t[ct] = 0;
- if (*p && *p != ':') { - t[ct] = strtol(p,&p,10);
- if (t[ct]<tmin) tmin=t[ct];
- }
- ct++;
- if (*p != ':') break;
- }
- if (ct==4) t[ct++] = 0;
-
- if (*p || tmin<0 || ct!=5) {- fprintf(stderr,"option -%c not valid (%s)\n", optc, optarg);
- Usage();
- }
-
- for (i=1; i<ct; i++)
- t[i] += t[i-1];
-
- E->r = t[0];
- E->m = t[1];
- E->f = t[2];
- E->e = t[3];
- if (len<t[4]) len=t[4];
- break;
- }
- case 'v':
- if (!E) {- fprintf(stderr,"option -f must precede -%c\n", optc);
- Usage();
- }
- E->v = MAXSAMPL*strtod(optarg,&p);
- if (E->frq==0.0) E->v *= sqrt(0.5);
- if (p==optarg || *p) {- fprintf(stderr,"option -%c expects float value (%s)\n", optc, optarg);
- Usage();
- }
- break;
- case 'h':
- default:
- Usage();
- }
- }
-
- //fprintf(stderr,"Vol0 %8.3f\n", Vol0);
-
- fnam1=NULL; fd1=-1;
- //fprintf(stderr,"optind=%d argct=%d\n",optind,argct);
- if (optind <= argct-2) {- int ln1;
- fnam1=argv[optind++];
- fd1=open(fnam1,O_RDONLY);
- if (fd1<0) {- fprintf(stderr,"Open: %s %s\n",fnam1,strerror(errno)); return(1);
- }
- ln1=lseek(fd1,0,SEEK_END)/2;
- lseek(fd1,0,SEEK_SET);
- if (len<ln1) len = ln1;
- }
-
- if (optind != argct-1) Usage();
-
- fd2 = 1; /* stdout */
- fnam2=argv[optind++];
- if (strcmp(fnam2,"-")) {- fd2=open(fnam2,O_WRONLY|O_CREAT|O_TRUNC,0644);
- if (fd2<0) {- fprintf(stderr,"Open: %s %s\n",fnam2,strerror(errno)); return(1);
- }
- }
- //fprintf(stderr, "Files: %s %s\n",fnam1,fnam2);
-
- for (E=Env0; (E); E=E->next) env_init(E);
-
- ibuff=(SAMPL*)malloc(BSIZ*sizeof(SAMPL));
- poflo=moflo=0;
- max =MINSAMPL; min=MAXSAMPL;
- for(st=0; st<len; ){- int ct;
- SAMPL *ibp;
-
- ct = len - st; if (ct>BSIZ) ct=BSIZ;
- ReadN(fd1,ibuff,ct);
- for (ibp=ibuff; ibp<ibuff+ct; ibp++,st++) {- double v = *ibp;
-
- if (max<*ibp) max=*ibp;
- else if (min>*ibp) min=*ibp;
- v *= Vol0;
-
- for (E=Env0; (E); E=E->next) {- if (st>=E->r && st<E->e) {- v += env(E, st);
- }
- }
-
- if (v>MAXSAMPL) {- poflo++;
- v=MAXSAMPL;
- } else if (v<MINSAMPL) {- moflo++;
- v=MINSAMPL;
- }
- *ibp = rint(v);
- }
-
- write(fd2,(char*)ibuff,ct*sizeof(SAMPL));
- }
-
- fprintf(stderr,"input range: [%ld,%ld] pos/neg oflos: %d/%d\n",min,max,poflo,moflo);
- return 0;
-
-}
--- a/test/ltest.pl
+++ b/test/ltest.pl
@@ -34,82 +34,82 @@
#my ($rate0,$rate1)=(44100,44100); # sample rates
my ($rate0,$rate1)=(8000,22050); # sample rates
my $p=400; # silence before/after tonepulse
-my $env="4000:16000:4000"; # attack, duration, drop
+my $attack=4000;
+my $duration=16000;
#my ($rate0,$rate1)=(22050,8000); # sample rates
#my $p=1102; # silence before/after tonepulse
-#my $env="-e11025:44100:11025"; # attack, duration, drop
+#my $attack=11025;
+#my $duration=44100;
# parse commandline arguments
my $updown = 0; # set to 1 for up/down rate-conversion test
-my ($ding,$model,$t,$rms,$lim)=("./ding","./model","sw",11585.2, 0.5);+my ($model,$t,$rms,$lim)=("./model","sw",11585.2, 0.5); while ($_ = shift @ARGV) {- if ($_ eq "-l") {- ($ding,$model,$t,$rms,$lim)=("./lding","./lmodel","sl",759250125.0, 50.0);- } elsif ($_ eq "-ud") {- $updown=1;
- } else {- unshift @ARGV,$_;
- last;
- }
+ if ($_ eq "-l") {+ ($model,$t,$rms,$lim)=("./lmodel","sl",759250125.0, 50.0);+ } elsif ($_ eq "-ud") {+ $updown=1;
+ } else {+ unshift @ARGV,$_;
+ last;
+ }
}
if ($#ARGV >= 0) {- $effect="@ARGV";
+ $effect="@ARGV";
}
my $ratechange=0;
-if ($effect =~ m{^(resample|polyphase|rate)}) {- $ratechange=1;
+if ($effect =~ m{^(rabbit|resample|polyphase|rate)}) {+ $ratechange=1;
}
# output a nice header explaining the data
if ($ratechange==0) {- print("# Testing $sox -r$rate0 d/i0.xx.$t d/j0.xx.$t $effect\n");+ print("# Testing $sox -c1 -r$rate0 i0.xx.$t j0.xx.$t $effect\n"); } else {- print("# Testing $sox -r$rate0 d/i*.$t -r$rate1 d/u*.$t $effect\n");- if ($updown==1) {- print("# then back down to $rate0\n");- }
+ print("# Testing $sox -c1 -r$rate0 i*.$t -r$rate1 u*.$t $effect\n");+ if ($updown==1) {+ print("# then back down to $rate0\n");+ }
}
-print("# with tone pulses from 0.00 to 0.99 percent of Nyquist\n");-print("# produced by $ding -f0.xx -v0.5 -e$p:$env:$p d/i0.xx.$t\n");+print("# with tone pulses from 0.01 to 0.99 percent of Nyquist\n");# generate the test data
-mkdir("d",0775);my $f;
my %q;
my $nyq = ($rate0<=$rate1)? 1.0:($rate1/$rate0);
-for ($f=0.00; $f<1.001; $f+=0.01) {- my @mod;
+my $l=$attack + $duration + $attack;
+my $env="$attack:$duration:$attack"; # attack, duration, drop
+for ($f=0.01; $f<.999; $f+=0.01) {+ my @mod;
- #if ($f>0.995) { $f=0.999; }- my $s=sprintf("%4.2f",$f);- #print "$ding -f$s -v0.5 -d1.0 -e$p:$env:$p d/i$s.$t\n";
- qx{$ding -f$s -v0.5 -d1.0 -e$p:$env:$p d/i$s.$t &>/dev/null};- if ($ratechange==0) {- qx{$sox -r$rate0 d/i$s.$t -r$rate0 d/j$s.$t $effect} ;- @mod = grep {/v2max/} qx{$model -f$s -e$env $rate0 d/j$s.$t 2>&1};- } else {- qx{$sox -r$rate0 d/i$s.$t -r$rate1 d/u$s.$t $effect 2>/dev/null};- if ($updown) {- qx{$sox -r$rate1 d/u$s.$t -r$rate0 d/o$s.$t $effect 2>/dev/null};- @mod = grep {/v2max/} qx{$model -f$s -e$env $rate0:$rate0 d/o$s.$t 2>&1};- }else{- @mod = grep {/v2max/} qx{$model -f$s -e$env $rate0:$rate1 d/u$s.$t 2>&1};- }
- }
- print STDERR "$s: ",@mod;
- $_=shift(@mod);
- if (m{s2max *([0-9.]+), *v2max *([0-9.]+), *rmserr *(-?[0-9.]+)}) {- #print("$s $1\n");- #print("$s $1 $3\n");- my $v = ($1 > $lim)? $1 : $lim;
- my $r = ($3 > $lim)? $3 : $lim;
- my $dbv = 20*log($v/$rms)/log(10);
- my $dbr = 20*log($r/$rms)/log(10);
- printf("%s %.3f %.3f\n",$s,$dbv,$dbr);- }
- #unlink "d/i$s.$t","d/u$s.$t","d/o$s.$t";
+ my $s=sprintf("%4.2f",$f);+ qx{$sox -2r2 -n i$s.$t synth ${l}s sin $s vol .5 fade h ${attack}s ${l}s ${attack}s pad ${p}s ${p}s};+ if ($ratechange==0) {+ qx{$sox -c1 -r$rate0 i$s.$t -r$rate0 o$s.$t $effect} ;+ @mod = grep {/v2max/} qx{$model -f$s -e$env $rate0 o$s.$t 2>&1};+ } else {+ qx{$sox -c1 -r$rate0 i$s.$t -r$rate1 u$s.$t $effect 2>/dev/null};+ if ($updown) {+ qx{$sox -c1 -r$rate1 u$s.$t -r$rate0 o$s.$t $effect 2>/dev/null};+ @mod = grep {/v2max/} qx{$model -f$s -e$env $rate0:$rate0 o$s.$t 2>&1};+ }else{+ @mod = grep {/v2max/} qx{$model -f$s -e$env $rate0:$rate1 u$s.$t 2>&1};+ }
+ }
+ print STDERR "$s: ",@mod;
+ $_=shift(@mod);
+ if (m{s2max *([0-9.]+), *v2max *([0-9.]+), *rmserr *(-?[0-9.]+)}) {+ #print("$s $1\n");+ #print("$s $1 $3\n");+ my $v = ($1 > $lim)? $1 : $lim;
+ my $r = ($3 > $lim)? $3 : $lim;
+ my $dbv = 20*log($v/$rms)/log(10);
+ my $dbr = 20*log($r/$rms)/log(10);
+ printf("%s %.3f %.3f\n",$s,$dbv,$dbr);+ }
+ unlink "i$s.$t","u$s.$t","o$s.$t";
}
exit 0;
--- a/test/wtest.pl
+++ b/test/wtest.pl
@@ -28,7 +28,8 @@
my $rate=8000; # sample rates
my $p=200; # silence before/after tonepulse
-my $env="400:800:400"; # attack, duration, drop
+my $attack=400;
+my $duration=800;
my ($ding,$model,$t,$rms,$lim)=("./ding","./model","sw",11585.2, 0.5);@@ -36,26 +37,27 @@
# parse commandline arguments
while ($_ = shift @ARGV) {- if (m{^-[tgai]$}) {- $fmt=$_;
- } else {- unshift @ARGV,$_;
- last;
- }
+ if (m{^-[tgai]$}) {+ $fmt=$_;
+ } else {+ unshift @ARGV,$_;
+ last;
+ }
}
if ($#ARGV >= 0) {- $effect="@ARGV";
+ $effect="@ARGV";
}
+my $env="$attack:$duration:$attack"; # attack, duration, drop
+
# output a nice header explaining the data
print("# Testing gsm compress/decompress "); if ($fmt eq '-t') {- print("by $toast\n");+ print("by $toast\n"); }else{- print("by $sox -r$rate in.sw $fmt out.wav $effect\n");+ print("by $sox -r$rate in.sw $fmt out.wav $effect\n");}
-print("# with tone pulses from 0.00 to 0.99 percent of Nyquist\n");-print("# produced by $ding -f0.xx -v0.5 -e$p:$env:$p d/i0.xx.$t\n");+print("# with tone pulses from 0.01 to 0.99 percent of Nyquist\n"); print("# col 1 is frequency/Nyquist\n"); print("# col 2 is (power) dB gain\n"); print("# col 3 is (power) dB level of error signal\n");@@ -62,43 +64,41 @@
print("#\n#freq dB-gain dB-error\n");# generate the test data
-mkdir("d",0775);my $f;
my %q;
my $nyq = 1.0;
-for ($f=0.00; $f<1.001; $f+=0.01) {- my @mod;
+my $l=$attack + $duration + $attack;
+for ($f=0.01; $f<0.999; $f+=0.01) {+ my @mod;
- #if ($f>0.995) { $f=0.999; }- my $s=sprintf("%4.2f",$f);- #print "$ding -f$s -v0.5 -e$p:$env:$p -d1.0 d/i$s.$t\n";
- qx{$ding -f$s -v0.5 -e$p:$env:$p -d1.0 d/i$s.$t &>/dev/null};+ my $s=sprintf("%4.2f",$f);+ qx{$sox -2r2 -n i$s.$t synth ${l}s sin $s vol .5 fade h ${attack}s ${l}s ${attack}s pad ${p}s ${p}s};- if ($fmt eq '-t') {- qx{$toast -l d/i$s.$t};- qx{$toast -dl d/i$s.$t.gsm};- }else{- qx{cp d/i$s.$t d/a$s.$t 2>/dev/null};- qx{$sox -r$rate d/i$s.$t -g d/g$s.wav $effect 2>/dev/null};- unlink "d/i$s.$t";
- qx{$sox d/g$s.wav d/i$s.$t 2>/dev/null};- qx{cp d/i$s.$t d/b$s.$t 2>/dev/null};- unlink "d/g$s.wav";
- }
+ if ($fmt eq '-t') {+ qx{$toast -l i$s.$t};+ qx{$toast -dl i$s.$t.gsm};+ }else{+ qx{cp i$s.$t a$s.$t 2>/dev/null};+ qx{$sox -r$rate i$s.$t -g g$s.wav $effect 2>/dev/null};+ unlink "i$s.$t";
+ qx{$sox g$s.wav i$s.$t 2>/dev/null};+ qx{cp i$s.$t b$s.$t 2>/dev/null};+ unlink "g$s.wav";
+ }
- @mod = grep {/v2max/} qx{$model -f$s -e$env $rate d/i$s.$t 2>&1};- print STDERR "$s: ",@mod;
- $_=shift(@mod);
- if (m{s2max *([0-9.]+), *v2max *([0-9.]+), *rmserr *(-?[0-9.]+)}) {- #print("$s $1\n");- #print("$s $1 $3\n");- my $v = ($1 > $lim)? $1 : $lim;
- my $r = ($3 > $lim)? $3 : $lim;
- my $dbv = 20*log($v/$rms)/log(10);
- my $dbr = 20*log($r/$rms)/log(10);
- printf("%s %.3f %.3f\n",$s,$dbv,$dbr);- }
- unlink "d/i$s.$t";
+ @mod = grep {/v2max/} qx{$model -f$s -e$env $rate i$s.$t 2>&1};+ print STDERR "$s: ",@mod;
+ $_=shift(@mod);
+ if (m{s2max *([0-9.]+), *v2max *([0-9.]+), *rmserr *(-?[0-9.]+)}) {+ #print("$s $1\n");+ #print("$s $1 $3\n");+ my $v = ($1 > $lim)? $1 : $lim;
+ my $r = ($3 > $lim)? $3 : $lim;
+ my $dbv = 20*log($v/$rms)/log(10);
+ my $dbr = 20*log($r/$rms)/log(10);
+ printf("%s %.3f %.3f\n",$s,$dbv,$dbr);+ }
+ unlink "i$s.$t";
}
print("#freq dB-gain dB-error\n");exit 0;