simple_encoder: make it so we can run it in tests.

Added a limit, resolving a todo and added a limit parameter so that we
can do a very simple fast encode in 1 pass.

Change-Id: I265cd912d970d560a0b00b86e6c7ec7b6fef1e7b

diff --git a/test/simple_encoder.sh b/test/simple_encoder.sh
index 1196be26469eaf1d69626d5d17c5908baa27b28b..3657156f2085e8b6c3ed5c64fa837780e50087b1 100755 (executable)
--- a/test/simple_encoder.sh
+++ b/test/simple_encoder.sh
@@ -35,28 +35,19 @@ simple_encoder() {
   fi
 
   eval "${AOM_TEST_PREFIX}" "${encoder}" "${codec}" "${YUV_RAW_INPUT_WIDTH}" \
-      "${YUV_RAW_INPUT_HEIGHT}" "${YUV_RAW_INPUT}" "${output_file}" 9999 0 100 \
+      "${YUV_RAW_INPUT_HEIGHT}" "${YUV_RAW_INPUT}" "${output_file}" 9999 0 5 \
       ${devnull}
 
   [ -e "${output_file}" ] || return 1
 }
 
-simple_encoder_aom() {
-  if [ "$(aom_encode_available)" = "yes" ]; then
-    simple_encoder aom || return 1
-  fi
-}
 
-# TODO(tomfinegan): Add a frame limit param to simple_encoder and enable this
-# test. AV1 is just too slow right now: This test takes 4m30s+ on a fast
-# machine.
-DISABLED_simple_encoder_av1() {
+simple_encoder_av1() {
   if [ "$(av1_encode_available)" = "yes" ]; then
     simple_encoder av1 || return 1
   fi
 }
 
-simple_encoder_tests="simple_encoder_aom
-                      DISABLED_simple_encoder_av1"
+simple_encoder_tests="simple_encoder_av1"
 
 run_tests simple_encoder_verify_environment "${simple_encoder_tests}"