shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vpxdec,raw_read_frame: fix eof return"

--- a/test/test-data.sha1

+++ b/test/test-data.sha1

@@ -858,3 +858,4 @@

 e2f9e1e47a791b4e939a9bdc50bf7a25b3761f77 *vp90-2-22-svc_1280x720_1.webm.md5

 a0fbbbc5dd50fd452096f4455a58c1a8c9f66697 *invalid-vp80-00-comprehensive-s17661_r01-05_b6-.ivf

 a61774cf03fc584bd9f0904fc145253bb8ea6c4c *invalid-vp80-00-comprehensive-s17661_r01-05_b6-.ivf.res

+7b77a966375f59b927243cc26b9369249d97ec37 *crbug-1539.rawfile

--- a/test/tools_common.sh

+++ b/test/tools_common.sh

@@ -404,6 +404,8 @@

 VP9_FPM_WEBM_FILE="${LIBVPX_TEST_DATA_PATH}/vp90-2-07-frame_parallel-1.webm"

 VP9_LT_50_FRAMES_WEBM_FILE="${LIBVPX_TEST_DATA_PATH}/vp90-2-02-size-32x08.webm"

+VP9_RAW_FILE="${LIBVPX_TEST_DATA_PATH}/crbug-1539.rawfile"

+

 YUV_RAW_INPUT="${LIBVPX_TEST_DATA_PATH}/hantro_collage_w352h288.yuv"

 YUV_RAW_INPUT_WIDTH=352

 YUV_RAW_INPUT_HEIGHT=288

--- a/test/vpxdec.sh

+++ b/test/vpxdec.sh

@@ -18,7 +18,8 @@

 vpxdec_verify_environment() {

   if [ ! -e "${VP8_IVF_FILE}" ] || [ ! -e "${VP9_WEBM_FILE}" ] || \

     [ ! -e "${VP9_FPM_WEBM_FILE}" ] || \

-    [ ! -e "${VP9_LT_50_FRAMES_WEBM_FILE}" ] ; then

+    [ ! -e "${VP9_LT_50_FRAMES_WEBM_FILE}" ] || \

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

     elog "Libvpx test data must exist in LIBVPX_TEST_DATA_PATH."

     return 1

   fi

@@ -107,10 +108,28 @@

   fi

 }

+# Ensures VP9_RAW_FILE correctly produces 1 frame instead of causing a hang.

+vpxdec_vp9_raw_file() {

+  # Ensure a raw file properly reports eof and doesn't cause a hang.

+  if [ "$(vpxdec_can_decode_vp9)" = "yes" ]; then

+    local readonly decoder="$(vpx_tool_path vpxdec)"

+    local readonly expected=1

+    [ -x /usr/bin/timeout ] && local readonly TIMEOUT="/usr/bin/timeout 30s"

+    local readonly num_frames=$(${TIMEOUT} ${VPX_TEST_PREFIX} "${decoder}" \

+      "${VP9_RAW_FILE}" --summary --noblit 2>&1 \

+      | awk '/^[0-9]+ decoded frames/ { print $1 }')

+    if [ -z "$num_frames" ] || [ "$num_frames" -ne "$expected" ]; then

+      elog "Output frames ($num_frames) != expected ($expected)"

+      return 1

+    fi

+  fi

+}

+

 vpxdec_tests="vpxdec_vp8_ivf

               vpxdec_vp8_ivf_pipe_input

               vpxdec_vp9_webm

               vpxdec_vp9_webm_frame_parallel

-              vpxdec_vp9_webm_less_than_50_frames"

+              vpxdec_vp9_webm_less_than_50_frames

+              vpxdec_vp9_raw_file"

 run_tests vpxdec_verify_environment "${vpxdec_tests}"

--- a/vpxdec.c

+++ b/vpxdec.c

@@ -238,9 +238,10 @@

       return 1;

     }

     *bytes_read = frame_size;

+    return 0;

   }

-  return 0;

+  return 1;

 }

 static int read_frame(struct VpxDecInputContext *input, uint8_t **buf,