[merged] Report media error if PlayOutputBuffer failed

media/base/android/audio_decoder_job.h

 // 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.
 
 #ifndef MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_
 #define MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_
 
 #include <jni.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 25 matching lines @@
   void SetDemuxerConfigs(const DemuxerConfigs& configs) override;
 
   // Sets the volume of the audio output.
   void SetVolume(double volume);
 
   // Sets the base timestamp for |audio_timestamp_helper_|.
   void SetBaseTimestamp(base::TimeDelta base_timestamp);
 
  private:
   // MediaDecoderJob implementation.
-  void ReleaseOutputBuffer(
-      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) override;
+  void ReleaseOutputBuffer(int output_buffer_index,
+                           size_t offset,
+                           size_t size,
+                           bool render_output,
+                           bool is_late_frame,
+                           base::TimeDelta current_presentation_timestamp,
+                           MediaCodecStatus status,
+                           const DecoderCallback& callback) override;
   bool ComputeTimeToRender() const override;
   bool AreDemuxerConfigsChanged(const DemuxerConfigs& configs) const override;
   MediaDecoderJobStatus CreateMediaCodecBridgeInternal() override;
   bool OnOutputFormatChanged() override;
 
   // Helper method to set the audio output volume.
   void SetVolumeInternal();
 
   void ResetTimestampHelper();
 
@@ skipping 23 matching lines @@
 
   // The time limit for the next frame to avoid underrun.
   base::TimeTicks next_frame_time_limit_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioDecoderJob);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_AUDIO_DECODER_JOB_H_