Catch CodecException in MediaCodecBridge and return MEDIA_CODEC_ERROR

media/base/android/audio_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/audio_media_codec_decoder.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "media/base/android/media_statistics.h"
 #include "media/base/android/sdk_media_codec_bridge.h"
@@ skipping 157 matching lines @@
 
   return kConfigOk;
 }
 
 void AudioMediaCodecDecoder::OnOutputFormatChanged() {
   DCHECK(decoder_thread_.task_runner()->BelongsToCurrentThread());
 
   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)
     ResetTimestampHelper();
 }
 
 void AudioMediaCodecDecoder::Render(int buffer_index,
                                     size_t offset,
                                     size_t size,
                                     RenderMode render_mode,
                                     base::TimeDelta pts,
                                     bool eos_encountered) {
   DCHECK(decoder_thread_.task_runner()->BelongsToCurrentThread());
 
   DVLOG(2) << class_name() << "::" << __FUNCTION__ << " pts:" << pts << " "
            << AsString(render_mode);
 
   const bool do_play = (render_mode != kRenderSkip);
 
   if (do_play) {
     AudioCodecBridge* audio_codec =
         static_cast<AudioCodecBridge*>(media_codec_bridge_.get());
 
     DCHECK(audio_codec);
 
     const bool postpone = (render_mode == kRenderAfterPreroll);
 
-    int64_t head_position =
-        audio_codec->PlayOutputBuffer(buffer_index, size, offset, postpone);
+    int64_t head_position;
+    MediaCodecStatus status = audio_codec->PlayOutputBuffer(
+        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();
 
     frame_statistics_->IncrementFrameCount();
 
     // Reset the base timestamp if we have not started playing.
     // SetBaseTimestamp() must be called before AddFrames() since it resets the
     // internal frame count.
     if (postpone && !frame_count_)
       SetBaseTimestamp(pts);
@@ skipping 63 matching lines @@
   if (audio_timestamp_helper_)
     base_timestamp_ = audio_timestamp_helper_->GetTimestamp();
 
   audio_timestamp_helper_.reset(
       new AudioTimestampHelper(configs_.audio_sampling_rate));
 
   audio_timestamp_helper_->SetBaseTimestamp(base_timestamp_);
 }
 
 }  // namespace media