Add Create() function to AudioCodecBridge and VideoCodecBridge to allow return of null pointers

content/common/gpu/media/android_video_decode_accelerator.cc

 // 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.
 
 #include "content/common/gpu/media/android_video_decode_accelerator.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "content/common/gpu/gpu_channel.h"
@@ skipping 86 matching lines @@
   glTexParameteri(GL_TEXTURE_EXTERNAL_OES, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
   glTexParameteri(GL_TEXTURE_EXTERNAL_OES,
                   GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   glTexParameteri(GL_TEXTURE_EXTERNAL_OES,
                   GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
   gl_decoder_->RestoreTextureUnitBindings(0);
   gl_decoder_->RestoreActiveTexture();
 
   surface_texture_ = new gfx::SurfaceTextureBridge(surface_texture_id_);
 
-  ConfigureMediaCodec();
+  if (!ConfigureMediaCodec()) {
+    LOG(ERROR) << "Failed to create MediaCodec instance.";
+    return false;
+  }
 
   base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
       &AndroidVideoDecodeAccelerator::NotifyInitializeDone,
       base::AsWeakPtr(this)));
   return true;
 }
 
 void AndroidVideoDecodeAccelerator::DoIOTask() {
   io_task_is_posted_ = false;
   if (state_ == ERROR) {
@@ skipping 251 matching lines @@
   if (!io_task_is_posted_)
     DoIOTask();
 }
 
 void AndroidVideoDecodeAccelerator::Flush() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   Decode(media::BitstreamBuffer(-1, base::SharedMemoryHandle(), 0));
 }
 
-void AndroidVideoDecodeAccelerator::ConfigureMediaCodec() {
+bool AndroidVideoDecodeAccelerator::ConfigureMediaCodec() {
   DCHECK(surface_texture_.get());
+  media_codec_.reset(media::VideoCodecBridge::Create(codec_));
 
-  media_codec_.reset(new media::VideoCodecBridge(codec_));
+  if (!media_codec_)
+    return false;
 
   gfx::ScopedJavaSurface surface(surface_texture_.get());
   // VDA does not pass the container indicated resolution in the initialization
   // phase. Here, we set 720p by default.
   // TODO(dwkang): find out a way to remove the following hard-coded value.
   media_codec_->Start(
       codec_, gfx::Size(1280, 720), surface.j_surface().obj());
   media_codec_->GetOutputBuffers();
+  return true;
 }
 
 void AndroidVideoDecodeAccelerator::Reset() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   while(!pending_bitstream_buffers_.empty()) {
     media::BitstreamBuffer& bitstream_buffer =
         pending_bitstream_buffers_.front();
     pending_bitstream_buffers_.pop();
 
@@ skipping 58 matching lines @@
 void AndroidVideoDecodeAccelerator::NotifyResetDone() {
   client_->NotifyResetDone();
 }
 
 void AndroidVideoDecodeAccelerator::NotifyError(
     media::VideoDecodeAccelerator::Error error) {
   client_->NotifyError(error);
 }
 
 }  // namespace content