Merge "vp9_spatial_svc_encoder.sh: Disable existing tests, add a test that works."
This commit is contained in:
@@ -25,12 +25,13 @@ vp9_spatial_svc_encoder_verify_environment() {
|
|||||||
|
|
||||||
# Runs vp9_spatial_svc_encoder. $1 is the test name.
|
# Runs vp9_spatial_svc_encoder. $1 is the test name.
|
||||||
vp9_spatial_svc_encoder() {
|
vp9_spatial_svc_encoder() {
|
||||||
local encoder="${LIBVPX_BIN_PATH}/vp9_spatial_svc_encoder"
|
local readonly \
|
||||||
encoder="${encoder}${VPX_TEST_EXE_SUFFIX}"
|
encoder="${LIBVPX_BIN_PATH}/vp9_spatial_svc_encoder${VPX_TEST_EXE_SUFFIX}"
|
||||||
local test_name="$1"
|
local readonly test_name="$1"
|
||||||
local output_file="${VPX_TEST_OUTPUT_DIR}/vp9_ssvc_encoder${test_name}.ivf"
|
local readonly \
|
||||||
local frames_to_encode="10"
|
output_file="${VPX_TEST_OUTPUT_DIR}/vp9_ssvc_encoder${test_name}.ivf"
|
||||||
local max_kf="9999"
|
local readonly frames_to_encode=10
|
||||||
|
local readonly max_kf=9999
|
||||||
|
|
||||||
shift
|
shift
|
||||||
|
|
||||||
@@ -40,8 +41,8 @@ vp9_spatial_svc_encoder() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
eval "${VPX_TEST_PREFIX}" "${encoder}" -w "${YUV_RAW_INPUT_WIDTH}" \
|
eval "${VPX_TEST_PREFIX}" "${encoder}" -w "${YUV_RAW_INPUT_WIDTH}" \
|
||||||
-h "${YUV_RAW_INPUT_HEIGHT}" -k "${max_kf}" -f "${frames_to_encode}" \
|
-h "${YUV_RAW_INPUT_HEIGHT}" -k "${max_kf}" -f "${frames_to_encode}" \
|
||||||
"$@" "${YUV_RAW_INPUT}" "${output_file}" ${devnull}
|
"$@" "${YUV_RAW_INPUT}" "${output_file}" ${devnull}
|
||||||
|
|
||||||
[ -e "${output_file}" ] || return 1
|
[ -e "${output_file}" ] || return 1
|
||||||
}
|
}
|
||||||
@@ -49,44 +50,54 @@ vp9_spatial_svc_encoder() {
|
|||||||
# Each mode is run with layer count 1-$vp9_ssvc_test_layers.
|
# Each mode is run with layer count 1-$vp9_ssvc_test_layers.
|
||||||
vp9_ssvc_test_layers=5
|
vp9_ssvc_test_layers=5
|
||||||
|
|
||||||
vp9_spatial_svc_mode_i() {
|
DISABLED_vp9_spatial_svc_mode_i() {
|
||||||
if [ "$(vp9_encode_available)" = "yes" ]; then
|
if [ "$(vp9_encode_available)" = "yes" ]; then
|
||||||
local test_name="${FUNCNAME}"
|
local readonly test_name="DISABLED_vp9_spatial_svc_mode_i"
|
||||||
for layers in $(seq 1 ${vp9_ssvc_test_layers}); do
|
for layers in $(seq 1 ${vp9_ssvc_test_layers}); do
|
||||||
vp9_spatial_svc_encoder "${test_name}" -m i -l ${layers}
|
vp9_spatial_svc_encoder "${test_name}" -m i -l ${layers}
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
vp9_spatial_svc_mode_altip() {
|
DISABLED_vp9_spatial_svc_mode_altip() {
|
||||||
if [ "$(vp9_encode_available)" = "yes" ]; then
|
if [ "$(vp9_encode_available)" = "yes" ]; then
|
||||||
local test_name="${FUNCNAME}"
|
local readonly test_name="DISABLED_vp9_spatial_svc_mode_altip"
|
||||||
for layers in $(seq 1 ${vp9_ssvc_test_layers}); do
|
for layers in $(seq 1 ${vp9_ssvc_test_layers}); do
|
||||||
vp9_spatial_svc_encoder "${test_name}" -m "alt-ip" -l ${layers}
|
vp9_spatial_svc_encoder "${test_name}" -m "alt-ip" -l ${layers}
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
vp9_spatial_svc_mode_ip() {
|
DISABLED_vp9_spatial_svc_mode_ip() {
|
||||||
if [ "$(vp9_encode_available)" = "yes" ]; then
|
if [ "$(vp9_encode_available)" = "yes" ]; then
|
||||||
local test_name="${FUNCNAME}"
|
local readonly test_name="DISABLED_vp9_spatial_svc_mode_ip"
|
||||||
vp9_spatial_svc_encoder "${test_name}" -m ip -l 1
|
vp9_spatial_svc_encoder "${test_name}" -m ip -l 1
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
vp9_spatial_svc_mode_gf() {
|
DISABLED_vp9_spatial_svc_mode_gf() {
|
||||||
if [ "$(vp9_encode_available)" = "yes" ]; then
|
if [ "$(vp9_encode_available)" = "yes" ]; then
|
||||||
local test_name="${FUNCNAME}"
|
local readonly test_name="DISABLED_vp9_spatial_svc_mode_gf"
|
||||||
for layers in $(seq 1 ${vp9_ssvc_test_layers}); do
|
for layers in $(seq 1 ${vp9_ssvc_test_layers}); do
|
||||||
vp9_spatial_svc_encoder "${test_name}" -m gf -l ${layers}
|
vp9_spatial_svc_encoder "${test_name}" -m gf -l ${layers}
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
vp9_spatial_svc_tests="vp9_spatial_svc_mode_i
|
vp9_spatial_svc() {
|
||||||
vp9_spatial_svc_mode_altip
|
if [ "$(vp9_encode_available)" = "yes" ]; then
|
||||||
vp9_spatial_svc_mode_ip
|
local readonly test_name="vp9_spatial_svc"
|
||||||
vp9_spatial_svc_mode_gf"
|
for layers in $(seq 1 ${vp9_ssvc_test_layers}); do
|
||||||
|
vp9_spatial_svc_encoder "${test_name}" -l ${layers}
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
readonly vp9_spatial_svc_tests="DISABLED_vp9_spatial_svc_mode_i
|
||||||
|
DISABLED_vp9_spatial_svc_mode_altip
|
||||||
|
DISABLED_vp9_spatial_svc_mode_ip
|
||||||
|
DISABLED_vp9_spatial_svc_mode_gf
|
||||||
|
vp9_spatial_svc"
|
||||||
|
|
||||||
if [ "$(vpx_config_option_enabled CONFIG_SPATIAL_SVC)" = "yes" ]; then
|
if [ "$(vpx_config_option_enabled CONFIG_SPATIAL_SVC)" = "yes" ]; then
|
||||||
run_tests \
|
run_tests \
|
||||||
|
Reference in New Issue
Block a user