shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Add y4m input to vp9 example encoder tests."

--- a/test/tools_common.sh

+++ b/test/tools_common.sh

@@ -412,6 +412,8 @@

 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"

+Y4M_720P_INPUT_WIDTH=1280

+Y4M_720P_INPUT_HEIGHT=720

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

 trap cleanup EXIT

--- a/test/vpx_temporal_svc_encoder.sh

+++ b/test/vpx_temporal_svc_encoder.sh

@@ -38,6 +38,7 @@

   local output_file="${VPX_TEST_OUTPUT_DIR}/${output_file_base}"

   local timebase_num="1"

   local timebase_den="1000"

+  local timebase_den_y4m="30"

   local speed="6"

   local frame_drop_thresh="30"

   local max_threads="4"

@@ -56,6 +57,12 @@

       eval "${VPX_TEST_PREFIX}" "${encoder}" "${YUV_RAW_INPUT}" \

         "${output_file}" "${codec}" "${YUV_RAW_INPUT_WIDTH}" \

         "${YUV_RAW_INPUT_HEIGHT}" "${timebase_num}" "${timebase_den}" \

+        "${speed}" "${frame_drop_thresh}" "${error_resilient}" "${threads}" \

+        "$@" ${devnull}

+      # Test for y4m input.

+      eval "${VPX_TEST_PREFIX}" "${encoder}" "${Y4M_720P_INPUT}" \

+        "${output_file}" "${codec}" "${Y4M_720P_INPUT_WIDTH}" \

+        "${Y4M_720P_INPUT_HEIGHT}" "${timebase_num}" "${timebase_den_y4m}" \

         "${speed}" "${frame_drop_thresh}" "${error_resilient}" "${threads}" \

         "$@" ${devnull}

     else