[merged] Report media error if PlayOutputBuffer failed

media/base/android/media_decoder_job.h

Index: media/base/android/media_decoder_job.h
diff --git a/media/base/android/media_decoder_job.h b/media/base/android/media_decoder_job.h
index ce3cd767120b09a315e9326ae0d9a61e5eafec95..74d028bf4aa1952641a1ac98bc88005eb1bbecf3 100644
--- a/media/base/android/media_decoder_job.h
+++ b/media/base/android/media_decoder_job.h
@@ -50,13 +50,6 @@ class MediaDecoderJob {
   // case.
   typedef base::Callback<void(MediaCodecStatus, bool, base::TimeDelta,
                               base::TimeDelta)> DecoderCallback;
-  // Callback when a decoder job finishes releasing the output buffer.
-  // Args: whether the frame is a late frame, current presentation time, max
-  // presentation time.
-  // If the current presentation time is equal to kNoTimestamp(), the callback
-  // target should ignore the timestamps provided and whether it is late.
-  typedef base::Callback<void(bool, base::TimeDelta, base::TimeDelta)>
-      ReleaseOutputCompletionCallback;
 
   virtual ~MediaDecoderJob();
 
@@ -136,7 +129,8 @@ class MediaDecoderJob {
       bool render_output,
       bool is_late_frame,
       base::TimeDelta current_presentation_timestamp,
-      const ReleaseOutputCompletionCallback& callback) = 0;
+      MediaCodecStatus status,
+      const DecoderCallback& callback) = 0;
 
   // Returns true if the "time to render" needs to be computed for frames in
   // this decoder job.