Use the MediaCodec flush workaround in more cases

media/base/android/ndk_media_codec_bridge.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/ndk_media_codec_bridge.h"
 
 #include <media/NdkMediaError.h>
 #include <media/NdkMediaFormat.h>
 
 #include <limits>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "base/strings/string_util.h"
+#include "media/base/android/media_codec_util.h"
 #include "media/base/decrypt_config.h"
 
 namespace {
 const char kMediaFormatKeyCropLeft[] = "crop-left";
 const char kMediaFormatKeyCropRight[] = "crop-right";
 const char kMediaFormatKeyCropBottom[] = "crop-bottom";
 const char kMediaFormatKeyCropTop[] = "crop-top";
 }
 
 namespace media {
@@ skipping 204 matching lines @@
                                                            void* dst,
                                                            size_t num) {
   size_t capacity;
   const uint8_t* src_data =
       AMediaCodec_getOutputBuffer(media_codec_.get(), index, &capacity);
   CHECK_GE(capacity, offset + num);
   memcpy(dst, src_data + offset, num);
   return MEDIA_CODEC_OK;
 }
 
+std::string NdkMediaCodecBridge::GetName() {
+  // The NDK doesn't expose a name getter, so use the default name as a proxy.

[DaleCurtis, 2016/04/23 19:06:21]

I'm wary of this, there is already some worry that the codec created doesn't
always have the right name. Is there no other way to get a name type token?
Could we intead modify creation to get a name or something?

+  if (base::android::BuildInfo::GetInstance()->sdk_int() < 18)
+    return "";
+  return MediaCodecUtil::GetDefaultCodecName(mime_, direction_);
+}
+
 }  // namespace media