summaryrefslogtreecommitdiffstats
path: root/pts/test-resources/mencoder
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-10-03 15:12:06 -0400
committerMichael Larabel <michael@phx-laptop.(none)>2008-10-03 15:12:06 -0400
commitfaa872d624096ca4e2ee91727a1a6d83263a80a7 (patch)
tree6201b22e8b2124dccd0a590bc7a8be25da5c85c2 /pts/test-resources/mencoder
parent24d2198e40bf2f2543e4b7136d2a27cfdf77f14b (diff)
downloadphoronix-test-suite-upstream-faa872d624096ca4e2ee91727a1a6d83263a80a7.tar.gz
phoronix-test-suite-upstream-faa872d624096ca4e2ee91727a1a6d83263a80a7.tar.xz
phoronix-test-suite-upstream-faa872d624096ca4e2ee91727a1a6d83263a80a7.zip
pts: Move over all relevent tests to using the new universal micro-timer
functionality
Diffstat (limited to 'pts/test-resources/mencoder')
-rwxr-xr-xpts/test-resources/mencoder/install.sh8
-rw-r--r--pts/test-resources/mencoder/parse-results.php5
2 files changed, 3 insertions, 10 deletions
diff --git a/pts/test-resources/mencoder/install.sh b/pts/test-resources/mencoder/install.sh
index fcaf87c..1d5b049 100755
--- a/pts/test-resources/mencoder/install.sh
+++ b/pts/test-resources/mencoder/install.sh
@@ -14,9 +14,7 @@ rm -rf MPlayer-1.0rc2/
echo "#!/bin/sh
-echo \"#!/bin/sh
-./mplayer_/bin/mencoder \$TEST_EXTENDS/pts-trondheim.avi -o /dev/null -ovc lavc -oac copy -lavcopts vcodec=mpeg4:threads=\$NUM_CPU_CORES:mbd=2:trell=1:v4mv=1:vstrict=1\" > encode-process
-chmod +x encode-process
-
-/usr/bin/time -f \"Encoding Time: %e Seconds\" ./encode-process 2>&1 | grep Seconds" > mencoder
+\$TIMER_START
+./mplayer_/bin/mencoder \$TEST_EXTENDS/pts-trondheim.avi -o /dev/null -ovc lavc -oac copy -lavcopts vcodec=mpeg4:threads=\$NUM_CPU_CORES:mbd=2:trell=1:v4mv=1:vstrict=1
+\$TIMER_STOP" > mencoder
chmod +x mencoder
diff --git a/pts/test-resources/mencoder/parse-results.php b/pts/test-resources/mencoder/parse-results.php
deleted file mode 100644
index ac864bb..0000000
--- a/pts/test-resources/mencoder/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Encoding Time:") + 14);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>