Catch CodecException in MediaCodecBridge and return MEDIA_CODEC_ERROR

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 <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 317 matching lines @@
     // Ideally MediaCodec would honor BUFFER_FLAG_SYNC_FRAME so we could
     // indicate this in the QueueInputBuffer() call below and guarantee _this_
     // frame be encoded as a key frame, but sadly that flag is ignored.
     // Instead, we request a key frame "soon".
     media_codec_->RequestKeyFrameSoon();
   }
   scoped_refptr<VideoFrame> frame = base::get<0>(input);
 
   uint8_t* buffer = NULL;
   size_t capacity = 0;
-  media_codec_->GetInputBuffer(input_buf_index, &buffer, &capacity);
+  status = media_codec_->GetInputBuffer(input_buf_index, &buffer, &capacity);
+  RETURN_ON_FAILURE(status == media::MEDIA_CODEC_OK, "GetInputBuffer failed.",
+                    kPlatformFailureError);
 
   size_t queued_size =
       VideoFrame::AllocationSize(media::PIXEL_FORMAT_I420, frame->coded_size());
   RETURN_ON_FAILURE(capacity >= queued_size,
                     "Failed to get input buffer: " << input_buf_index,
                     kPlatformFailureError);
 
   uint8_t* dst_y = buffer;
   int dst_stride_y = frame->stride(VideoFrame::kYPlane);
   uint8_t* dst_uv =
@@ skipping 73 matching lines @@
   scoped_ptr<base::SharedMemory> shm(
       new base::SharedMemory(bitstream_buffer.handle(), false));
   RETURN_ON_FAILURE(shm->Map(bitstream_buffer.size()),
                     "Failed to map SHM",
                     kPlatformFailureError);
   RETURN_ON_FAILURE(size <= shm->mapped_size(),
                     "Encoded buffer too large: " << size << ">"
                                                  << shm->mapped_size(),
                     kPlatformFailureError);
 
-  media_codec_->CopyFromOutputBuffer(buf_index, offset, shm->memory(), size);
+  media::MediaCodecStatus status = media_codec_->CopyFromOutputBuffer(
+      buf_index, offset, shm->memory(), size);
+  RETURN_ON_FAILURE(status == media::MEDIA_CODEC_OK,
+                    "CopyFromOutputBuffer failed", kPlatformFailureError);
   media_codec_->ReleaseOutputBuffer(buf_index, false);
   --num_buffers_at_codec_;
 
   UMA_HISTOGRAM_COUNTS_10000("Media.AVEA.EncodedBufferSizeKB", size / 1024);
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&VideoEncodeAccelerator::Client::BitstreamBufferReady,
                  client_ptr_factory_->GetWeakPtr(),
                  bitstream_buffer.id(),
                  size,
                  key_frame));
 }
 
 }  // namespace content