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

Merge "media: handle AVC constrained profiles" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-15 05:55:08 +00:00
committed by Android (Google) Code Review
parent 6e6af8af38 0aeb1875e4
commit 794a8f9dc7
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2095,6 +2095,7 @@ public final class MediaCodecInfo {
errors |= ERROR_UNRECOGNIZED;
}
switch (profileLevel.profile) {
case CodecProfileLevel.AVCProfileConstrainedHigh:
case CodecProfileLevel.AVCProfileHigh:
BR *= 1250; break;
case CodecProfileLevel.AVCProfileHigh10:
@@ -2107,6 +2108,7 @@ public final class MediaCodecInfo {
errors |= ERROR_UNSUPPORTED;
supported = false;
// fall through - treat as base profile
case CodecProfileLevel.AVCProfileConstrainedBaseline:
case CodecProfileLevel.AVCProfileBaseline:
case CodecProfileLevel.AVCProfileMain:
BR *= 1000; break;