Catch CodecException in MediaCodecBridge and return MEDIA_CODEC_ERROR

media/base/android/video_media_codec_decoder.cc

 // Copyright 2015 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/base/android/video_media_codec_decoder.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 192 matching lines @@
   DCHECK(media_task_runner_->BelongsToCurrentThread());
 
   start_pts_ = last_seen_pts_ = kNoTimestamp();
 }
 
 void VideoMediaCodecDecoder::OnOutputFormatChanged() {
   DCHECK(decoder_thread_.task_runner()->BelongsToCurrentThread());
 
   gfx::Size prev_size = video_size_;
 
-  // See b/18224769. The values reported from MediaCodecBridge::GetOutputFormat
+  // See b/18224769. The values reported from MediaCodecBridge::GetOutputSize
   // correspond to the actual video frame size, but this is not necessarily the
   // size that should be output.
   video_size_ = configs_.video_size;
   if (video_size_ != prev_size) {
     media_task_runner_->PostTask(
         FROM_HERE, base::Bind(video_size_changed_cb_, video_size_));
   }
 }
 
 void VideoMediaCodecDecoder::Render(int buffer_index,
@@ skipping 123 matching lines @@
 
   // |update_current_time_cb_| might be null if there is audio stream.
   // Do not update current time for stand-alone EOS frames.
   if (!update_current_time_cb_.is_null() && update_time) {
     media_task_runner_->PostTask(
         FROM_HERE, base::Bind(update_current_time_cb_, pts, pts, false));
   }
 }
 
 }  // namespace media