AndroidVideoDecodeAccelerator can now render to a SurfaceView

content/common/gpu/media/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 CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <list>
 #include <map>
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/threading/thread_checker.h"
 #include "base/timer/timer.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/media/avda_state_provider.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "media/base/android/sdk_media_codec_bridge.h"
 #include "media/base/media_keys.h"
 #include "media/video/video_decode_accelerator.h"
+#include "ui/gl/android/scoped_java_surface.h"
 
 namespace gfx {
 class SurfaceTexture;
 }
 
 namespace content {
 
 // A VideoDecodeAccelerator implementation for Android.
 // This class decodes the input encoded stream by using Android's MediaCodec
 // class. http://developer.android.com/reference/android/media/MediaCodec.html
 // It delegates attaching pictures to PictureBuffers to a BackingStrategy, but
 // otherwise handles the work of transferring data to / from MediaCodec.
 class CONTENT_EXPORT AndroidVideoDecodeAccelerator
     : public media::VideoDecodeAccelerator,
       public AVDAStateProvider {
  public:
   typedef std::map<int32_t, media::PictureBuffer> OutputBufferMap;
 
   // A BackingStrategy is responsible for making a PictureBuffer's texture
   // contain the image that a MediaCodec decoder buffer tells it to.
   class BackingStrategy {
    public:
     virtual ~BackingStrategy() {}
 
-    // Called after the state provider is given, but before any other
-    // calls to the BackingStrategy.
-    virtual void Initialize(AVDAStateProvider* provider) = 0;
+    // Called before anything else. |surface_texture| will be null if the
+    // MediaCodec will be configured with a SurfaceView instead of a
+    // SurfaceTexture.
+    virtual void Initialize(
+        AVDAStateProvider* provider,
+        scoped_refptr<gfx::SurfaceTexture> surface_texture) = 0;
 
     // Called before the AVDA does any Destroy() work.  This will be
     // the last call that the BackingStrategy receives.
     virtual void Cleanup(bool have_context,
                          const OutputBufferMap& buffer_map) = 0;
 
     // Return the GL texture target that the PictureBuffer textures use.
     virtual uint32_t GetTextureTarget() const = 0;
 
-    // Create and return a surface texture for the MediaCodec to use.
-    virtual scoped_refptr<gfx::SurfaceTexture> CreateSurfaceTexture() = 0;
-
     // Make the provided PictureBuffer draw the image that is represented by
     // the decoded output buffer at codec_buffer_index.
     virtual void UseCodecBufferForPictureBuffer(
         int32_t codec_buffer_index,
         const media::PictureBuffer& picture_buffer) = 0;
 
     // Notify strategy that a picture buffer has been assigned.
     virtual void AssignOnePictureBuffer(
         const media::PictureBuffer& picture_buffer) {}
 
@@ skipping 159 matching lines @@
   std::queue<int32_t> free_picture_ids_;
 
   // Picture buffer ids which have been dismissed and not yet re-assigned.  Used
   // to ignore ReusePictureBuffer calls that were in flight when the
   // DismissPictureBuffer call was made.
   std::set<int32_t> dismissed_picture_ids_;
 
   // The low-level decoder which Android SDK provides.
   scoped_ptr<media::VideoCodecBridge> media_codec_;
 
-  // A container of texture. Used to set a texture to |media_codec_|.
+  // A container of texture. Used to set a texture to |media_codec_|. This may
+  // be null if we're rendering to a SurfaceView instead.
   scoped_refptr<gfx::SurfaceTexture> surface_texture_;
 
+  // An Android SurfaceView to render to. This may be empty if we're
+  // rendering to a SurfaceTexture instead.
+  gfx::ScopedJavaSurface surface_view_;
+
   // Set to true after requesting picture buffers to the client.
   bool picturebuffers_requested_;
 
   // The resolution of the stream.
   gfx::Size size_;
 
   // Encoded bitstream buffers to be passed to media codec, queued until an
   // input buffer is available, along with the time when they were first
   // enqueued.
   typedef std::queue<std::pair<media::BitstreamBuffer, base::Time> >
@@ skipping 45 matching lines @@
 
   // WeakPtrFactory for posting tasks back to |this|.
   base::WeakPtrFactory<AndroidVideoDecodeAccelerator> weak_this_factory_;
 
   friend class AndroidVideoDecodeAcceleratorTest;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_