Send error reply to GpuVideoDecodeAccelerator::Initialize when not available

content/common/gpu/media/gpu_video_decode_accelerator.cc

 // Copyright (c) 2011 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/gpu_video_decode_accelerator.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 68 matching lines @@
     LOG(ERROR) << "Send(AcceleratedVideoDecoderHostMsg_PictureReady) failed";
   }
 }
 
 void GpuVideoDecodeAccelerator::NotifyEndOfStream() {
   Send(new AcceleratedVideoDecoderHostMsg_EndOfStream(host_route_id_));
 }
 
 void GpuVideoDecodeAccelerator::NotifyError(
     media::VideoDecodeAccelerator::Error error) {
+  if (init_done_msg_) {
+    // If we get an error while we're initializing, NotifyInitializeDone won't
+    // be called, so we need to send the reply (with an error) here.
+    init_done_msg_->set_reply_error();
+    Send(init_done_msg_);
+    init_done_msg_ = NULL;
+  }
   if (!Send(new AcceleratedVideoDecoderHostMsg_ErrorNotification(
           host_route_id_, error))) {
     LOG(ERROR) << "Send(AcceleratedVideoDecoderHostMsg_ErrorNotification) "
                << "failed";
   }
 }
 
 void GpuVideoDecodeAccelerator::Initialize(
     const std::vector<int32>& configs,
     IPC::Message* init_done_msg) {
   DCHECK(!video_decode_accelerator_.get());
   DCHECK(!init_done_msg_);
   DCHECK(init_done_msg);
 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
   DCHECK(stub_ && stub_->scheduler());
   init_done_msg_ = init_done_msg;
   OmxVideoDecodeAccelerator* omx_decoder = new OmxVideoDecodeAccelerator(this);
   omx_decoder->SetEglState(
       gfx::GLSurfaceEGL::GetHardwareDisplay(),
       stub_->scheduler()->decoder()->GetGLContext()->GetHandle());
   video_decode_accelerator_ = omx_decoder;
   video_decode_accelerator_->Initialize(configs);
 #else
   NOTIMPLEMENTED() << "HW video decode acceleration not available.";
+  init_done_msg->set_reply_error();

[Ami GONE FROM CHROMIUM, 2011/08/11 21:04:11]

FWIW, this can now call NotifyError() instead of doing its own set/send.

[piman, 2011/08/11 22:48:48]

Done.

+  Send(init_done_msg);
 #endif  // defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
 }
 
 void GpuVideoDecodeAccelerator::OnDecode(
     base::SharedMemoryHandle handle, int32 id, int32 size) {
   DCHECK(video_decode_accelerator_.get());
   video_decode_accelerator_->Decode(media::BitstreamBuffer(id, handle, size));
 }
 
 void GpuVideoDecodeAccelerator::OnAssignPictureBuffers(
@@ skipping 62 matching lines @@
 
 void GpuVideoDecodeAccelerator::NotifyResetDone() {
   if (!Send(new AcceleratedVideoDecoderHostMsg_ResetDone(host_route_id_)))
     LOG(ERROR) << "Send(AcceleratedVideoDecoderHostMsg_ResetDone) failed";
 }
 
 bool GpuVideoDecodeAccelerator::Send(IPC::Message* message) {
   DCHECK(sender_);
   return sender_->Send(message);
 }