Begin refactor of AVDA to support zero-copy.

content/common/gpu/media/android_video_decode_accelerator_base.cc

Index: content/common/gpu/media/android_video_decode_accelerator_base.cc
diff --git a/content/common/gpu/media/android_video_decode_accelerator.cc b/content/common/gpu/media/android_video_decode_accelerator_base.cc
similarity index 76%
copy from content/common/gpu/media/android_video_decode_accelerator.cc
copy to content/common/gpu/media/android_video_decode_accelerator_base.cc
index ce5c20cc3af754a5d08db5d7e766e6b78ec10723..919e82153cda096fe0f068d1234e64ecc247ba2a 100644
--- a/content/common/gpu/media/android_video_decode_accelerator.cc
+++ b/content/common/gpu/media/android_video_decode_accelerator_base.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/gpu/media/android_video_decode_accelerator.h"
+#include "content/common/gpu/media/android_video_decode_accelerator_base.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ -22,25 +22,20 @@ namespace content {
 
 // Helper macros for dealing with failure.  If |result| evaluates false, emit
 // |log| to ERROR, register |error| with the decoder, and return.
-#define RETURN_ON_FAILURE(result, log, error)                     \
-  do {                                                            \
-    if (!(result)) {                                              \
-      DLOG(ERROR) << log;                                         \
-      base::MessageLoop::current()->PostTask(                     \
-          FROM_HERE,                                              \
-          base::Bind(&AndroidVideoDecodeAccelerator::NotifyError, \
-                     weak_this_factory_.GetWeakPtr(),             \
-                     error));                                     \
-      state_ = ERROR;                                             \
-      return;                                                     \
-    }                                                             \
+#define RETURN_ON_FAILURE(result, log, error)                         \
+  do {                                                                \
+    if (!(result)) {                                                  \
+      DLOG(ERROR) << log;                                             \
+      base::MessageLoop::current()->PostTask(                         \
+          FROM_HERE,                                                  \
+          base::Bind(&AndroidVideoDecodeAcceleratorBase::NotifyError, \
+                     weak_this_factory_.GetWeakPtr(),                 \
+                     error));                                         \
+      state_ = ERROR;                                                 \
+      return;                                                         \
+    }                                                                 \
   } while (0)
 
-// TODO(dwkang): We only need kMaxVideoFrames to pass media stack's prerolling
-// phase, but 1 is added due to crbug.com/176036. This should be tuned when we
-// have actual use case.
-enum { kNumPictureBuffers = media::limits::kMaxVideoFrames + 1 };
-
 // Max number of bitstreams notified to the client with
 // NotifyEndOfBitstreamBuffer() before getting output from the bitstream.
 enum { kMaxBitstreamsNotifiedInAdvance = 32 };
@@ -87,7 +82,7 @@ static inline const base::TimeDelta NoWaitTimeOut() {
   return base::TimeDelta::FromMicroseconds(0);
 }
 
-AndroidVideoDecodeAccelerator::AndroidVideoDecodeAccelerator(
+AndroidVideoDecodeAcceleratorBase::AndroidVideoDecodeAcceleratorBase(
     const base::WeakPtr<gpu::gles2::GLES2Decoder> decoder,
     const base::Callback<bool(void)>& make_context_current)
     : client_(NULL),
@@ -99,12 +94,13 @@ AndroidVideoDecodeAccelerator::AndroidVideoDecodeAccelerator(
       gl_decoder_(decoder),
       weak_this_factory_(this) {}
 
-AndroidVideoDecodeAccelerator::~AndroidVideoDecodeAccelerator() {
+AndroidVideoDecodeAcceleratorBase::~AndroidVideoDecodeAcceleratorBase() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
-bool AndroidVideoDecodeAccelerator::Initialize(media::VideoCodecProfile profile,
-                                               Client* client) {
+bool AndroidVideoDecodeAcceleratorBase::Initialize(
+    media::VideoCodecProfile profile,
+    Client* client) {
   DCHECK(!media_codec_);
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ -164,7 +160,7 @@ bool AndroidVideoDecodeAccelerator::Initialize(media::VideoCodecProfile profile,
   return true;
 }
 
-void AndroidVideoDecodeAccelerator::DoIOTask() {
+void AndroidVideoDecodeAcceleratorBase::DoIOTask() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (state_ == ERROR) {
     return;
@@ -174,7 +170,7 @@ void AndroidVideoDecodeAccelerator::DoIOTask() {
   DequeueOutput();
 }
 
-void AndroidVideoDecodeAccelerator::QueueInput() {
+void AndroidVideoDecodeAcceleratorBase::QueueInput() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (bitstreams_notified_in_advance_.size() > kMaxBitstreamsNotifiedInAdvance)
     return;
@@ -233,13 +229,13 @@ void AndroidVideoDecodeAccelerator::QueueInput() {
   // TODO(dwkang): check if there is a way to remove this workaround.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
-      base::Bind(&AndroidVideoDecodeAccelerator::NotifyEndOfBitstreamBuffer,
+      base::Bind(&AndroidVideoDecodeAcceleratorBase::NotifyEndOfBitstreamBuffer,
                  weak_this_factory_.GetWeakPtr(),
                  bitstream_buffer.id()));
   bitstreams_notified_in_advance_.push_back(bitstream_buffer.id());
 }
 
-void AndroidVideoDecodeAccelerator::DequeueOutput() {
+void AndroidVideoDecodeAcceleratorBase::DequeueOutput() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (picturebuffers_requested_ && output_picture_buffers_.empty())
     return;
@@ -272,7 +268,8 @@ void AndroidVideoDecodeAccelerator::DequeueOutput() {
           size_ = gfx::Size(width, height);
           base::MessageLoop::current()->PostTask(
               FROM_HERE,
-              base::Bind(&AndroidVideoDecodeAccelerator::RequestPictureBuffers,
+              base::Bind(&AndroidVideoDecodeAcceleratorBase::
+                         RequestPictureBuffers,
                          weak_this_factory_.GetWeakPtr()));
         } else {
           // Dynamic resolution change support is not specified by the Android
@@ -300,30 +297,21 @@ void AndroidVideoDecodeAccelerator::DequeueOutput() {
     }
   } while (buf_index < 0);
 
-  // This ignores the emitted ByteBuffer and instead relies on rendering to the
-  // codec's SurfaceTexture and then copying from that texture to the client's
-  // PictureBuffer's texture.  This means that each picture's data is written
-  // three times: once to the ByteBuffer, once to the SurfaceTexture, and once
-  // to the client's texture.  It would be nicer to either:
-  // 1) Render directly to the client's texture from MediaCodec (one write); or
-  // 2) Upload the ByteBuffer to the client's texture (two writes).
-  // Unfortunately neither is possible:
-  // 1) MediaCodec's use of SurfaceTexture is a singleton, and the texture
-  //    written to can't change during the codec's lifetime.  b/11990461
-  // 2) The ByteBuffer is likely to contain the pixels in a vendor-specific,
-  //    opaque/non-standard format.  It's not possible to negotiate the decoder
-  //    to emit a specific colorspace, even using HW CSC.  b/10706245
-  // So, we live with these two extra copies per picture :(
-  media_codec_->ReleaseOutputBuffer(buf_index, true);
-
   if (eos) {
+    // TODO(liberato): Before refactoring into *Base, this was unconditionally
+    // done before the eos check, with render==true.  However, since that
+    // frame wasn't sent anywhere in the eos case, we now do it here with
+    // render==false.  We need to see if eos can actually deliver a valid
+    // frame with it.
+    media_codec_->ReleaseOutputBuffer(buf_index, false);

[watk, 2015/08/28 21:52:05]

AFAIK, this is ok and we won't get a valid frame with EOS.

[liberato (no reviews please), 2015/09/04 17:59:47]

yeah, i this so too.  i'll leave the TODO here until qinmin@ and timav@ take a
look.

     base::MessageLoop::current()->PostTask(
         FROM_HERE,
-        base::Bind(&AndroidVideoDecodeAccelerator::NotifyFlushDone,
+        base::Bind(&AndroidVideoDecodeAcceleratorBase::NotifyFlushDone,
                    weak_this_factory_.GetWeakPtr()));
   } else {
     int64 bitstream_buffer_id = timestamp.InMicroseconds();
-    SendCurrentSurfaceToClient(static_cast<int32>(bitstream_buffer_id));
+    SendCurrentSurfaceToClient(buf_index,
+        static_cast<int32>(bitstream_buffer_id));
 
     // Removes ids former or equal than the id from decoder. Note that
     // |bitstreams_notified_in_advance_| does not mean bitstream ids in decoder
@@ -342,7 +330,8 @@ void AndroidVideoDecodeAccelerator::DequeueOutput() {
   }
 }
 
-void AndroidVideoDecodeAccelerator::SendCurrentSurfaceToClient(
+void AndroidVideoDecodeAcceleratorBase::SendCurrentSurfaceToClient(
+    int32 codec_buf_index,

[watk, 2015/08/28 21:52:05]

Slight naming inconsistency with the header: codec_buffer_index vs
codec_buf_index.

[liberato (no reviews please), 2015/09/04 17:59:47]

thanks.

     int32 bitstream_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK_NE(bitstream_id, -1);
@@ -355,67 +344,37 @@ void AndroidVideoDecodeAccelerator::SendCurrentSurfaceToClient(
   int32 picture_buffer_id = free_picture_ids_.front();
   free_picture_ids_.pop();
 
-  float transfrom_matrix[16];
-  surface_texture_->UpdateTexImage();
-  surface_texture_->GetTransformMatrix(transfrom_matrix);
-
   OutputBufferMap::const_iterator i =
       output_picture_buffers_.find(picture_buffer_id);
   RETURN_ON_FAILURE(i != output_picture_buffers_.end(),
                     "Can't find a PictureBuffer for " << picture_buffer_id,
                     PLATFORM_FAILURE);
-  uint32 picture_buffer_texture_id = i->second.texture_id();
 
-  RETURN_ON_FAILURE(gl_decoder_.get(),
+  // Make sure that the decoder is available for AssignCurrent*().
+  RETURN_ON_FAILURE(GetGlDecoder(),
                     "Failed to get gles2 decoder instance.",
                     ILLEGAL_STATE);

[watk, 2015/08/28 21:52:05]

Should this check be done inside AssignCurrent? That it uses the gl decoder
seems like an implementation detail of AssignCurrent.

[liberato (no reviews please), 2015/09/04 17:59:47]

yeah, i went back and forth on this one.  i kept it as-is because moving the
RETURN_ON_FAILURE logic around turned out to make it ugly.

i'll see if i can figure out a way to do this better.

... i refactored RETURN_ON_FAILURE a bit and moved it into its own .h file.  now
_base and the subclasses can use it.  see if you like this better.

-  // Defer initializing the CopyTextureCHROMIUMResourceManager until it is
-  // needed because it takes 10s of milliseconds to initialize.
-  if (!copier_) {
-    copier_.reset(new gpu::CopyTextureCHROMIUMResourceManager());
-    copier_->Initialize(gl_decoder_.get());
-  }
 
-  // Here, we copy |surface_texture_id_| to the picture buffer instead of
-  // setting new texture to |surface_texture_| by calling attachToGLContext()
-  // because:
-  // 1. Once we call detachFrameGLContext(), it deletes the texture previous
-  //    attached.
-  // 2. SurfaceTexture requires us to apply a transform matrix when we show
-  //    the texture.
-  // TODO(hkuang): get the StreamTexture transform matrix in GPU process
-  // instead of using default matrix crbug.com/226218.
-  const static GLfloat default_matrix[16] = {1.0f, 0.0f, 0.0f, 0.0f,
-                                             0.0f, 1.0f, 0.0f, 0.0f,
-                                             0.0f, 0.0f, 1.0f, 0.0f,
-                                             0.0f, 0.0f, 0.0f, 1.0f};
-  copier_->DoCopyTextureWithTransform(gl_decoder_.get(),
-                                      GL_TEXTURE_EXTERNAL_OES,
-                                      surface_texture_id_,
-                                      picture_buffer_texture_id,
-                                      size_.width(),
-                                      size_.height(),
-                                      false,
-                                      false,
-                                      false,
-                                      default_matrix);
+  AssignCurrentSurfaceToPictureBuffer(codec_buf_index, i->second);
 
   // TODO(henryhsu): Pass (0, 0) as visible size will cause several test
   // cases failed. We should make sure |size_| is coded size or visible size.
   base::MessageLoop::current()->PostTask(
-      FROM_HERE, base::Bind(&AndroidVideoDecodeAccelerator::NotifyPictureReady,
-                            weak_this_factory_.GetWeakPtr(),
-                            media::Picture(picture_buffer_id, bitstream_id,
-                                           gfx::Rect(size_), false)));
+      FROM_HERE,
+      base::Bind(&AndroidVideoDecodeAcceleratorBase::NotifyPictureReady,
+                 weak_this_factory_.GetWeakPtr(),
+                 media::Picture(picture_buffer_id, bitstream_id,
+                                gfx::Rect(size_), false)));
 }
 
-void AndroidVideoDecodeAccelerator::Decode(
+void AndroidVideoDecodeAcceleratorBase::Decode(
     const media::BitstreamBuffer& bitstream_buffer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (bitstream_buffer.id() != -1 && bitstream_buffer.size() == 0) {
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
-        base::Bind(&AndroidVideoDecodeAccelerator::NotifyEndOfBitstreamBuffer,
+        base::Bind(&AndroidVideoDecodeAcceleratorBase::
+                   NotifyEndOfBitstreamBuffer,
                    weak_this_factory_.GetWeakPtr(),
                    bitstream_buffer.id()));
     return;
@@ -427,7 +386,12 @@ void AndroidVideoDecodeAccelerator::Decode(
   DoIOTask();
 }
 
-void AndroidVideoDecodeAccelerator::AssignPictureBuffers(
+void AndroidVideoDecodeAcceleratorBase::RequestPictureBuffers() {
+    client_->ProvidePictureBuffers(GetNumPictureBuffers(), size_,
+        GetTextureTarget());
+}
+
+void AndroidVideoDecodeAcceleratorBase::AssignPictureBuffers(
     const std::vector<media::PictureBuffer>& buffers) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(output_picture_buffers_.empty());
@@ -446,14 +410,14 @@ void AndroidVideoDecodeAccelerator::AssignPictureBuffers(
     dismissed_picture_ids_.erase(id);
   }
 
-  RETURN_ON_FAILURE(output_picture_buffers_.size() >= kNumPictureBuffers,
+  RETURN_ON_FAILURE(output_picture_buffers_.size() >= GetNumPictureBuffers(),
                     "Invalid picture buffers were passed.",
                     INVALID_ARGUMENT);
 
   DoIOTask();
 }
 
-void AndroidVideoDecodeAccelerator::ReusePictureBuffer(
+void AndroidVideoDecodeAcceleratorBase::ReusePictureBuffer(
     int32 picture_buffer_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ -469,13 +433,13 @@ void AndroidVideoDecodeAccelerator::ReusePictureBuffer(
   DoIOTask();
 }
 
-void AndroidVideoDecodeAccelerator::Flush() {
+void AndroidVideoDecodeAcceleratorBase::Flush() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   Decode(media::BitstreamBuffer(-1, base::SharedMemoryHandle(), 0));
 }
 
-bool AndroidVideoDecodeAccelerator::ConfigureMediaCodec() {
+bool AndroidVideoDecodeAcceleratorBase::ConfigureMediaCodec() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(surface_texture_.get());
 
@@ -491,11 +455,11 @@ bool AndroidVideoDecodeAccelerator::ConfigureMediaCodec() {
   io_timer_.Start(FROM_HERE,
                   DecodePollDelay(),
                   this,
-                  &AndroidVideoDecodeAccelerator::DoIOTask);
+                  &AndroidVideoDecodeAcceleratorBase::DoIOTask);
   return true;
 }
 
-void AndroidVideoDecodeAccelerator::Reset() {
+void AndroidVideoDecodeAcceleratorBase::Reset() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   while (!pending_bitstream_buffers_.empty()) {
@@ -505,7 +469,8 @@ void AndroidVideoDecodeAccelerator::Reset() {
     if (bitstream_buffer_id != -1) {
       base::MessageLoop::current()->PostTask(
           FROM_HERE,
-          base::Bind(&AndroidVideoDecodeAccelerator::NotifyEndOfBitstreamBuffer,
+          base::Bind(&AndroidVideoDecodeAcceleratorBase::
+                     NotifyEndOfBitstreamBuffer,
                      weak_this_factory_.GetWeakPtr(),
                      bitstream_buffer_id));
     }
@@ -535,11 +500,11 @@ void AndroidVideoDecodeAccelerator::Reset() {
 
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
-      base::Bind(&AndroidVideoDecodeAccelerator::NotifyResetDone,
+      base::Bind(&AndroidVideoDecodeAcceleratorBase::NotifyResetDone,
                  weak_this_factory_.GetWeakPtr()));
 }
 
-void AndroidVideoDecodeAccelerator::Destroy() {
+void AndroidVideoDecodeAcceleratorBase::Destroy() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   weak_this_factory_.InvalidateWeakPtrs();
@@ -549,45 +514,71 @@ void AndroidVideoDecodeAccelerator::Destroy() {
   }
   if (surface_texture_id_)
     glDeleteTextures(1, &surface_texture_id_);
-  if (copier_)
-    copier_->Destroy();
   delete this;
 }
 
-bool AndroidVideoDecodeAccelerator::CanDecodeOnIOThread() {
+bool AndroidVideoDecodeAcceleratorBase::CanDecodeOnIOThread() {
   return false;
 }
 
-void AndroidVideoDecodeAccelerator::RequestPictureBuffers() {
-  client_->ProvidePictureBuffers(kNumPictureBuffers, size_, GL_TEXTURE_2D);
-}
-
-void AndroidVideoDecodeAccelerator::NotifyPictureReady(
+void AndroidVideoDecodeAcceleratorBase::NotifyPictureReady(
     const media::Picture& picture) {
   client_->PictureReady(picture);
 }
 
-void AndroidVideoDecodeAccelerator::NotifyEndOfBitstreamBuffer(
+void AndroidVideoDecodeAcceleratorBase::NotifyEndOfBitstreamBuffer(
     int input_buffer_id) {
   client_->NotifyEndOfBitstreamBuffer(input_buffer_id);
 }
 
-void AndroidVideoDecodeAccelerator::NotifyFlushDone() {
+void AndroidVideoDecodeAcceleratorBase::NotifyFlushDone() {
   client_->NotifyFlushDone();
 }
 
-void AndroidVideoDecodeAccelerator::NotifyResetDone() {
+void AndroidVideoDecodeAcceleratorBase::NotifyResetDone() {
   client_->NotifyResetDone();
 }
 
-void AndroidVideoDecodeAccelerator::NotifyError(
+void AndroidVideoDecodeAcceleratorBase::NotifyError(
     media::VideoDecodeAccelerator::Error error) {
   client_->NotifyError(error);
 }
 
+media::VideoDecodeAccelerator::Client*
+AndroidVideoDecodeAcceleratorBase::GetClient() const {

[watk, 2015/08/28 21:52:05]

This and the following aren't in declaration order. The style guide suggests the
definition and declaration order should match.

[liberato (no reviews please), 2015/09/04 17:59:47]

i think that several functions were out of order before, too.  i'll move these
ones closer to where they should be, but i don't want to re-order existing ones
as part of this, in order to keep the (hopefully lack of) diff clearer.

+    return client_;
+}
+
+const gfx::Size& AndroidVideoDecodeAcceleratorBase::GetSize() const {
+    return size_;
+}
+
+const base::ThreadChecker&
+AndroidVideoDecodeAcceleratorBase::ThreadChecker() const {
+    return thread_checker_;
+}
+
+gfx::SurfaceTexture*
+AndroidVideoDecodeAcceleratorBase::GetSurfaceTexture() const {
+    return surface_texture_.get();
+}
+
+uint32 AndroidVideoDecodeAcceleratorBase::GetSurfaceTextureId() const {
+    return surface_texture_id_;
+}
+
+gpu::gles2::GLES2Decoder*
+AndroidVideoDecodeAcceleratorBase::GetGlDecoder() const {
+    return gl_decoder_.get();
+}
+
+media::VideoCodecBridge* AndroidVideoDecodeAcceleratorBase::GetMediaCodec() {
+    return media_codec_.get();
+}
+
 // static
 media::VideoDecodeAccelerator::SupportedProfiles
-AndroidVideoDecodeAccelerator::GetSupportedProfiles() {
+AndroidVideoDecodeAcceleratorBase::GetSupportedProfiles() {
   SupportedProfiles profiles;
 
   if (!media::VideoCodecBridge::IsKnownUnaccelerated(