From 8f6cf4f2c4bcc9589d2e66325037eba7fea09a04 Mon Sep 17 00:00:00 2001
From: Yi Luo <luoyi@google.com>
Date: Tue, 25 Jul 2017 14:11:06 -0700
Subject: [PATCH] Fixed: the nightly_config.sh was not called

- Make the display more clean.

Change-Id: I94698655e9b81b0927f763ed80e6fcd6ee140bb0
---
 scripts/av1_conf_build.sh    |  1 +
 scripts/nightly_speed.sh     |  2 +-
 scripts/video_sequence.sh    | 24 ++++++++++++------------
 scripts/vp9_nightly_speed.sh |  5 +++--
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/scripts/av1_conf_build.sh b/scripts/av1_conf_build.sh
index 1a30f8c67..bda2abbb7 100755
--- a/scripts/av1_conf_build.sh
+++ b/scripts/av1_conf_build.sh
@@ -2,6 +2,7 @@
 
 root_dir=$1
 build_dir=$root_dir/release
+script_dir=~/Dev/sandbox/libvpx/scripts
 exp_tool=experimental
 
 cd $build_dir
diff --git a/scripts/nightly_speed.sh b/scripts/nightly_speed.sh
index 691b8fca1..ee4a38785 100755
--- a/scripts/nightly_speed.sh
+++ b/scripts/nightly_speed.sh
@@ -82,7 +82,7 @@ else
   eflag=mismatch
 fi
 
-echo "AV1 bitstream: " "$bstream"
+echo "AV1: $(basename $video), bitrate=$bitrate profile=$profile frames=$frames"
 
 taskset -c $core_id ./aomdec /dev/shm/"$bstream" $codec --i420 --noblit --summary 2>&1 &>> $dlog
 if [ "$?" -ne 0 ]; then
diff --git a/scripts/video_sequence.sh b/scripts/video_sequence.sh
index b1cb01d7e..51b5e0d05 100755
--- a/scripts/video_sequence.sh
+++ b/scripts/video_sequence.sh
@@ -7,16 +7,16 @@
 # bitrate=500
 # fps="30/1"
 
-# video=~/Dev/samples/videos/speed-set/touchdown_pass_480p.y4m
-# wi=854
-# he=480
-# frames=30
-# bitrate=2400
-# fps="30000/1001"
-
-video=~/Dev/samples/videos/speed-set/BasketballDrive_1920x1080_50.y4m
-wi=1920
-he=1080
+video=~/Dev/samples/videos/speed-set/touchdown_pass_480p.y4m
+wi=854
+he=480
 frames=150
-bitrate=4000
-fps="50/1"
+bitrate=600
+fps="30000/1001"
+
+# video=~/Dev/samples/videos/speed-set/BasketballDrive_1920x1080_50.y4m
+# wi=1920
+# he=1080
+# frames=150
+# bitrate=4000
+# fps="50/1"
diff --git a/scripts/vp9_nightly_speed.sh b/scripts/vp9_nightly_speed.sh
index 15d5eec12..a7148fa71 100755
--- a/scripts/vp9_nightly_speed.sh
+++ b/scripts/vp9_nightly_speed.sh
@@ -69,7 +69,7 @@ else
   eflag=mismatch
 fi
 
-echo "VP9 bitstream: " "$bstream"
+echo "VP9: $(basename $video), bitrate=$bitrate profile=$profile frames=$frames"
 
 taskset -c $core_id ./vpxdec /dev/shm/"$bstream" $codec --i420 --noblit --summary 2>&1 &>> $dlog
 if [ "$?" -ne 0 ]; then
@@ -84,5 +84,6 @@ dfps=`awk '{print $9}' < $dlog`
 dfps=`echo $dfps | sed 's/(//'`
 
 echo -e '\t'"Enc fps   Dec fps    PSNR"'\t\t\t\t\t\t\t'"Enc status   Dec status"
-echo -e '\t'$efps"        "$dfps"   "$psnr'\t'$eflag"            "$dflag
+echo -e '\t'$efps"        "$dfps"     "$psnr'\t'$eflag"            "$dflag
+printf "\n"