MediaCodecBridge: don't try to create .secure codecs pre-JB-MR2.

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

 // 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.
 
 package org.chromium.media;
 
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaCodecList;
 import android.media.MediaCrypto;
 import android.media.MediaFormat;
+import android.os.Build;
+import android.util.Log;
 import android.view.Surface;
-import android.util.Log;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 
@@ skipping 117 matching lines @@
     @CalledByNative
     private static CodecInfo[] getCodecsInfo() {
         Map<String, CodecInfo> CodecInfoMap = new HashMap<String, CodecInfo>();
         int count = MediaCodecList.getCodecCount();
         for (int i = 0; i < count; ++i) {
             MediaCodecInfo info = MediaCodecList.getCodecInfoAt(i);
             if (info.isEncoder()) {
                 continue;
             }
 
+            boolean secureDecoderSupported = false;
+            String codecString = info.getName();
+            // ".secure" codecs sometimes crash instead of throwing on pre-JBMR2
+            // platforms, but this code isn't run on them anyway (MediaDrm
+            // unavailable) so we side-step the issue.

[wjia(left Chromium), 2013/11/06 02:23:27]

Could you add the bug link here? Just for others' information once they wonder
why this workaround exists.

+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+                String secureCodecName = codecString + ".secure";
+                try {
+                    MediaCodec secureCodec = MediaCodec.createByCodecName(secureCodecName);
+                    if (secureCodec != null) {
+                        secureDecoderSupported = true;
+                        secureCodec.release();
+                    }
+                } catch (Exception e) {
+                    Log.e(TAG, "Failed to create " + secureCodecName);
+                }
+            }
+
             String[] supportedTypes = info.getSupportedTypes();
-            String codecString = info.getName();
-            String secureCodecName = codecString + ".secure";
-            boolean secureDecoderSupported = false;
-            try {
-                MediaCodec secureCodec = MediaCodec.createByCodecName(secureCodecName);
-                secureDecoderSupported = true;
-                secureCodec.release();
-            } catch (Exception e) {
-                Log.e(TAG, "Failed to create " + secureCodecName);
-            }
             for (int j = 0; j < supportedTypes.length; ++j) {
                 if (!CodecInfoMap.containsKey(supportedTypes[j]) || secureDecoderSupported) {
                     CodecInfoMap.put(supportedTypes[j], new CodecInfo(
                         supportedTypes[j], codecString, secureDecoderSupported));
                 }
             }
         }
         return CodecInfoMap.values().toArray(
             new CodecInfo[CodecInfoMap.size()]);
     }
@@ skipping 305 matching lines @@
     }
 
     private void resetLastPresentationTimeIfNeeded(long presentationTimeUs) {
         if (mFlushed) {
             mLastPresentationTimeUs =
                     Math.max(presentationTimeUs - MAX_PRESENTATION_TIMESTAMP_SHIFT_US, 0);
             mFlushed = false;
         }
     }
 }