Merge pull request #3 from drowe67/dr-cleanup21.2.0

Cleanup Part 2

1 files changed, 0 insertions, 164 deletions

diff --git a/unittest/tnlp.c b/unittest/tnlp.c
deleted file mode 100644
index 82f0a96..0000000
--- a/unittest/tnlp.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*---------------------------------------------------------------------------*\
-
-  FILE........: tnlp.c
-  AUTHOR......: David Rowe
-  DATE CREATED: 23/3/93
-
-  Test program for non linear pitch estimation functions.
-
-\*---------------------------------------------------------------------------*/
-
-/*
-  Copyright (C) 2009 David Rowe
-
-  All rights reserved.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License version 2.1, as
-  published by the Free Software Foundation.  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 Lesser General Public License
-  along with this program; if not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-
-#include "defines.h"
-#include "dump.h"
-#include "sine.h"
-#include "nlp.h"
-#include "kiss_fft.h"
-
-int   frames;
-
-/*---------------------------------------------------------------------------*\
-
-   switch_present()
-
-   Searches the command line arguments for a "switch".  If the switch is
-   found, returns the command line argument where it ws found, else returns
-   NULL.
-
-\*---------------------------------------------------------------------------*/
-
-int switch_present(sw,argc,argv)
-  char sw[];     /* switch in string form */
-  int argc;      /* number of command line arguments */
-  char *argv[];  /* array of command line arguments in string form */
-{
-  int i;       /* loop variable */
-
-  for(i=1; i<argc; i++)
-    if (!strcmp(sw,argv[i]))
-      return(i);
-
-  return 0;
-}
-
-/*---------------------------------------------------------------------------*\
-
-                                    MAIN
-
-\*---------------------------------------------------------------------------*/
-
-int main(int argc, char *argv[])
-{
-    if (argc < 3) {
-	printf("\nusage: tnlp InputRawSpeechFile Outputf0PitchTextFile "
-	       "[--dump DumpFile] [--Fs SampleRateHz]\n");
-        exit(1);
-    }
-    
-    int Fs = 8000;
-    if (switch_present("--Fs",argc,argv)) {
-        Fs = atoi(argv[argc+1]);
-    }
-
-    C2CONST c2const = c2const_create(Fs, N_S);
-    int   n = c2const.n_samp;
-    int   m = c2const.m_pitch;
-    FILE *fin,*fout;
-    short buf[n];
-    float Sn[m];	        /* float input speech samples */
-    kiss_fft_cfg  fft_fwd_cfg;
-    COMP  Sw[FFT_ENC];	        /* DFT of Sn[] */
-    float w[m];	                /* time domain hamming window */
-    COMP  W[FFT_ENC];	        /* DFT of w[] */
-    float pitch_samples;
-    int   i;
-    float f0, prev_f0;
-    void  *nlp_states;
-    #ifdef DUMP
-    int   dump;
-    #endif
-
-    /* Input file */
-
-    if ((fin = fopen(argv[1],"rb")) == NULL) {
-      printf("Error opening input speech file: %s\n",argv[1]);
-      exit(1);
-    }
-
-    /* Output file */
-
-    if ((fout = fopen(argv[2],"wt")) == NULL) {
-      printf("Error opening output text file: %s\n",argv[2]);
-      exit(1);
-    }
-
-    #ifdef DUMP
-    dump = switch_present("--dump",argc,argv);
-    if (dump)
-      dump_on(argv[dump+1]);
-    #else
-    /// TODO
-    /// #warning "Compile with -DDUMP if you expect to dump anything."
-    #endif
-
-    for(i=0; i<m; i++) {
-      Sn[i] = 0.0;
-    }
-
-    nlp_states = nlp_create(&c2const);
-    fft_fwd_cfg = kiss_fft_alloc(FFT_ENC, 0, NULL, NULL);
-    make_analysis_window(&c2const, fft_fwd_cfg, w, W);
-
-    frames = 0;
-    prev_f0 = 1/P_MAX_S;
-    while(fread(buf, sizeof(short), n, fin)) {
-      /* Update input speech buffers */
-
-      for(i=0; i<m-n; i++)
-        Sn[i] = Sn[i+n];
-      for(i=0; i<n; i++)
-        Sn[i+m-n] = buf[i];
-      dft_speech(&c2const, fft_fwd_cfg, Sw, Sn, w);
-      #ifdef DUMP
-      dump_Sn(m, Sn); dump_Sw(Sw);
-      #endif
-
-      f0 = nlp(nlp_states, Sn, n, &pitch_samples, Sw, W, &prev_f0);
-
-      fprintf(stderr,"%d %f %f\n", frames++, f0, pitch_samples);
-      fprintf(fout,"%f %f\n", f0, pitch_samples);
-    }
-
-    fclose(fin);
-    fclose(fout);
-    #ifdef DUMP
-    if (dump) dump_off();
-    #endif
-    nlp_destroy(nlp_states);
-
-    return 0;
-}
-
-