shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vpxenc.sh: Add basic vp9 multithread encode test."

--- a/test/tools_common.sh

+++ b/test/tools_common.sh

@@ -409,6 +409,7 @@

 YUV_RAW_INPUT_HEIGHT=288

 Y4M_NOSQ_PAR_INPUT="${LIBVPX_TEST_DATA_PATH}/park_joy_90p_8_420_a10-1.y4m"

+Y4M_720P_INPUT="${LIBVPX_TEST_DATA_PATH}/niklas_1280_720_30.y4m"

 # Setup a trap function to clean up after tests complete.

 trap cleanup EXIT

--- a/test/vpxenc.sh

+++ b/test/vpxenc.sh

@@ -60,6 +60,10 @@

   echo ""${Y4M_NOSQ_PAR_INPUT}""

 }

+y4m_input_720p() {

+  echo ""${Y4M_720P_INPUT}""

+}

+

 # Echo default vpxenc real time encoding params. $1 is the codec, which defaults

 # to vp8 if unspecified.

 vpxenc_rt_params() {

@@ -68,7 +72,7 @@

     --buf-initial-sz=500

     --buf-optimal-sz=600

     --buf-sz=1000

-    --cpu-used=-5

+    --cpu-used=-6

     --end-usage=cbr

     --error-resilient=1

     --kf-max-dist=90000

@@ -258,6 +262,34 @@

   fi

 }

+vpxenc_vp9_webm_rt_multithread_tiled() {

+  if [ "$(vpxenc_can_encode_vp9)" = "yes" ] && \

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

+    local readonly output="${VPX_TEST_OUTPUT_DIR}/vp9_rt_multithread_tiled.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} \

+          --output="${output}"

+      done

+    done

+

+    if [ ! -e "${output}" ]; then

+      elog "Output file does not exist."

+      return 1

+    fi

+

+    rm "${output}"

+  fi

+}

+

 vpxenc_vp9_webm_2pass() {

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

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

@@ -357,6 +389,7 @@

               vpxenc_vp9_ivf

               vpxenc_vp9_webm

               vpxenc_vp9_webm_rt

+              vpxenc_vp9_webm_rt_multithread_tiled

               vpxenc_vp9_webm_2pass

               vpxenc_vp9_ivf_lossless

               vpxenc_vp9_ivf_minq0_maxq0