Report media error if PlayOutputBuffer failed

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 177 matching lines @@
     DVLOG(2) << __FUNCTION__ << ": new sampling rate " << output_sampling_rate_;
     needs_recreate_audio_track = true;
 
     ResetTimestampHelper();
   }
 
   const int old_num_channels = output_num_channels_;
   status = media_codec_bridge_->GetOutputChannelCount(&output_num_channels_);
 
   if (status == MEDIA_CODEC_OK && old_num_channels != output_num_channels_) {
-    DCHECK_GT(output_sampling_rate_, 0);
+    DCHECK_GT(output_num_channels_, 0);
     DVLOG(2) << __FUNCTION__ << ": new channel count " << output_num_channels_;
     needs_recreate_audio_track = true;
   }
 
   if (needs_recreate_audio_track &&
       !static_cast<AudioCodecBridge*>(media_codec_bridge_.get())
            ->CreateAudioTrack(output_sampling_rate_, output_num_channels_)) {
     DLOG(ERROR) << __FUNCTION__ << ": cannot create AudioTrack";
     return false;
   }
 
   return true;
 }
 
-void AudioMediaCodecDecoder::Render(int buffer_index,
+bool 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;
     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);
+
+    if (status != MEDIA_CODEC_OK) {
+      DLOG(ERROR) << class_name() << "::" << __FUNCTION__ << " pts:" << pts
+                  << " PlayOutputBuffer failed for index:" << buffer_index;
+      media_codec_bridge_->ReleaseOutputBuffer(buffer_index, false);
+      return false;
+    }
 
     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 39 matching lines @@
 
       media_task_runner_->PostTask(
           FROM_HERE, base::Bind(update_current_time_cb_, now_playing,
                                 last_buffered, false));
     }
   }
 
   media_codec_bridge_->ReleaseOutputBuffer(buffer_index, false);
 
   CheckLastFrame(eos_encountered, false);  // no delayed tasks
+
+  return true;
 }
 
 void AudioMediaCodecDecoder::SetVolumeInternal() {
   DCHECK(media_task_runner_->BelongsToCurrentThread());
 
   if (media_codec_bridge_) {
     static_cast<AudioCodecBridge*>(media_codec_bridge_.get())
         ->SetVolume(volume_);
   }
 }
 
 void AudioMediaCodecDecoder::ResetTimestampHelper() {
   // Media thread or Decoder thread
   // When this method is called on Media thread, decoder thread
   // should not be running.
 
   if (audio_timestamp_helper_)
     base_timestamp_ = audio_timestamp_helper_->GetTimestamp();
 
   audio_timestamp_helper_.reset(
       new AudioTimestampHelper(output_sampling_rate_));
 
   audio_timestamp_helper_->SetBaseTimestamp(base_timestamp_);
 }
 
 }  // namespace media