diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-06-25 22:14:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-25 22:15:06 +0000 |
| commit | 826bf9b63f69f4e19011f7f72b022b50b89fca49 (patch) | |
| tree | 2ef2009fdcb4bdd9d6645d84dba2a9e5d0747411 | |
| parent | f97497db5a7cfb8514836af39efef56488edf3ac (diff) | |
| parent | cf6a4ba5a4aed486b61b87597aa6572d41213ba2 (diff) | |
| download | frameworks_base-826bf9b63f69f4e19011f7f72b022b50b89fca49.zip frameworks_base-826bf9b63f69f4e19011f7f72b022b50b89fca49.tar.gz frameworks_base-826bf9b63f69f4e19011f7f72b022b50b89fca49.tar.bz2 | |
Merge "media: parse max-concurrent-instances." into mnc-dev
| -rw-r--r-- | media/java/android/media/MediaCodecInfo.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index 6c26220..28d0713 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -705,6 +705,9 @@ public final class MediaCodecInfo { int maxInstances = Utils.parseIntSafely( map.get("max-supported-instances"), mMaxSupportedInstances); + // TODO: replace all max-supported-instances with max-concurrent-instances. + maxInstances = Utils.parseIntSafely( + map.get("max-concurrent-instances"), maxInstances); mMaxSupportedInstances = Range.create(1, MAX_SUPPORTED_INSTANCES_LIMIT).clamp(maxInstances); |