Make VEA client of command buffer; move sync. IPC to VDA/VEA::Initialize()

content/common/gpu/media/android_video_encode_accelerator.cc

 // Copyright 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.
 
 #include "content/common/gpu/media/android_video_encode_accelerator.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 94 matching lines @@
     // encoder?  Sure would be.  Too bad it doesn't.  So we hard-code some
     // reasonable defaults.
     profile.max_resolution.SetSize(1920, 1088);
     profile.max_framerate.numerator = 30;
     profile.max_framerate.denominator = 1;
     profiles.push_back(profile);
   }
   return profiles;
 }
 
-void AndroidVideoEncodeAccelerator::Initialize(
+bool AndroidVideoEncodeAccelerator::Initialize(
     VideoFrame::Format format,
     const gfx::Size& input_visible_size,
     media::VideoCodecProfile output_profile,
     uint32 initial_bitrate,
     Client* client) {
   DVLOG(3) << __PRETTY_FUNCTION__ << " format: " << format
            << ", input_visible_size: " << input_visible_size.ToString()
            << ", output_profile: " << output_profile
            << ", initial_bitrate: " << initial_bitrate;
   DCHECK(!media_codec_);
   DCHECK(thread_checker_.CalledOnValidThread());
 
   client_ptr_factory_.reset(new base::WeakPtrFactory<Client>(client));
 
-  RETURN_ON_FAILURE(media::MediaCodecBridge::SupportsSetParameters() &&
-                        format == VideoFrame::I420 &&
-                        output_profile == media::VP8PROFILE_MAIN,
-                    "Unexpected combo: " << format << ", " << output_profile,
-                    kInvalidArgumentError);
+  if (!(media::MediaCodecBridge::SupportsSetParameters() &&
+        format == VideoFrame::I420 &&
+        output_profile == media::VP8PROFILE_MAIN)) {
+    DLOG(ERROR) << "Unexpected combo: " << format << ", " << output_profile;
+    return false;
+  }
 
   last_set_bitrate_ = initial_bitrate;
 
   // Only consider using MediaCodec if it's likely backed by hardware.
-  RETURN_ON_FAILURE(!media::VideoCodecBridge::IsKnownUnaccelerated(
-                         media::kCodecVP8, media::MEDIA_CODEC_ENCODER),
-                    "No HW support",
-                    kPlatformFailureError);
+  if (media::VideoCodecBridge::IsKnownUnaccelerated(
+          media::kCodecVP8, media::MEDIA_CODEC_ENCODER)) {
+    DLOG(ERROR) << "No HW support";
+    return false;
+  }
 
   // TODO(fischman): when there is more HW out there with different color-space
   // support, this should turn into a negotiation with the codec for supported
   // formats.  For now we use the only format supported by the only available
   // HW.
   media_codec_.reset(
       media::VideoCodecBridge::CreateEncoder(media::kCodecVP8,
                                              input_visible_size,
                                              initial_bitrate,
                                              INITIAL_FRAMERATE,
                                              IFRAME_INTERVAL,
                                              COLOR_FORMAT_YUV420_SEMIPLANAR));
 
-  RETURN_ON_FAILURE(
-      media_codec_,
-      "Failed to create/start the codec: " << input_visible_size.ToString(),
-      kPlatformFailureError);
-
-  base::MessageLoop::current()->PostTask(
-      FROM_HERE,
-      base::Bind(&VideoEncodeAccelerator::Client::NotifyInitializeDone,
-                 client_ptr_factory_->GetWeakPtr()));
+  if (!media_codec_) {
+    DLOG(ERROR) << "Failed to create/start the codec: "
+                << input_visible_size.ToString();
+    return false;
+  }
 
   num_output_buffers_ = media_codec_->GetOutputBuffersCount();
   output_buffers_capacity_ = media_codec_->GetOutputBuffersCapacity();
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&VideoEncodeAccelerator::Client::RequireBitstreamBuffers,
                  client_ptr_factory_->GetWeakPtr(),
                  num_output_buffers_,
                  input_visible_size,
                  output_buffers_capacity_));
+  return true;
 }
 
 void AndroidVideoEncodeAccelerator::MaybeStartIOTimer() {
   if (!io_timer_.IsRunning() &&
       (num_buffers_at_codec_ > 0 || !pending_frames_.empty())) {
     io_timer_.Start(FROM_HERE,
                     EncodePollDelay(),
                     this,
                     &AndroidVideoEncodeAccelerator::DoIOTask);
   }
@@ skipping 220 matching lines @@
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&VideoEncodeAccelerator::Client::BitstreamBufferReady,
                  client_ptr_factory_->GetWeakPtr(),
                  bitstream_buffer.id(),
                  size,
                  key_frame));
 }
 
 }  // namespace content