Merge "Avoid unnecessary object allocation in CryptoInfo.set"

2017-03-29 20:09:20 +00:00
parent 4906aff639 5f5ec7b8d5
commit c0f79de1cf
1 changed files with 3 additions and 1 deletions
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -2440,6 +2440,8 @@ final public class MediaCodec {
            }
        };

+        private final Pattern zeroPattern = new Pattern(0, 0);
+
        /**
         * The pattern applicable to the protected data in each subsample.
         */
@@ -2462,7 +2464,7 @@ final public class MediaCodec {
            key = newKey;
            iv = newIV;
            mode = newMode;
-            pattern = new Pattern(0, 0);
+            pattern = zeroPattern;
        }

        /**