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

am e0b71b4e: Merge "media: clean up the usage of max-supported-instances." into mnc-dev

Browse Source 
* commit 'e0b71b4ef7af0a8e49341ba65eaf61981845e713':
  media: clean up the usage of max-supported-instances.
This commit is contained in:
Ronghua Wu
2015-07-01 16:19:52 +00:00
committed by Android Git Automerger
parent 10f87f47c0 e0b71b4ef7
commit d2868b8dfd
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -701,13 +701,10 @@ public final class MediaCodecInfo {
final Map<String, Object> global = MediaCodecList.getGlobalSettings();
mMaxSupportedInstances = Utils.parseIntSafely(
global.get("max-supported-instances"), DEFAULT_MAX_SUPPORTED_INSTANCES);
global.get("max-concurrent-instances"), DEFAULT_MAX_SUPPORTED_INSTANCES);
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);
map.get("max-concurrent-instances"), mMaxSupportedInstances);
mMaxSupportedInstances =
Range.create(1, MAX_SUPPORTED_INSTANCES_LIMIT).clamp(maxInstances);