提交: 90cf1107f65fe1edce7dd6cdc7f40614d1815247 - ogatool (git)

oga's tools

Commit MetaInfo

• 修订版: 90cf1107f65fe1edce7dd6cdc7f40614d1815247 (tree)
• 时间: 2021-05-08 18:34:21
• 作者: hyperoga <hyperoga@gmai...>
• Commiter: hyperoga

Log Message

Merge branch 'master' of http://pf.osdn.jp/gitroot/h/hy/hyperoga/ogatool

更改概述

• modified: wavcut.c

差异

--- a/wavcut.c
+++ b/wavcut.c
@@ -13,6 +13,8 @@
  *    07/12/02 V0.27 support -m (merge wavs)
  *    11/01/29 V0.28 fix display bug
  *    12/03/19 V0.29 fix -ex degrade  (調査中 ex. -ex 00:05-21:50) 
+ *    21/05/02 V0.30 support -cs cut silent part
+ *    21/05/03 V0.31 fix LIST chunk bug
  *
  *
  *    お勧め: wavcut -s -lv 20 -ln 15
@@ -48,7 +50,7 @@
 #define strncasecmp strnicmp
 #endif /* _WIN32 */
 
-#define VER      "0.28"
+#define VER      "0.31"
 #define dprintf if (vf) printf
 #define dprintf2 if (vf >= 2) printf
 #define sgn(x) (x==0)?0:((x>0)?1:-1)
@@ -66,6 +68,7 @@ int  nf     = 0;    /* -no normalize                                  */
 int  volf   = 0;    /* -vol volume                            V0.25-A */
 int  rvf    = 0;    /* -rv reduce voice V0.24-A                       */
 int  mf     = 0;    /* -m  merge wavfiles                     V0.27-A */
+int  csf    = 0;    /* -cs cut silent part                    V0.30-A */
 int  peak_level = 0;  /* peak level for -no                           */
 int  max_level  = 0;  /* max  level for -no                           */
 long pre_datlen = 0;  /* heders total length to wav data              */
@@ -272,6 +275,7 @@ int ReadWavData(FILE *fp)
 /*
  *  Write wav headers
  *
+ *    note: not write fact,LIST chunk
  */
 int WriteWavHeaders(FILE *wfp,
                     struct riff_hdr *rhdr,
@@ -287,8 +291,8 @@ int WriteWavHeaders(FILE *wfp,
     fwrite(rhdr, sizeof(struct riff_hdr), 1, wfp);
 
     for (i = 0; i<cnkcnt; i++) {
-        if (strncmp(cnkhdr[i].id, "fact", 4)) {
-	    /* excpt fact chunk (fmt, data...) */
+        if (strncmp(cnkhdr[i].id, "fact", 4) && strncmp(cnkhdr[i].id, "LIST", 4)) { /* V0.31-C */
+	    /* write excpt fact,LIST chunk (fmt, data...) */
             fwrite(&cnkhdr[i], sizeof(struct chunk_hdr), 1, wfp); /* chunk header */
 	    if (!strncmp(cnkhdr[i].id, "fmt ", 4)) {
 		fwrite(cnkfmt, cnkhdr[i].len, 1, wfp); /* fmt body   */
@@ -444,7 +448,7 @@ int WavAnalyze(FILE *fp)
 		}
 	    }
 
-	    if (sf || (ntment && outf)) {
+	    if (sf || csf || (ntment && outf)) {  /* V0.30-A */
                 /* ### Open Output File */
 	        sprintf(fname, "%s_%03d.wav", in_fname, file_cnt++);
 	        printf("## Writing %s ...\n", fname);
@@ -470,8 +474,12 @@ int WavAnalyze(FILE *fp)
                 buf16 = (short *)buf;                             /* V0.21-A */
 
 		if (wfp) {
-		    fwrite(buf, 1, gUnit, wfp);
-		    data_size += len;   /* data chunk size for write */
+		    if (csf && contf) {  /* V0.30-A */
+			/* -cs指定でblank中は書き込みスキップ */
+		    } else {
+		    	fwrite(buf, 1, gUnit, wfp);
+		    	data_size += len;   /* data chunk size for write */
+		    }
 		}
 
                 if (df) {
@@ -554,7 +562,9 @@ int WavAnalyze(FILE *fp)
 				         *ckfmt->dwAvgBytesPerSec*60)
 					 /ckfmt->dwAvgBytesPerSec));
 
-                        data_size = 0;   /* reset data chunk size */
+			if (csf == 0) {      /* V0.30-A */
+                            data_size = 0;   /* reset data chunk size */
+			}
 			if (sf) {
 	                    sprintf(fname, "%s_%03d.wav", in_fname, file_cnt++);
 	                    printf("## Writing %s ...\n", fname);
@@ -1365,13 +1375,14 @@ void usage()
 {
     printf("wavcut Ver %s\n", VER);
     printf("usage: wavcut [-d]\n");
-    printf("              { [-s] [-lv <cut_level(%d)>] [-ln <blank_len>(%d)>]\n", th_val, bl_sec);
-    printf("               | -ex mm:ss-mm:ss[,mm:ss-ss,...]\n");
+    printf("              { [{-s|-cs}] [-lv <cut_level(%d)>] [-ln <blank_len>(%d)>]\n", th_val, bl_sec);
+    printf("               | -ex mm:ss-mm:ss[,mm:ss-mm:ss,...]\n");
     printf("               | {-no | -vol <%%>}\n");
     printf("               | -rv }\n");
     printf("              [<wav_file>]\n");
     printf("       -d  : display data\n");
     printf("       -s  : split wav data\n");
+    printf("       -cs : cut silent part\n");
     printf("       -lv : blank level. default:%d (x0.1%%)\n", th_val);
     printf("       -ln : time to recognize blank. default:%d (x0.1sec)\n", bl_sec);
     printf("       -ex : extract wav part\n");
@@ -1379,7 +1390,7 @@ void usage()
     printf("       -vol: set volume\n");
     printf("       -rv : reduce voice part\n");
     printf("usage: wavcut -m <wav_file> <wav_file> ...\n");   /* V0.27-A */
-    printf("       -m  : merge wav files\n");                 /* V0.27-A */
+    printf("       -m  : merge wav files (not available)\n"); /* V0.27-A */
     exit(1);
 }
 
@@ -1409,12 +1420,23 @@ int main(int a, char *b[])
             continue;
         }
         if (!strncmp(b[i],"-s",2)) {
-	    if (ntment) {
+	    if (ntment || csf) {      /* V0.30-C */
 	        usage();
 	    }
             sf = 1;    /* Split Wav Data */
             continue;
         }
+
+	/* V0.30-A start */
+        if (!strncmp(b[i],"-cs",2)) {
+	    if (ntment || sf) {
+	        usage();
+	    }
+            csf = 1;   /* Cut Silent Part */
+            continue;
+        }
+	/* V0.30-A end   */
+
         if (!strcmp(b[i],"-m")) {
             mf = 1;    /* Merge Wav Files */
             continue;
@@ -1441,7 +1463,7 @@ int main(int a, char *b[])
 	/* V0.25-A end   */
 
         if (i+1 < a && !strncmp(b[i],"-ex",3)) {
-	    if (sf) {
+	    if (sf || csf) {       /* V0.30-C */
 	        usage();
 	    }
             ntment = GetTimes(b[++i], &start_dsec, &end_dsec); /* Extract wav */
@@ -1463,7 +1485,7 @@ int main(int a, char *b[])
     }
 
     /* V0.27-A start */
-    if (mf && (volf || nf || sf || ntment || rvf)) {
+    if (mf && (volf || nf || sf || csf || ntment || rvf)) {   /* V0.30-C */
         usage();
     }