Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 826bf9b6: Merge "media: parse max-concurrent-instances." into mnc-dev

Browse Source 
* commit '826bf9b63f69f4e19011f7f72b022b50b89fca49':
  media: parse max-concurrent-instances.
This commit is contained in:
Ronghua Wu
2015-06-25 22:27:32 +00:00
committed by Android Git Automerger
parent 4d6b7356d8 826bf9b63f
commit af13d3b009
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/java/android/media/MediaCodecInfo.java
View File

@@ -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);