[merged] Report media error if PlayOutputBuffer failed

media/base/android/media_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_MEDIA_DECODER_JOB_H_
 #define MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_
 
 #include <stddef.h>
 
 #include "base/callback.h"
@@ skipping 32 matching lines @@
 
   // Callback when a decoder job finishes its work. Args: whether decode
   // finished successfully, a flag whether the frame is late for statistics,
   // cacurrent presentation time, max presentation time.
   // If the current presentation time is equal to kNoTimestamp(), the decoder
   // job skipped rendering of the decoded output and the callback target should
   // ignore the timestamps provided. The late frame flag has no meaning in this
   // 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();
 
   // Called by MediaSourcePlayer when more data for this object has arrived.
   void OnDataReceived(const DemuxerData& data);
 
   // Prefetch so we know the decoder job has data when we call Decode().
   // |prefetch_cb| - Run when prefetching has completed.
   void Prefetch(const base::Closure& prefetch_cb);
 
@@ skipping 59 matching lines @@
   // |render_output| is true. Upon completion, |callback| will be called.
   // |is_late_frame| can be passed with the |callback| if the implementation
   // does not calculate it itself.
   virtual 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) = 0;
+      MediaCodecStatus status,
+      const DecoderCallback& callback) = 0;
 
   // Returns true if the "time to render" needs to be computed for frames in
   // this decoder job.
   virtual bool ComputeTimeToRender() const = 0;
 
   // Gets MediaCrypto object from |drm_bridge_|.
   jobject GetMediaCrypto();
 
   // Releases the |media_codec_bridge_|.
   void ReleaseMediaCodecBridge();
@@ skipping 213 matching lines @@
   // This access unit is passed to the decoder during config changes to drain
   // the decoder.
   AccessUnit eos_unit_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(MediaDecoderJob);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_