media: Do a TimedWait() for video surface teardown in AVDA

media/blink/webmediaplayer_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/blink/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <string>
@@ skipping 1485 matching lines @@
     SetNetworkState(WebMediaPlayer::NetworkStateIdle);
   else if (is_downloading && network_state_ == WebMediaPlayer::NetworkStateIdle)
     SetNetworkState(WebMediaPlayer::NetworkStateLoading);
   media_log_->AddEvent(
       media_log_->CreateBooleanEvent(
           MediaLogEvent::NETWORK_ACTIVITY_SET,
           "is_downloading_data", is_downloading));
 }
 
 void WebMediaPlayerImpl::OnSurfaceCreated(int surface_id) {
+  DVLOG(1) << __func__;
   overlay_surface_id_ = surface_id;
   if (!set_surface_cb_.is_null()) {
     // If restart is required, the callback is one-shot only.
     if (decoder_requires_restart_for_overlay_)
       base::ResetAndReturn(&set_surface_cb_).Run(surface_id);
     else
       set_surface_cb_.Run(surface_id);
   }
 }
 
 void WebMediaPlayerImpl::OnSurfaceRequested(
     bool decoder_requires_restart_for_overlay,
     const SurfaceCreatedCB& set_surface_cb) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   DCHECK(surface_manager_);
   DCHECK(!use_fallback_path_);
+  DVLOG(1) << __func__;
 
   // A null callback indicates that the decoder is going away.
   if (set_surface_cb.is_null()) {
     decoder_requires_restart_for_overlay_ = false;
     set_surface_cb_.Reset();
     return;
   }
 
   // If we get a surface request it means GpuVideoDecoder is initializing, so
   // until we get a null surface request, GVD is the active decoder.
@@ skipping 419 matching lines @@
       pipeline_metadata_.natural_size,
       base::Bind(&GetCurrentTimeInternal, this)));
   watch_time_reporter_->OnVolumeChange(volume_);
   if (delegate_ && delegate_->IsHidden())
     watch_time_reporter_->OnHidden();
   else
     watch_time_reporter_->OnShown();
 }
 
 }  // namespace media