Cleanup MediaCodecUtil::GetDefaultCodecName().

media/base/android/java/src/org/chromium/media/MediaCodecUtil.java

Index: media/base/android/java/src/org/chromium/media/MediaCodecUtil.java
diff --git a/media/base/android/java/src/org/chromium/media/MediaCodecUtil.java b/media/base/android/java/src/org/chromium/media/MediaCodecUtil.java
index 83835836a6a701a0cab0d4477ae81d33e6a2ce8c..2cec52a71412b63bbb168041e5d7d4c7d07dbd22 100644
--- a/media/base/android/java/src/org/chromium/media/MediaCodecUtil.java
+++ b/media/base/android/java/src/org/chromium/media/MediaCodecUtil.java
@@ -15,10 +15,7 @@ import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.annotations.MainDex;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 
 /**
  * A collection of MediaCodec utility functions.
@@ -32,37 +29,6 @@ class MediaCodecUtil {
     static final int MEDIA_CODEC_ENCODER = 1;
 
     /**
-     * This class represents supported android codec information.
-     */
-    @MainDex
-    private static class CodecInfo {
-        private final String mCodecType; // e.g. "video/x-vnd.on2.vp8".
-        private final String mCodecName; // e.g. "OMX.google.vp8.decoder".
-        private final int mDirection;
-
-        private CodecInfo(String codecType, String codecName, int direction) {
-            mCodecType = codecType;
-            mCodecName = codecName;
-            mDirection = direction;
-        }
-
-        @CalledByNative("CodecInfo")
-        private String codecType() {
-            return mCodecType;
-        }
-
-        @CalledByNative("CodecInfo")
-        private String codecName() {
-            return mCodecName;
-        }
-
-        @CalledByNative("CodecInfo")
-        private int direction() {
-            return mDirection;
-        }
-    }
-
-    /**
      * Class to pass parameters from createDecoder()
      */
     @MainDex
@@ -72,33 +38,35 @@ class MediaCodecUtil {
     }
 
     /**
-     * @return a list of supported android codec information.
+     * Class to abstract platform version API differences for interacting with
+     * the MediaCodecList.
      */
-    @SuppressWarnings("deprecation")
-    @CalledByNative
-    private static CodecInfo[] getCodecsInfo() {
-        // Return the first (highest-priority) codec for each MIME type.
-        Map<String, CodecInfo> encoderInfoMap = new HashMap<String, CodecInfo>();
-        Map<String, CodecInfo> decoderInfoMap = new HashMap<String, CodecInfo>();
-        int count = MediaCodecList.getCodecCount();
-        for (int i = 0; i < count; ++i) {
-            MediaCodecInfo info = MediaCodecList.getCodecInfoAt(i);
-            int direction = info.isEncoder() ? MEDIA_CODEC_ENCODER : MEDIA_CODEC_DECODER;
-            String codecString = info.getName();
-            String[] supportedTypes = info.getSupportedTypes();
-            for (int j = 0; j < supportedTypes.length; ++j) {
-                Map<String, CodecInfo> map = info.isEncoder() ? encoderInfoMap : decoderInfoMap;
-                if (!map.containsKey(supportedTypes[j])) {
-                    map.put(supportedTypes[j],
-                            new CodecInfo(supportedTypes[j], codecString, direction));
-                }
+    @MainDex
+    private static class MediaCodecListHelper {
+        @TargetApi(Build.VERSION_CODES.LOLLIPOP)

[qinmin, 2016/03/17 00:03:38]

This changes the supported android versions, we still need to support JB
devices.

[DaleCurtis, 2016/03/17 00:06:34]

Sorry I'm a bit of a noob with these macros. What's the expected annotation for
"targets jellybean, but we have a runtime check to use lollipop" code :)

[qinmin, 2016/03/17 00:13:11]

The annotation is ok, but the issue is that now mCodecList is an empty list for
JB_MR2, but previously this is not empty. You mentioned vp8 in your comments to
this CL, but what about h.264?

[DaleCurtis, 2016/03/17 00:18:42]

Sorry I don't understand? mCodecList is only used on lollipop. On lower versions
we'll call the static MediaCodecList.getCodecCount() .getCodecInfoAt() methods.
See the conditionals below on if (hasNewMediaCodecList()).

[Tima Vaisburd, 2016/03/17 00:20:37]

I thought that if hasNewMediaCodecList() returns false the |mCodecList| is not
used at all and the iteration goes with the static methods of MediaCodecList
class?

[DaleCurtis, 2016/03/17 02:12:55]

Correct, that's what should be happening unless I've missed something here.

[qinmin, 2016/03/17 04:11:28]

ah... I messed MediaCodecList with mCodecList in the calls below. Forget what
I've said above

+        public MediaCodecListHelper() {
+            if (hasNewMediaCodecList()) {
+                mCodecList = new MediaCodecList(MediaCodecList.ALL_CODECS).getCodecInfos();
             }
         }
-        ArrayList<CodecInfo> codecInfos =
-                new ArrayList<CodecInfo>(decoderInfoMap.size() + encoderInfoMap.size());
-        codecInfos.addAll(encoderInfoMap.values());
-        codecInfos.addAll(decoderInfoMap.values());
-        return codecInfos.toArray(new CodecInfo[codecInfos.size()]);
+
+        @SuppressWarnings("deprecation")
+        public int getCodecCount() {
+            if (hasNewMediaCodecList()) return mCodecList.length;
+            return MediaCodecList.getCodecCount();
+        }
+
+        @SuppressWarnings("deprecation")
+        public MediaCodecInfo getCodecInfoAt(int index) {
+            if (hasNewMediaCodecList()) return mCodecList[index];
+            return MediaCodecList.getCodecInfoAt(index);
+        }
+
+        private boolean hasNewMediaCodecList() {
+            return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
+        }
+
+        private MediaCodecInfo[] mCodecList;
     }
 
     /**
@@ -107,27 +75,24 @@ class MediaCodecUtil {
      * @param direction Whether this is encoder or decoder.
      * @return name of the codec.
      */
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
-    @SuppressWarnings("deprecation")
     @CalledByNative
     private static String getDefaultCodecName(String mime, int direction) {
-        String codecName = "";
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-            try {
-                MediaCodec mediaCodec = null;
-                if (direction == MEDIA_CODEC_ENCODER) {
-                    mediaCodec = MediaCodec.createEncoderByType(mime);
-                } else {
-                    mediaCodec = MediaCodec.createDecoderByType(mime);
-                }
-                codecName = mediaCodec.getName();
-                mediaCodec.release();
-            } catch (Exception e) {
-                Log.w(TAG, "getDefaultCodecName: Failed to create MediaCodec: %s, direction: %d",
-                        mime, direction, e);
+        MediaCodecListHelper codecListHelper = new MediaCodecListHelper();
+        int codec_count = codecListHelper.getCodecCount();

[qinmin, 2016/03/17 04:11:29]

java uses camelcase for variable name

[DaleCurtis, 2016/03/17 20:32:25]

Done.

+        for (int i = 0; i < codec_count; ++i) {
+            MediaCodecInfo info = codecListHelper.getCodecInfoAt(i);
+
+            int codec_direction = info.isEncoder() ? MEDIA_CODEC_ENCODER : MEDIA_CODEC_DECODER;

[qinmin, 2016/03/17 04:11:28]

ditto

[DaleCurtis, 2016/03/17 20:32:25]

Done.

+            if (codec_direction != direction) continue;
+
+            String[] supportedTypes = info.getSupportedTypes();
+            for (int j = 0; j < supportedTypes.length; ++j) {
+                if (supportedTypes[j].equalsIgnoreCase(mime)) return info.getName();
             }
         }
-        return codecName;
+
+        Log.e(TAG, "Decoder for type %s is not supported on this device", mime);
+        return "";
     }
 
     /**
@@ -135,63 +100,18 @@ class MediaCodecUtil {
      * @param mime MIME type of the media format.
      * @return a list of encoder supported color formats.
      */
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    @SuppressWarnings("deprecation")
     @CalledByNative
     private static int[] getEncoderColorFormatsForMime(String mime) {
-        MediaCodecInfo[] codecs = null;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            MediaCodecList mediaCodecList = new MediaCodecList(MediaCodecList.ALL_CODECS);
-            codecs = mediaCodecList.getCodecInfos();
-        } else {
-            int count = MediaCodecList.getCodecCount();
-            if (count <= 0) {
-                return null;
-            }
-            codecs = new MediaCodecInfo[count];
-            for (int i = 0; i < count; ++i) {
-                MediaCodecInfo info = MediaCodecList.getCodecInfoAt(i);
-                codecs[i] = info;
-            }
-        }
-
-        for (int i = 0; i < codecs.length; i++) {
-            if (!codecs[i].isEncoder()) {
-                continue;
-            }
-
-            String[] supportedTypes = codecs[i].getSupportedTypes();
-            for (int j = 0; j < supportedTypes.length; ++j) {
-                if (!supportedTypes[j].equalsIgnoreCase(mime)) {
-                    continue;
-                }
-
-                MediaCodecInfo.CodecCapabilities capabilities =
-                        codecs[i].getCapabilitiesForType(mime);
-                return capabilities.colorFormats;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get decoder name for the input MIME type.
-     * @param mime MIME type of the media.
-     * @return name of the decoder.
-     */
-    @SuppressWarnings("deprecation")
-    static String getDecoderNameForMime(String mime) {
-        int count = MediaCodecList.getCodecCount();
-        for (int i = 0; i < count; ++i) {
-            MediaCodecInfo info = MediaCodecList.getCodecInfoAt(i);
-            if (info.isEncoder()) {
-                continue;
-            }
+        MediaCodecListHelper codecListHelper = new MediaCodecListHelper();
+        int codec_count = codecListHelper.getCodecCount();

[qinmin, 2016/03/17 04:11:29]

ditto

[DaleCurtis, 2016/03/17 20:32:25]

Done.

+        for (int i = 0; i < codec_count; i++) {
+            MediaCodecInfo info = codecListHelper.getCodecInfoAt(i);
+            if (!info.isEncoder()) continue;
 
             String[] supportedTypes = info.getSupportedTypes();
             for (int j = 0; j < supportedTypes.length; ++j) {
                 if (supportedTypes[j].equalsIgnoreCase(mime)) {
-                    return info.getName();
+                    return info.getCapabilitiesForType(supportedTypes[j]).colorFormats;
                 }
             }
         }
@@ -236,15 +156,15 @@ class MediaCodecUtil {
 
         // Do not create codec for blacklisted devices.
         if (!isDecoderSupportedForDevice(mime)) {
-            Log.e(TAG, "Decoder for type " + mime + " is not supported on this device");
+            Log.e(TAG, "Decoder for type %s is not supported on this device", mime);
             return result;
         }
 
         try {
             // |isSecure| only applies to video decoders.
             if (mime.startsWith("video") && isSecure) {
-                String decoderName = getDecoderNameForMime(mime);
-                if (decoderName == null) return null;
+                String decoderName = getDefaultCodecName(mime, MEDIA_CODEC_DECODER);
+                if (decoderName.equals("")) return null;
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
                     // To work around an issue that we cannot get the codec info from the secure
                     // decoder, create an insecure decoder first so that we can query its codec