ref: c60274855794d6fc854b516c3f8f8b824dcbb58b
parent: 997db6fc3f67aa499574e362b37adf4b07534ff7
parent: bc3a995f08a271e8b1cb20b4e1f39857c61aa9c5
author: James Zern <jzern@google.com>
date: Fri Aug 15 17:02:41 EDT 2014
Merge "test/vpxenc.sh: Always use --test-decode=FATAL"
--- a/test/vpxenc.sh
+++ b/test/vpxenc.sh
@@ -49,7 +49,9 @@
local readonly encoder="$(vpx_tool_path vpxenc)"
local readonly input="$1"
shift
- cat "${input}" | eval "${VPX_TEST_PREFIX}" "${encoder}" - "$@" ${devnull}+ cat "${input}" | eval "${VPX_TEST_PREFIX}" "${encoder}" - \+ --test-decode=fatal \
+ "$@" ${devnull}}
# Wrapper function for running vpxenc. Requires that LIBVPX_BIN_PATH points to
@@ -59,7 +61,9 @@
local readonly encoder="$(vpx_tool_path vpxenc)"
local readonly input="${1}"shift
- eval "${VPX_TEST_PREFIX}" "${encoder}" "$input" "$@" ${devnull}+ eval "${VPX_TEST_PREFIX}" "${encoder}" "$input" \+ --test-decode=fatal \
+ "$@" ${devnull}}
vpxenc_vp8_ivf() {@@ -125,7 +129,6 @@
--height="${YUV_RAW_INPUT_HEIGHT}" \ --limit="${TEST_FRAMES}" \--ivf \
- --test-decode=fatal \
--output="${output}" \ "${YUV_RAW_INPUT}"@@ -144,7 +147,6 @@
--width="${YUV_RAW_INPUT_WIDTH}" \ --height="${YUV_RAW_INPUT_HEIGHT}" \ --limit="${TEST_FRAMES}" \- --test-decode=fatal \
--output="${output}" \ "${YUV_RAW_INPUT}"@@ -165,7 +167,6 @@
--ivf \
--output="${output}" \--lossless=1 \
- --test-decode=fatal \
"${YUV_RAW_INPUT}" if [ ! -e "${output}" ]; then@@ -186,7 +187,6 @@
--output="${output}" \--min-q=0 \
--max-q=0 \
- --test-decode=fatal \
"${YUV_RAW_INPUT}" if [ ! -e "${output}" ]; then--
⑨