shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vpxdec.sh: fix vp9_webm_less_than_50_frames w/valgrind"

--- a/test/vpxdec.sh

+++ b/test/vpxdec.sh

@@ -96,9 +96,14 @@

   if [ "$(vpxdec_can_decode_vp9)" = "yes" ] && \

      [ "$(webm_io_available)" = "yes" ]; then

     local readonly decoder="$(vpx_tool_path vpxdec)"

-    eval "${VPX_TEST_PREFIX}" "${decoder}" "${VP9_LT_50_FRAMES_WEBM_FILE}" \

-      --summary --noblit 2>&1 \

-      | awk '{ exit $1 != 10; }'

+    local readonly expected=10

+    local readonly num_frames=$(${VPX_TEST_PREFIX} "${decoder}" \

+      "${VP9_LT_50_FRAMES_WEBM_FILE}" --summary --noblit 2>&1 \

+      | awk '/^[0-9]+ decoded frames/ { print $1 }')

+    if [ "$num_frames" -ne "$expected" ]; then

+      elog "Output frames ($num_frames) != expected ($expected)"

+      return 1

+    fi

   fi

 }