AndroidVideoDecodeAccelerator can now render to a SurfaceView

content/common/gpu/media/android_copying_backing_strategy.h

 // Copyright 2015 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 CONTENT_COMMON_GPU_MEDIA_ANDROID_COPYING_BACKING_STRATEGY_H_
 #define CONTENT_COMMON_GPU_MEDIA_ANDROID_COPYING_BACKING_STRATEGY_H_
 
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
@@ skipping 10 matching lines @@
 
 namespace content {
 
 class AVDAStateProvider;
 
 // A BackingStrategy implementation that copies images to PictureBuffer
 // textures via gpu texture copy.
 class CONTENT_EXPORT AndroidCopyingBackingStrategy
     : public AndroidVideoDecodeAccelerator::BackingStrategy {
  public:
-  AndroidCopyingBackingStrategy();
+  AndroidCopyingBackingStrategy(AVDAStateProvider* state_provider);

[watk, 2016/01/29 02:42:19]

I moved this because Debug builds dereference state_provider in Cleanup(). Which
is called regardless of whether Initialize() was called.

   ~AndroidCopyingBackingStrategy() override;
 
   // AndroidVideoDecodeAccelerator::BackingStrategy
-  void Initialize(AVDAStateProvider*) override;
+  gfx::ScopedJavaSurface Initialize(int surface_view_id) override;
   void Cleanup(bool have_context,
                const AndroidVideoDecodeAccelerator::OutputBufferMap&) override;
+  scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture() const override;
   uint32_t GetTextureTarget() const override;
-  scoped_refptr<gfx::SurfaceTexture> CreateSurfaceTexture() override;
   void UseCodecBufferForPictureBuffer(int32_t codec_buffer_index,
                                       const media::PictureBuffer&) override;
   void CodecChanged(
       media::VideoCodecBridge*,
       const AndroidVideoDecodeAccelerator::OutputBufferMap&) override;
   void OnFrameAvailable() override;
+  bool PicturesAreOverlayable() override;
 
  private:
   // Used for copy the texture from surface texture to picture buffers.
   scoped_ptr<gpu::CopyTextureCHROMIUMResourceManager> copier_;
 
   AVDAStateProvider* state_provider_;
 
   // A container of texture. Used to set a texture to |media_codec_|.
   scoped_refptr<gfx::SurfaceTexture> surface_texture_;
 
   // The texture id which is set to |surface_texture_|.
   uint32_t surface_texture_id_;
 
   media::VideoCodecBridge* media_codec_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_ANDROID_COPYING_BACKING_STRATEGY_H_