Use the MediaCodec flush workaround in more cases

media/base/android/media_codec_util.h

 // 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.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_UTIL_H_
 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_UTIL_H_
 
 #include <jni.h>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "media/base/media_export.h"
 
 class GURL;
 
 namespace media {
 
+class MediaCodecBridge;
+
 // Helper macro to skip the test if MediaCodecBridge isn't available.
 #define SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE()        \
   do {                                                            \
     if (!MediaCodecUtil::IsMediaCodecAvailable()) {               \
       VLOG(0) << "Could not run test - not supported on device."; \
       return;                                                     \
     }                                                             \
   } while (0)
 
 // Codec direction. Keep this in sync with MediaCodecUtil.java.
 enum MediaCodecDirection {
   MEDIA_CODEC_DECODER,
   MEDIA_CODEC_ENCODER,
 };
 
 class MEDIA_EXPORT MediaCodecUtil {
  public:
   // Returns true if MediaCodec is available on the device.
   // All other static methods check IsAvailable() internally. There's no need
   // to check IsAvailable() explicitly before calling them.
   static bool IsMediaCodecAvailable();
 
+  // Returns the component name of the decoder that will be created for the

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

I don't like exposing the codec name getter, since it requires outside knowledge
of the android mime types which are weird and not inline with chromium types.
min has a nice CL to switch these to an enum value that I think we should
surface instead if we go this route.

+  // given |mime_type| and |direction|.
+  static std::string GetDefaultCodecName(const std::string& mime_type,
+                                         MediaCodecDirection direction);
+
   // Returns true if MediaCodec.setParameters() is available on the device.
   static bool SupportsSetParameters();
 
   // Returns whether MediaCodecBridge has a decoder that |is_secure| and can
   // decode |codec| type.
   static bool CanDecode(const std::string& codec, bool is_secure);
 
   // Get a list of encoder supported color formats for |mime_type|.
   // The mapping of color format name and its value refers to
   // MediaCodecInfo.CodecCapabilities.
@@ skipping 15 matching lines @@
 
   // Indicates if the vp8 decoder or encoder is available on this device.
   static bool IsVp8DecoderAvailable();
   static bool IsVp8EncoderAvailable();
 
   // Indicates if the vp9 decoder is available on this device.
   static bool IsVp9DecoderAvailable();
 
   // Indicates if SurfaceView and MediaCodec work well together on this device.
   static bool IsSurfaceViewOutputSupported();
+
+  // Indicates if the decoder is known to fail when flushed. (b/8125974,
+  // b/8347958)
+  // When true, the client should work around the issue by releasing the
+  // decoder and instantiating a new one rather than flushing the current one.
+  static bool CodecNeedsFlushWorkaround(MediaCodecBridge* codec);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_UTIL_H_