[xiph-commits] r17700 - trunk/squishyball

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2010-12-01 11:59:04 -0800 (Wed, 01 Dec 2010)
New Revision: 17700

Modified:
   trunk/squishyball/audio.c
   trunk/squishyball/configure.ac
   trunk/squishyball/main.c
   trunk/squishyball/squishyball.1
Log:
Update version
Alter beep-flip window slightly
Document beep-flip change



Modified: trunk/squishyball/audio.c
===================================================================
--- trunk/squishyball/audio.c	2010-12-01 19:18:23 UTC (rev 17699)
+++ trunk/squishyball/audio.c	2010-12-01 19:59:04 UTC (rev 17700)
@@ -368,17 +368,13 @@
   for(;i<fragsamples;i++)
     fadewindow2[i] = 0.f;
 
-  /* fadewindow3 crossfades with attenuation to give headroom for a beep */
-  for(i=0;i<fragsamples/4;i++){
-    float val = cosf(M_PI*2.f*(i+.5f)/fragsamples);
-    fadewindow3[i] = val*val*.875f+.125f;
+  /* fadewindow3 is like fadewindow 2 but with briefer silence */
+  for(i=0;i<fragsamples/2;i++){
+    float val = cosf(M_PI*(i+.5f)/fragsamples);
+    fadewindow3[i] = val*val;
   }
-  for(;i<fragsamples*3/4;i++)
-    fadewindow3[i] = .125f;
-  for(;i<fragsamples;i++){
-    float val = cosf(M_PI*2.f*(i-fragsamples*3/4+.5f)/fragsamples);
-    fadewindow3[i] = val*val*.125f;
-  }
+  for(;i<fragsamples;i++)
+    fadewindow3[i] = 0.f;
 
   /* Single beep for flipping */
   for(i=0;i<fragsamples/4;i++){

Modified: trunk/squishyball/configure.ac
===================================================================
--- trunk/squishyball/configure.ac	2010-12-01 19:18:23 UTC (rev 17699)
+++ trunk/squishyball/configure.ac	2010-12-01 19:59:04 UTC (rev 17700)
@@ -4,7 +4,7 @@
 cflags_save="$CFLAGS"
 AC_PREREQ(2.57)
 AC_INIT(main.c)
-AM_INIT_AUTOMAKE(squishyball, 20101129, [vorbis-dev at xiph.org])
+AM_INIT_AUTOMAKE(squishyball, 20101201, [vorbis-dev at xiph.org])
 AC_CONFIG_FILES([Makefile])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])
 

Modified: trunk/squishyball/main.c
===================================================================
--- trunk/squishyball/main.c	2010-12-01 19:18:23 UTC (rev 17699)
+++ trunk/squishyball/main.c	2010-12-01 19:59:04 UTC (rev 17700)
@@ -441,7 +441,7 @@
       sb_verbose=1;
       break;
     case 'V':
-      fprintf(stdout,"%s\n",VERSION);
+      fprintf(stdout,"Xiph.Org Squishyball %s\n",VERSION);
       exit(0);
     case 'g':
       running_score=1;

Modified: trunk/squishyball/squishyball.1
===================================================================
--- trunk/squishyball/squishyball.1	2010-12-01 19:18:23 UTC (rev 17699)
+++ trunk/squishyball/squishyball.1	2010-12-01 19:59:04 UTC (rev 17700)
@@ -1,7 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii squishyball.1
 .\"
-.TH squishyball 1 "2010 November 29" "Xiph.Org Foundation" "Xiph Evaluation Tools"
+.TH squishyball 1 "2010 December 1" "Xiph.Org Foundation" "Xiph Evaluation Tools"
 
 .SH NAME
 squishyball \- perform sample comparison testing on the command line
@@ -200,11 +200,12 @@
 
 .IP "\fBFlip-Mode Choice"
 
-\fBSilent Mode\fR smoothly transitions between samples.  It allows
-the most direct comparison between signals without any intevening
-auditory distraction. However, the temporary combination of different
-signals may cause unintended cancellation and comb-filtering effects that can
-give away the 'unknown' sample just as a 'pop' would.
+\fBSilent Mode\fR smoothly transitions between samples.  It allows the
+most direct comparison between signals without any intervening auditory
+distraction. However, the temporary combination of different signals
+may cause unintended cancellation and comb-filtering effects that can
+give away the 'unknown' sample just as a 'pop' from an instantaneous
+transition would.
 
 \fBMark Mode\fR quickly fades to silence before flipping to another
 sample, marking the transition.  Because the samples never overlap,
@@ -212,11 +213,10 @@
 audible dip between samples may distract from listening, potentially
 making it slightly more difficult to detect legitimate artifacts.
 
-\fBBeep Mode\fR smoothly crosslaps samples, momentarily attenuates
-the transition, and adds a soft 'beep' to mark where the transition
-occurs.  It makes the transition point especially obvious, but may
-occasionally suffer from both crosslap artifacts (as in Silent mode)
-and momentary distraction (as in Mark mode).
+\fBBeep Mode\fR is similar to mark mode but adds a soft 'beep' to mark
+where the transition occurs.  It makes the transition point especially
+obvious.  It does not crosslap the samples; one sample is faded
+completely before the second is mixed in as in mark mode.
 
 .SH AUTHORS
 Monty <monty at xiph.org>