Updates for short clip test.

Signed-off-by: Stefan Westerfeld <stefan@space.twc.de>

src/gen-short-clip-adoc.sh

@@ -4,10 +4,10 @@ STRENGTHS="10 15 20 30"
 STR_CLIPS="5 10 15 20 25 30"
 MAIN_CLIPS="5 10 15 20 30 40 50 60"
 
-echo ".sync-codec-resistence$TRUNC"
+echo ".performance-by-clip-length"
 echo '[frame="topbot",options="header",cols="<2,8*>1"]'
 echo '|=========================='
-echo -n "| "
+echo -n "| Quality "
 for CLIP in $MAIN_CLIPS
 do
   echo -n "| $CLIP"
@@ -26,10 +26,10 @@ done
 echo
 echo '|=========================='
 
-echo ".sync-codec-resistence$TRUNC"
-echo '[frame="topbot",options="header",cols="<2,6*>1"]'
+echo ".effects-of-watermarking-strength"
+echo '[frame="topbot",options="header",cols="<1,7*>1"]'
 echo '|=========================='
-echo -n "| "
+echo -n "| Strength | SNR "
 for CLIP in $STR_CLIPS
 do
   echo -n "| $CLIP"
@@ -39,6 +39,7 @@ echo
 for STRENGTH in $STRENGTHS
 do
   echo -n "| $STRENGTH "
+  cat snr-$STRENGTH | awk '{printf ("| %.2f ", $1);}'
   for CLIP in $STR_CLIPS
   do
     cat str-$STRENGTH-mp3-*-$CLIP | awk '{bad += $1; n += $2} END {if (n==0) n=1;fer=100.0*bad/n; bold=fer>0?"*":" ";printf ("| %s%.2f%s", bold, fer, bold)}'

src/gen-short-clip-mk.sh

@@ -4,9 +4,16 @@ SEEDS=$(seq 4)
 STRENGTHS="10 15 20 30"
 STR_CLIPS="5 10 15 20 25 30"
 MAIN_CLIPS="5 10 15 20 30 40 50 60"
+MULTI_CLIP=4
 
 echo -n "all:"
 
+for STRENGTH in $STRENGTHS
+do
+  FILE="snr-$STRENGTH"
+  echo -n " $FILE"
+done
+
 for SEED in $SEEDS
 do
   for STRENGTH in $STRENGTHS
@@ -17,10 +24,7 @@ do
       echo -n " $FILE"
     done
   done
-done
 
-for SEED in $SEEDS
-do
   for CLIP in $MAIN_CLIPS
   do
     echo -n " main-mp3-256-$SEED-$CLIP main-mp3-128-$SEED-$CLIP main-ogg-128-$SEED-$CLIP main-double-mp3-128-$SEED-$CLIP"
@@ -38,38 +42,47 @@ do
     do
       FILE="str-$STRENGTH-mp3-$SEED-$CLIP"
       echo "$FILE:"
-      echo -e "\t( cd ..; AWM_RAND_PATTERN=1 AWM_PARAMS_ADD='--strength $STRENGTH' AWM_CLIP='$CLIP' AWM_SEEDS=$SEED AWM_FILE='t-$FILE' ber-test.sh mp3 128 ) >x$FILE"
+      echo -e "\t( cd ..; AWM_RAND_PATTERN=1 AWM_PARAMS_ADD='--strength $STRENGTH' AWM_CLIP='$CLIP' AWM_MULTI_CLIP='$MULTI_CLIP' AWM_SEEDS=$SEED AWM_FILE='t-$FILE' ber-test.sh mp3 128 ) >x$FILE"
       echo -e "\tmv x$FILE $FILE"
       echo
     done
   done
 done
 
+for STRENGTH in $STRENGTHS
+do
+  FILE="snr-$STRENGTH"
+  echo "$FILE:"
+  echo -e "\t( cd ..; AWM_PARAMS='--strength $STRENGTH' snr.sh ) >x$FILE"
+  echo -e "\tmv x$FILE $FILE"
+  echo
+done
+
 for SEED in $SEEDS
 do
   for CLIP in $MAIN_CLIPS
   do
     FILE="main-mp3-256-$SEED-$CLIP"
     echo "$FILE:"
-    echo -e "\t( cd ..; AWM_RAND_PATTERN=1 AWM_CLIP='$CLIP' AWM_SEEDS=$SEED AWM_FILE='t-$FILE' ber-test.sh mp3 256 ) >x$FILE"
+    echo -e "\t( cd ..; AWM_RAND_PATTERN=1 AWM_CLIP='$CLIP' AWM_MULTI_CLIP='$MULTI_CLIP' AWM_SEEDS=$SEED AWM_FILE='t-$FILE' ber-test.sh mp3 256 ) >x$FILE"
     echo -e "\tmv x$FILE $FILE"
     echo
 
     FILE="main-mp3-128-$SEED-$CLIP"
     echo "$FILE:"
-    echo -e "\t( cd ..; AWM_RAND_PATTERN=1 AWM_CLIP='$CLIP' AWM_SEEDS=$SEED AWM_FILE='t-$FILE' ber-test.sh mp3 128 ) >x$FILE"
+    echo -e "\t( cd ..; AWM_RAND_PATTERN=1 AWM_CLIP='$CLIP' AWM_MULTI_CLIP='$MULTI_CLIP' AWM_SEEDS=$SEED AWM_FILE='t-$FILE' ber-test.sh mp3 128 ) >x$FILE"
     echo -e "\tmv x$FILE $FILE"
     echo
 
     FILE="main-ogg-128-$SEED-$CLIP"
     echo "$FILE:"
-    echo -e "\t( cd ..; AWM_RAND_PATTERN=1 AWM_CLIP='$CLIP' AWM_SEEDS=$SEED AWM_FILE='t-$FILE' ber-test.sh ogg 128 ) >x$FILE"
+    echo -e "\t( cd ..; AWM_RAND_PATTERN=1 AWM_CLIP='$CLIP' AWM_MULTI_CLIP='$MULTI_CLIP' AWM_SEEDS=$SEED AWM_FILE='t-$FILE' ber-test.sh ogg 128 ) >x$FILE"
     echo -e "\tmv x$FILE $FILE"
     echo
 
     FILE="main-double-mp3-128-$SEED-$CLIP"
     echo "$FILE:"
-    echo -e "\t( cd ..; AWM_RAND_PATTERN=1 AWM_CLIP='$CLIP' AWM_SEEDS=$SEED AWM_FILE='t-$FILE' ber-test.sh double-mp3 128 ) >x$FILE"
+    echo -e "\t( cd ..; AWM_RAND_PATTERN=1 AWM_CLIP='$CLIP' AWM_MULTI_CLIP='$MULTI_CLIP' AWM_SEEDS=$SEED AWM_FILE='t-$FILE' ber-test.sh double-mp3 128 ) >x$FILE"
     echo -e "\tmv x$FILE $FILE"
     echo
   done