add error handling if MediaCodec fails to decode data

media/base/android/media_source_player.cc

 // Copyright (c) 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.
 
 #include "media/base/android/media_source_player.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 73 matching lines @@
       media_codec_bridge_->QueueEOS(input_buf_index);
     } else {
       media_codec_bridge_->QueueInputBuffer(
           input_buf_index, &unit.data[0], unit.data.size(), unit.timestamp);
     }
   }
   size_t offset = 0;
   size_t size = 0;
   base::TimeDelta presentation_timestamp;
   bool end_of_stream = false;
+  bool decode_succeeded = true;
 
   int outputBufferIndex = media_codec_bridge_->DequeueOutputBuffer(
       timeout, &offset, &size, &presentation_timestamp, &end_of_stream);
   switch (outputBufferIndex) {
     case MediaCodecBridge::INFO_OUTPUT_BUFFERS_CHANGED:
       media_codec_bridge_->GetOutputBuffers();
       break;
     case MediaCodecBridge::INFO_OUTPUT_FORMAT_CHANGED:
       // TODO(qinmin): figure out what we should do if format changes.

[acolwell GONE FROM CHROMIUM, 2013/05/28 20:35:20]

nit: For now, you could make this case act like a decode error which might be
better than just ignoring it.

[qinmin, 2013/05/28 22:34:10]

Android MediaCodec will report INFO_OUTPUT_FORMAT_CHANGED when start decoding
the first frame. So if we report a decode error here, nothing will be decoded.
I think we should fix the TODO here: when format change happens, clear all the
data, recreate a MediaCodec, do a seek, and request a new surface. The user
experience will not be smooth, but that is probably the best we can do for JB.

On 2013/05/28 20:35:20, acolwell wrote:

[acolwell GONE FROM CHROMIUM, 2013/05/28 22:39:38]

ok. I didn't realize this happens on the first frame. I thought this was only
related to changes after initial setup.

       break;
     case MediaCodecBridge::INFO_TRY_AGAIN_LATER:
       break;
+    case MediaCodecBridge::INFO_MEDIA_CODEC_ERROR:
+      decode_succeeded = false;
+      break;
     default:
       DCHECK_LE(0, outputBufferIndex);
       if (size == 0 && end_of_stream)
         break;
       base::TimeDelta time_to_render;
       if (!start_wallclock_time.is_null()) {
         time_to_render = presentation_timestamp - (base::Time::Now() -
             start_wallclock_time + start_presentation_timestamp);
       }
       if (time_to_render >= base::TimeDelta()) {
         MessageLoop::current()->PostDelayedTask(
             FROM_HERE,
             base::Bind(&MediaDecoderJob::ReleaseOutputBuffer,
                        weak_this_.GetWeakPtr(), outputBufferIndex, size,
                        presentation_timestamp, end_of_stream, callback),
             time_to_render);
       } else {
         // TODO(qinmin): The codec is lagging behind, need to recalculate the
         // |start_presentation_timestamp_| and |start_wallclock_time_|.
         DVLOG(1) << (is_audio_ ? "audio " : "video ")
             << "codec is lagging behind :" << time_to_render.InMicroseconds();
         ReleaseOutputBuffer(outputBufferIndex, size, presentation_timestamp,
                             end_of_stream, callback);
       }
       return;
   }
   message_loop_->PostTask(FROM_HERE, base::Bind(
-      callback, start_presentation_timestamp, start_wallclock_time,
-      end_of_stream));
+      callback, decode_succeeded, start_presentation_timestamp,
+      start_wallclock_time, end_of_stream));
 }
 
 void MediaDecoderJob::ReleaseOutputBuffer(
     int outputBufferIndex, size_t size,
     const base::TimeDelta& presentation_timestamp,
     bool end_of_stream, const MediaDecoderJob::DecoderCallback& callback) {
   // TODO(qinmin): Refactor this function. Maybe AudioDecoderJob should provide
   // its own ReleaseOutputBuffer().
   if (is_audio_) {
     static_cast<AudioCodecBridge*>(media_codec_bridge_.get())->PlayOutputBuffer(
         outputBufferIndex, size);
   }
   media_codec_bridge_->ReleaseOutputBuffer(outputBufferIndex, !is_audio_);
   message_loop_->PostTask(FROM_HERE, base::Bind(
-      callback, presentation_timestamp, base::Time::Now(), end_of_stream));
+      callback, true, presentation_timestamp, base::Time::Now(),
+      end_of_stream));
 }
 
 void MediaDecoderJob::Flush() {
   // Do nothing, flush when the next Decode() happens.
   needs_flush_ = true;
 }
 
 void MediaDecoderJob::Release() {
   if (thread_->IsRunning() &&
       thread_->message_loop() != base::MessageLoop::current()) {
@@ skipping 254 matching lines @@
     pending_event_ &= ~SURFACE_CHANGE_EVENT_PENDING;
   }
 
   ClearDecodingData();
   manager()->OnMediaSeekRequest(player_id(),
                                 last_presentation_timestamp_,
                                 pending_event_ & SURFACE_CHANGE_EVENT_PENDING);
 }
 
 void MediaSourcePlayer::MediaDecoderCallback(
-    bool is_audio, const base::TimeDelta& presentation_timestamp,
+    bool is_audio, bool decode_succeeded,
+    const base::TimeDelta& presentation_timestamp,
     const base::Time& wallclock_time, bool end_of_stream) {
   if (active_decoding_tasks_ > 0)
     active_decoding_tasks_--;
 
+  if (!decode_succeeded) {
+    Release();
+    OnMediaError(MEDIA_ERROR_DECODE);
+    return;
+  }
+
   if (pending_event_ != NO_EVENT_PENDING) {
     ProcessPendingEvents();
     return;
   }
 
   if (is_audio || !HasAudio())
     UpdateTimestamps(presentation_timestamp, wallclock_time);
 
   if (end_of_stream) {
     PlaybackCompleted(is_audio);
@@ skipping 77 matching lines @@
 
 bool MediaSourcePlayer::HasVideo() {
   return kUnknownVideoCodec != video_codec_;
 }
 
 bool MediaSourcePlayer::HasAudio() {
   return kUnknownAudioCodec != audio_codec_;
 }
 
 }  // namespace media