Catch CodecException in MediaCodecBridge and return MEDIA_CODEC_ERROR

media/base/android/audio_decoder_job.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 "media/base/android/audio_decoder_job.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread.h"
 #include "media/base/android/sdk_media_codec_bridge.h"
@@ skipping 87 matching lines @@
     int output_buffer_index,
     size_t offset,
     size_t size,
     bool render_output,
     bool /* is_late_frame */,
     base::TimeDelta current_presentation_timestamp,
     const ReleaseOutputCompletionCallback& callback) {
   render_output = render_output && (size != 0u);
   bool is_audio_underrun = false;
   if (render_output) {
-    int64_t head_position =
+    bool postpone = false;
+    int64_t head_position;
+    MediaCodecStatus status =
         (static_cast<AudioCodecBridge*>(media_codec_bridge_.get()))
-            ->PlayOutputBuffer(output_buffer_index, size, offset);
+            ->PlayOutputBuffer(output_buffer_index, size, offset, postpone,
+                               &head_position);
+    // TODO(timav,watk): This CHECK maintains the behavior of this call before
+    // we started catching CodecException and returning it as MEDIA_CODEC_ERROR.
+    // It needs to be handled some other way. http://crbug.com/585978
+    CHECK_EQ(status, MEDIA_CODEC_OK);
 
     base::TimeTicks current_time = base::TimeTicks::Now();
 
     size_t new_frames_count = size / bytes_per_frame_;
     frame_count_ += new_frames_count;
     audio_timestamp_helper_->AddFrames(new_frames_count);
     int64_t frames_to_play = frame_count_ - head_position;
     DCHECK_GE(frames_to_play, 0);
 
     const base::TimeDelta last_buffered =
@@ skipping 63 matching lines @@
   if (media_codec_bridge_) {
     static_cast<AudioCodecBridge*>(media_codec_bridge_.get())->SetVolume(
         volume_);
   }
 }
 
 void AudioDecoderJob::OnOutputFormatChanged() {
   DCHECK(media_codec_bridge_);
 
   int old_sampling_rate = output_sampling_rate_;
-  output_sampling_rate_ = media_codec_bridge_->GetOutputSamplingRate();
-  if (output_sampling_rate_ != old_sampling_rate)
+  MediaCodecStatus status =
+      media_codec_bridge_->GetOutputSamplingRate(&output_sampling_rate_);
+  if (status != MEDIA_CODEC_OK || output_sampling_rate_ != old_sampling_rate)

[qinmin, 2016/03/03 23:15:23]

if the return status is not MEDIA_CODEC_OK, i think we should abort playback

[watk, 2016/03/04 01:33:32]

Makes sense. I'm not quite sure how to do that just yet, so I've turned this
into a CHECK and a TODO.

     ResetTimestampHelper();
 }
 
 }  // namespace media