[merged] Report media error if PlayOutputBuffer failed

media/base/android/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/media_codec_decoder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
@@ skipping 874 matching lines @@
       case MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED:
         // Output buffers are replaced in MediaCodecBridge, nothing to do.
         DVLOG(2) << class_name() << "::" << __FUNCTION__
                  << " MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED";
         break;
 
       case MEDIA_CODEC_OUTPUT_FORMAT_CHANGED:
         DVLOG(2) << class_name() << "::" << __FUNCTION__
                  << " MEDIA_CODEC_OUTPUT_FORMAT_CHANGED";
         if (!OnOutputFormatChanged()) {
-          DVLOG(0) << class_name() << "::" << __FUNCTION__
-                   << ": OnOutputFormatChanged failed";
-          status = MEDIA_CODEC_ERROR;
+          DVLOG(1) << class_name() << "::" << __FUNCTION__
+                   << ": OnOutputFormatChanged failed, stopping frame"
+                   << " processing";
           media_task_runner_->PostTask(FROM_HERE, internal_error_cb_);
+          return false;
         }
         break;
 
       case MEDIA_CODEC_OK:
         // We got the decoded frame.
 
         is_prepared_ = true;
 
         if (pts < preroll_timestamp_)
           render_mode = kRenderSkip;
         else if (GetState() == kPrerolling)
           render_mode = kRenderAfterPreroll;
         else
           render_mode = kRenderNow;
 
-        Render(buffer_index, offset, size, render_mode, pts, eos_encountered);
+        if (!Render(buffer_index, offset, size, render_mode, pts,
+                    eos_encountered)) {
+          DVLOG(1) << class_name() << "::" << __FUNCTION__
+                   << " Render failed, stopping frame processing";
+          media_task_runner_->PostTask(FROM_HERE, internal_error_cb_);
+          return false;
+        }
 
         if (render_mode == kRenderAfterPreroll) {
           DVLOG(1) << class_name() << "::" << __FUNCTION__ << " pts " << pts
                    << " >= preroll timestamp " << preroll_timestamp_
                    << " preroll done, stopping frame processing";
           media_task_runner_->PostTask(FROM_HERE, internal_preroll_done_cb_);
           return false;
         }
         break;
 
@@ skipping 69 matching lines @@
     RETURN_STRING(kStopping);
     RETURN_STRING(kInEmergencyStop);
     RETURN_STRING(kError);
   }
   return nullptr;  // crash early
 }
 
 #undef RETURN_STRING
 
 }  // namespace media