generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "webmdec: Fix for reaching eof in webm_guess_framerate"

Browse Source
This commit is contained in:
Vignesh Venkatasubramanian 2015-04-07 11:53:43 -07:00 committed by Gerrit Code Review
commit 8de26efa66
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/tools_common.sh
View File

@ -402,6 +402,7 @@ VP9_IVF_FILE="${LIBVPX_TEST_DATA_PATH}/vp90-2-09-subpixel-00.ivf"
VP9_WEBM_FILE="${LIBVPX_TEST_DATA_PATH}/vp90-2-00-quantizer-00.webm" VP9_WEBM_FILE="${LIBVPX_TEST_DATA_PATH}/vp90-2-00-quantizer-00.webm"
VP9_FPM_WEBM_FILE="${LIBVPX_TEST_DATA_PATH}/vp90-2-07-frame_parallel-1.webm" 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"
YUV_RAW_INPUT="${LIBVPX_TEST_DATA_PATH}/hantro_collage_w352h288.yuv" YUV_RAW_INPUT="${LIBVPX_TEST_DATA_PATH}/hantro_collage_w352h288.yuv"
YUV_RAW_INPUT_WIDTH=352 YUV_RAW_INPUT_WIDTH=352

17
test/vpxdec.sh
View File

@ -17,7 +17,8 @@
# Environment check: Make sure input is available. # Environment check: Make sure input is available.
vpxdec_verify_environment() { vpxdec_verify_environment() {
if [ ! -e "${VP8_IVF_FILE}" ] || [ ! -e "${VP9_WEBM_FILE}" ] || \ if [ ! -e "${VP8_IVF_FILE}" ] || [ ! -e "${VP9_WEBM_FILE}" ] || \
[ ! -e "${VP9_FPM_WEBM_FILE}" ] ; then [ ! -e "${VP9_FPM_WEBM_FILE}" ] || \
[ ! -e "${VP9_LT_50_FRAMES_WEBM_FILE}" ] ; then
elog "Libvpx test data must exist in LIBVPX_TEST_DATA_PATH." elog "Libvpx test data must exist in LIBVPX_TEST_DATA_PATH."
return 1 return 1
fi fi
@ -87,12 +88,24 @@ vpxdec_vp9_webm_frame_parallel() {
--frame-parallel --frame-parallel
done done
fi fi
}
vpxdec_vp9_webm_less_than_50_frames() {
# ensure that reaching eof in webm_guess_framerate doesn't result in invalid
# frames in actual webm_read_frame calls.
if [ "$(vpxdec_can_decode_vp9)" = "yes" ] && \
[ "$(webm_io_available)" = "yes" ]; then
local readonly decoder="$(vpx_tool_path vpxdec)"
eval "${VPX_TEST_PREFIX}" "${decoder}" "${VP9_LT_50_FRAMES_WEBM_FILE}" \
--summary --noblit 2>&1 \
| awk '{ exit $1 != 10; }'
fi
} }
vpxdec_tests="vpxdec_vp8_ivf vpxdec_tests="vpxdec_vp8_ivf
vpxdec_vp8_ivf_pipe_input vpxdec_vp8_ivf_pipe_input
vpxdec_vp9_webm vpxdec_vp9_webm
vpxdec_vp9_webm_frame_parallel" vpxdec_vp9_webm_frame_parallel
vpxdec_vp9_webm_less_than_50_frames"
run_tests vpxdec_verify_environment "${vpxdec_tests}" run_tests vpxdec_verify_environment "${vpxdec_tests}"

1
webmdec.cc
View File

@ -219,6 +219,7 @@ int webm_guess_framerate(struct WebmInputContext *webm_ctx,
webm_ctx->block_entry = NULL; webm_ctx->block_entry = NULL;
webm_ctx->block_frame_index = 0; webm_ctx->block_frame_index = 0;
webm_ctx->timestamp_ns = 0; webm_ctx->timestamp_ns = 0;
webm_ctx->reached_eos = 0;
return 0; return 0;
} }