Commit 8fdfeb3f authored by Tom Finegan's avatar Tom Finegan Committed by Gerrit Code Review
Browse files

Merge "vpxenc.sh: Add basic multithreaded frame parallel encode test."

parents c040f96e 92f7d790
...@@ -290,6 +290,35 @@ vpxenc_vp9_webm_rt_multithread_tiled() { ...@@ -290,6 +290,35 @@ vpxenc_vp9_webm_rt_multithread_tiled() {
fi fi
} }
vpxenc_vp9_webm_rt_multithread_tiled_frameparallel() {
if [ "$(vpxenc_can_encode_vp9)" = "yes" ] && \
[ "$(webm_io_available)" = "yes" ]; then
local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9_rt_mt_t_fp.webm"
local readonly tilethread_min=2
local readonly tilethread_max=4
local readonly num_threads="$(seq ${tilethread_min} ${tilethread_max})"
local readonly num_tile_cols="$(seq ${tilethread_min} ${tilethread_max})"
for threads in ${num_threads}; do
for tile_cols in ${num_tile_cols}; do
vpxenc $(y4m_input_720p) \
$(vpxenc_rt_params vp9) \
--threads=${threads} \
--tile-columns=${tile_cols} \
--frame-parallel=1 \
--output="${output}"
done
done
if [ ! -e "${output}" ]; then
elog "Output file does not exist."
return 1
fi
rm "${output}"
fi
}
vpxenc_vp9_webm_2pass() { vpxenc_vp9_webm_2pass() {
if [ "$(vpxenc_can_encode_vp9)" = "yes" ] && \ if [ "$(vpxenc_can_encode_vp9)" = "yes" ] && \
[ "$(webm_io_available)" = "yes" ]; then [ "$(webm_io_available)" = "yes" ]; then
...@@ -390,6 +419,7 @@ vpxenc_tests="vpxenc_vp8_ivf ...@@ -390,6 +419,7 @@ vpxenc_tests="vpxenc_vp8_ivf
vpxenc_vp9_webm vpxenc_vp9_webm
vpxenc_vp9_webm_rt vpxenc_vp9_webm_rt
vpxenc_vp9_webm_rt_multithread_tiled vpxenc_vp9_webm_rt_multithread_tiled
vpxenc_vp9_webm_rt_multithread_tiled_frameparallel
vpxenc_vp9_webm_2pass vpxenc_vp9_webm_2pass
vpxenc_vp9_ivf_lossless vpxenc_vp9_ivf_lossless
vpxenc_vp9_ivf_minq0_maxq0 vpxenc_vp9_ivf_minq0_maxq0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment