[xiph-commits] r17702 - trunk/squishyball

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-12-01 13:15:10 -0800 (Wed, 01 Dec 2010)
New Revision: 17702

Modified:
   trunk/squishyball/main.c
   trunk/squishyball/squishyball.1
Log:
Make -C default behavior as a result of gmaxwell challanging my manhood.


Modified: trunk/squishyball/main.c
===================================================================
--- trunk/squishyball/main.c	2010-12-01 20:58:30 UTC (rev 17701)
+++ trunk/squishyball/main.c	2010-12-01 21:15:10 UTC (rev 17702)
@@ -48,14 +48,13 @@
 #define MAXFILES 10
 int sb_verbose=0;
 
-char *short_options="abcd:De:hn:rRs:tvVxBMSgC";
+char *short_options="abcd:De:hn:rRs:tvVxBMSg";
 
 struct option long_options[] = {
   {"ab",no_argument,0,'a'},
   {"abx",no_argument,0,'b'},
   {"beep-flip",no_argument,0,'B'},
   {"casual",no_argument,0,'c'},
-  {"clip-check",no_argument,0,'C'},
   {"device",required_argument,0,'d'},
   {"force-dither",no_argument,0,'D'},
   {"end-time",no_argument,0,'e'},
@@ -89,7 +88,6 @@
           "  -c --casual            : casual mode; load up to ten\n"
           "                           samples for non-randomized\n"
           "                           comparison without trials (default).\n"
-          "  -C --clip-check        : Check loaded samples for clipping.\n"
           "  -d --device <N|dev>    : If a number, output to Nth\n"
           "                           sound device.  If a device name,\n"
           "                           use output driver/device matching\n"
@@ -350,7 +348,6 @@
   int test_mode=3;
   int test_files;
   char *device=NULL;
-  int clip_check=0;
   int force_dither=0;
   int force_truncate=0;
   int restart_mode=0;
@@ -449,9 +446,6 @@
     case 'g':
       running_score=1;
       break;
-    case 'C':
-      clip_check=1;
-      break;
     default:
       usage(stderr);
       exit(1);
@@ -487,9 +481,8 @@
   outbits=16;
   for(i=0;i<test_files;i++){
     pcm[i]=load_audio_file(argv[optind+i]);
-    if(clip_check)
-      check_warn_clipping(pcm[i]);
     if(!pcm[i])exit(2);
+    check_warn_clipping(pcm[i]);
 
     if(!pcm[i]->dither && force_dither)pcm[i]->dither=1;
     if(pcm[i]->bits!=16 && force_truncate)pcm[i]->dither=0;

Modified: trunk/squishyball/squishyball.1
===================================================================
--- trunk/squishyball/squishyball.1	2010-12-01 20:58:30 UTC (rev 17701)
+++ trunk/squishyball/squishyball.1	2010-12-01 21:15:10 UTC (rev 17702)
@@ -72,10 +72,6 @@
 .SH OTHER OPTIONS
 .IP "\fB-B --beep-flip"
 Mark transitions between samples with a short beep.
-.IP "\fB-C --clip-check"
-Check input samples for clipping.  Floating point samples can be
-checked accurately. Integer samples are checked heuristically; two or
-more consecutive full-range samples in a channel are counted as clipped.
 .IP "\fB-d --device \fIN\fR|\fIdevice"
 If a number, output to Nth available sound device.  If a device name,
 use output device matching that device name.  The backend audio driver is
@@ -190,6 +186,12 @@
 which forces dithering for lossy files as well.  Down-conversion
 dithering can be disabled for all input types with \fB-t\fR.
 
+Samples are checked for clipping at load time. Floating point samples
+can be checked accurately. Integer samples are checked heuristically;
+two or more consecutive full-range samples in a channel are counted as
+clipped.  If any definitely or probably clipped samples are found,
+\fBsquishyball\fR issues a warning.
+
 .SH IMPORTANT USAGE NOTES
 .IP "\fBPlayback Depth and Rate"