media: Handle output SurfaceView destruction in AVDA

media/gpu/android_video_decode_accelerator.h

 // Copyright (c) 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.
 
 #ifndef MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 #define MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <list>
 #include <map>
 #include <memory>
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/threading/thread_checker.h"
 #include "base/timer/timer.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "gpu/command_buffer/service/gpu_preferences.h"
 #include "media/base/android/media_drm_bridge_cdm_context.h"
 #include "media/base/android/sdk_media_codec_bridge.h"
 #include "media/base/media_keys.h"
 #include "media/gpu/avda_state_provider.h"
+#include "media/gpu/avda_surface_tracker.h"
 #include "media/gpu/gpu_video_decode_accelerator_helpers.h"
 #include "media/gpu/media_gpu_export.h"
 #include "media/video/video_decode_accelerator.h"
 #include "ui/gl/android/scoped_java_surface.h"
 
 namespace gfx {
 class SurfaceTexture;
 }
 
 namespace media {
@@ skipping 121 matching lines @@
 
   // TODO(timav): evaluate the need for more states in the AVDA state machine.
   enum State {
     NO_ERROR,
     ERROR,
     // Set when we are asynchronously constructing the codec.  Will transition
     // to NO_ERROR or ERROR depending on success.
     WAITING_FOR_CODEC,
     // Set when we have a codec, but it doesn't yet have a key.
     WAITING_FOR_KEY,
+    // The output surface was destroyed. We must not configure a new MediaCodec
+    // with the destroyed surface.
+    SURFACE_DESTROYED,
   };
 
   enum DrainType {
     DRAIN_TYPE_NONE,
     DRAIN_FOR_FLUSH,
     DRAIN_FOR_RESET,
     DRAIN_FOR_DESTROY,
   };
 
   // Configuration info for MediaCodec.
@@ skipping 134 matching lines @@
   // itself depends on the |drain_type_|.
   void OnDrainCompleted();
 
   // Resets MediaCodec and buffers/containers used for storing output. These
   // components need to be reset upon EOS to decode a later stream. Input state
   // (e.g. queued BitstreamBuffers) is not reset, as input following an EOS
   // is still valid and should be processed. Upon competion calls |done_cb| that
   // can be a null callback.
   void ResetCodecState(const base::Closure& done_cb);
 
+  // Registered to be called when surfaces are being destroyed. If |surface_id|
+  // is our surface, we should release the MediaCodec before returning from
+  // this.
+  void OnDestroyingSurface(int surface_id);
+
   // Return true if and only if we should use deferred rendering.
   static bool UseDeferredRenderingStrategy(
       const gpu::GpuPreferences& gpu_preferences);
 
   // Used to DCHECK that we are called on the correct thread.
   base::ThreadChecker thread_checker_;
 
   // To expose client callbacks from VideoDecodeAccelerator.
   Client* client_;
 
@@ skipping 78 matching lines @@
   // from being sent after a reset.
   int error_sequence_token_;
 
   // PostError will defer sending an error if and only if this is true.
   bool defer_errors_;
 
   // True if and only if VDA initialization is deferred, and we have not yet
   // called NotifyInitializationComplete.
   bool deferred_initialization_pending_;
 
+  int surface_id_;
+
+  OnDestroyingSurfaceCallback on_destroying_surface_cb_;
+
   // WeakPtrFactory for posting tasks back to |this|.
   base::WeakPtrFactory<AndroidVideoDecodeAccelerator> weak_this_factory_;
 
   friend class AndroidVideoDecodeAcceleratorTest;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_ANDROID_VIDEO_DECODE_ACCELERATOR_H_