Commit bdf2ced4 authored by Fredrik Hubinette's avatar Fredrik Hubinette Committed by Commit Bot

Work around NOTREACHED crash.

This doesn't actually fix anything, but logs a message instead of crashing.

Bug: 805864
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: If377b859a173b79cd30d01fb71624d376a50902e
Reviewed-on: https://chromium-review.googlesource.com/887578
Commit-Queue: Fredrik Hubinette <hubbe@chromium.org>
Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Reviewed-by: default avatarFrank Liberato <liberato@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534586}
parent 33e77846
......@@ -199,7 +199,6 @@ uint64_t GetCurrentQPC() {
}
uint64_t g_last_process_output_time;
HRESULT g_last_unhandled_error;
HRESULT g_last_device_removed_reason;
} // namespace
......@@ -1925,9 +1924,10 @@ void DXVAVideoDecodeAccelerator::DoDecode(const gfx::ColorSpace& color_space) {
SetState(kStopped);
return;
} else {
NOTREACHED() << "Unhandled error in DoDecode()";
g_last_unhandled_error = hr;
return;
// Unknown error, stop playback and log error.
SetState(kStopped);
RETURN_AND_NOTIFY_ON_FAILURE(hr, "Unhandled error in DoDecode()",
PLATFORM_FAILURE, );
}
}
......
Markdown is supported
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