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

media/cast/video_sender/external_video_encoder.cc

 // Copyright 2014 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 "media/cast/video_sender/external_video_encoder.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/shared_memory.h"
@@ skipping 55 matching lines @@
 
   // Initialize the real HW encoder.
   void Initialize(const VideoSenderConfig& video_config) {
     DCHECK(gpu_factories_);
     DCHECK(encoder_task_runner_);
 
     DCHECK(encoder_task_runner_->RunsTasksOnCurrentThread());
 
     video_encode_accelerator_ =
         gpu_factories_->CreateVideoEncodeAccelerator().Pass();
-    if (!video_encode_accelerator_)
+    if (!video_encode_accelerator_) {
+      NotifyError(VideoEncodeAccelerator::kPlatformFailureError);
       return;
+    }
 
     VideoCodecProfile output_profile = media::VIDEO_CODEC_PROFILE_UNKNOWN;
     switch (video_config.codec) {
       case transport::kVp8:
         output_profile = media::VP8PROFILE_MAIN;
         break;
       case transport::kH264:
         output_profile = media::H264PROFILE_MAIN;
         break;
     }
     codec_ = video_config.codec;
     max_frame_rate_ = video_config.max_frame_rate;
 
-    // Asynchronous initialization call; NotifyInitializeDone or NotifyError
-    // will be called once the HW is initialized.
-    video_encode_accelerator_->Initialize(
-        media::VideoFrame::I420,
-        gfx::Size(video_config.width, video_config.height),
-        output_profile,
-        video_config.start_bitrate,
-        this);
+    if (!video_encode_accelerator_->Initialize(
+            media::VideoFrame::I420,
+            gfx::Size(video_config.width, video_config.height),
+            output_profile,
+            video_config.start_bitrate,
+            this)) {
+      NotifyError(VideoEncodeAccelerator::kInvalidArgumentError);
+      return;
+    }
+
+    cast_environment_->PostTask(
+        CastEnvironment::MAIN,
+        FROM_HERE,
+        base::Bind(&ExternalVideoEncoder::EncoderInitialized, weak_owner_));
   }
 
   // Free the HW.
   void Destroy() {
     DCHECK(encoder_task_runner_);
     DCHECK(encoder_task_runner_->RunsTasksOnCurrentThread());
 
     if (video_encode_accelerator_) {
       video_encode_accelerator_.release()->Destroy();
     }
@@ skipping 60 matching lines @@
                       frame.get());
 
     encoded_frame_data_storage_.push_back(
         EncodedFrameReturnData(capture_time, frame_encoded_callback));
 
     // BitstreamBufferReady will be called once the encoder is done.
     video_encode_accelerator_->Encode(frame, key_frame_requested);
   }
 
  protected:
-  virtual void NotifyInitializeDone() OVERRIDE {
-    DCHECK(encoder_task_runner_);
-    DCHECK(encoder_task_runner_->RunsTasksOnCurrentThread());
-
-    cast_environment_->PostTask(
-        CastEnvironment::MAIN,
-        FROM_HERE,
-        base::Bind(&ExternalVideoEncoder::EncoderInitialized, weak_owner_));
-  }
-
   virtual void NotifyError(VideoEncodeAccelerator::Error error) OVERRIDE {
     DCHECK(encoder_task_runner_);
     DCHECK(encoder_task_runner_->RunsTasksOnCurrentThread());
     VLOG(1) << "ExternalVideoEncoder NotifyError: " << error;
 
     if (video_encode_accelerator_) {
       video_encode_accelerator_.release()->Destroy();
     }
     cast_environment_->PostTask(
         CastEnvironment::MAIN,
@@ skipping 250 matching lines @@
   // Do nothing not supported.
 }
 
 int ExternalVideoEncoder::NumberOfSkippedFrames() const {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   return skip_count_;
 }
 
 }  //  namespace cast
 }  //  namespace media