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;
+    // Must be called before anything else. If surface_view_id is not equal to
+    // |kNoSurfaceID| it refers to a SurfaceView to render to.

[liberato (no reviews please), 2016/01/27 16:15:33]

please make a note that it is required to use the surface if it is provided.

this is somewhat unfortunate, since it makes it hard to switch back to copying +
WMPI for testing.  can you add a flag similar to
NEEDS_ALL_PICTURE_BUFFERS_TO_DECODE, that controls whether the fullscreen SV
path happens at runtime?

it would be eventually be set if and only if NEEDS_ALL... is set, but we want to
keep it separate.  it would let us use the copy strategy with WMPI, and also try
deferred without SV.  that's going to help with perf / power testing.

plus, it gives you a flag to turn off SV by default, but still land the code.

the answer might be 'no', since i don't remember how far up the stack one needs
to go to turn off the SV optimization.  the flags that i'm talking about don't
leave GVD.  if it's a lot of plumbing, then just be sure to document how to turn
SV off.  this suggestion was mostly "in case it's easy".

+    // Returns the Java surface to configure MediaCodec with.
+    virtual gfx::ScopedJavaSurface Initialize(AVDAStateProvider* provider,
+                                              int surface_view_id) = 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;
 
+    // This returns the SurfaceTexture created by Initialize, or nullptr if
+    // the strategy was initialized with a SurfaceView.
+    virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture() const = 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) {}
 
     // Notify strategy that a picture buffer has been reused.
     virtual void ReuseOnePictureBuffer(
         const media::PictureBuffer& picture_buffer) {}
 
     // Notify strategy that we are about to dismiss a picture buffer.
     virtual void DismissOnePictureBuffer(
         const media::PictureBuffer& picture_buffer) {}
 
     // Notify strategy that we have a new android MediaCodec instance.  This
     // happens when we're starting up or re-configuring mid-stream.  Any
     // previously provided codec should no longer be referenced.
     // For convenience, a container of PictureBuffers is provided in case
     // per-image cleanup is needed.
     virtual void CodecChanged(media::VideoCodecBridge* codec,
                               const OutputBufferMap& buffer_map) = 0;
 
     // Notify the strategy that a frame is available.  This callback can happen
     // on any thread at any time.
     virtual void OnFrameAvailable() = 0;
+
+    virtual bool PicturesAreOverlayable() { return false; }
   };
 
   AndroidVideoDecodeAccelerator(
       const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder,
       const base::Callback<bool(void)>& make_context_current);
 
   ~AndroidVideoDecodeAccelerator() override;
 
   // media::VideoDecodeAccelerator implementation:
   bool Initialize(const Config& config, Client* client) override;
@@ skipping 130 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_|.
-  scoped_refptr<gfx::SurfaceTexture> surface_texture_;
+  // The surface that MediaCodec is configured to output to. It's created by the
+  // backing strategy.
+  gfx::ScopedJavaSurface surface_;
 
   // 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.
@@ skipping 46 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_