[merged] Report media error if PlayOutputBuffer failed

media/base/android/sdk_media_codec_bridge.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/sdk_media_codec_bridge.h"
 
 #include <algorithm>
 #include <limits>
 #include <utility>
 
@@ skipping 560 matching lines @@
                                                     size_t offset,
                                                     bool postpone,
                                                     int64_t* playback_pos) {
   DCHECK_LE(0, index);
   int numBytes = base::checked_cast<int>(size);
 
   const uint8_t* buffer = nullptr;
   size_t capacity = 0;
   MediaCodecStatus status =
       GetOutputBufferAddress(index, offset, &buffer, &capacity);
-  if (status == MEDIA_CODEC_ERROR)
+  if (status != MEDIA_CODEC_OK) {
+    DLOG(ERROR) << __FUNCTION__
+                << ": GetOutputBufferAddress() failed for index:" << index;
     return status;
+  }
 
   numBytes = std::min(base::checked_cast<int>(capacity), numBytes);
   CHECK_GE(numBytes, 0);
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jbyteArray> byte_array =
       base::android::ToJavaByteArray(env, buffer, numBytes);
   *playback_pos = Java_MediaCodecBridge_playOutputBuffer(
       env, media_codec(), byte_array.obj(), postpone);
   return status;
@@ skipping 101 matching lines @@
   if (adaptive_playback_supported_for_testing_ == 0)
     return false;
   else if (adaptive_playback_supported_for_testing_ > 0)
     return true;
   JNIEnv* env = AttachCurrentThread();
   return Java_MediaCodecBridge_isAdaptivePlaybackSupported(env, media_codec(),
                                                            width, height);
 }
 
 }  // namespace media