| Index: media/gpu/android_video_decode_accelerator.cc
|
| diff --git a/media/gpu/android_video_decode_accelerator.cc b/media/gpu/android_video_decode_accelerator.cc
|
| index 8e00a4f1dff3024a2e1af983dd4de43f66a6dfd8..5f9e343147310f5308c6b2e562a7df1557931503 100644
|
| --- a/media/gpu/android_video_decode_accelerator.cc
|
| +++ b/media/gpu/android_video_decode_accelerator.cc
|
| @@ -1367,7 +1367,7 @@ void AndroidVideoDecodeAccelerator::Destroy() {
|
| LOG(WARNING) << "Failed make GL context current for Destroy, continuing.";
|
|
|
| if (strategy_)
|
| - strategy_->Cleanup(have_context, output_picture_buffers_);
|
| + strategy_->BeginCleanup(have_context, output_picture_buffers_);
|
|
|
| // If we have an OnFrameAvailable handler, tell it that we're going away.
|
| if (on_frame_available_handler_) {
|
| @@ -1400,6 +1400,9 @@ void AndroidVideoDecodeAccelerator::ActualDestroy() {
|
| on_destroying_surface_cb_);
|
| }
|
|
|
| + if (strategy_)
|
| + strategy_->EndCleanup();
|
| +
|
| AVDATimerManager* manager = g_avda_timer.Pointer();
|
|
|
| // We no longer care about |surface_id|, in case we did before. It's okay
|
|
|