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

Merge "vpxdec: Include frame number when decode fails."

parents 040dc8c9 f225b1e6
...@@ -897,11 +897,11 @@ int main_loop(int argc, const char **argv_) { ...@@ -897,11 +897,11 @@ int main_loop(int argc, const char **argv_) {
if (vpx_codec_decode(&decoder, buf, bytes_in_buffer, NULL, 0)) { if (vpx_codec_decode(&decoder, buf, bytes_in_buffer, NULL, 0)) {
const char *detail = vpx_codec_error_detail(&decoder); const char *detail = vpx_codec_error_detail(&decoder);
fprintf(stderr, "Failed to decode frame: %s\n", warn("Failed to decode frame %d: %s",
vpx_codec_error(&decoder)); frame_in, vpx_codec_error(&decoder));
if (detail) if (detail)
fprintf(stderr, " Additional information: %s\n", detail); warn("Additional information: %s", detail);
goto fail; goto fail;
} }
...@@ -922,8 +922,7 @@ int main_loop(int argc, const char **argv_) { ...@@ -922,8 +922,7 @@ int main_loop(int argc, const char **argv_) {
dx_time += (unsigned int)vpx_usec_timer_elapsed(&timer); dx_time += (unsigned int)vpx_usec_timer_elapsed(&timer);
if (vpx_codec_control(&decoder, VP8D_GET_FRAME_CORRUPTED, &corrupted)) { if (vpx_codec_control(&decoder, VP8D_GET_FRAME_CORRUPTED, &corrupted)) {
fprintf(stderr, "Failed VP8_GET_FRAME_CORRUPTED: %s\n", warn("Failed VP8_GET_FRAME_CORRUPTED: %s", vpx_codec_error(&decoder));
vpx_codec_error(&decoder));
goto fail; goto fail;
} }
frames_corrupted += corrupted; frames_corrupted += corrupted;
......
Supports Markdown
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