summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-06-10 20:53:23 -0700
committerLajos Molnar <lajos@google.com>2015-06-10 20:54:53 -0700
commit1c436bd911373810b2ac14088dd16762daf94191 (patch)
tree3a86574c4172e08225e7bc7b92d51c1c41de8d93 /media
parent9d543ebfea86ee94a994eebc752dc7d007f8cb90 (diff)
downloadframeworks_base-1c436bd911373810b2ac14088dd16762daf94191.zip
frameworks_base-1c436bd911373810b2ac14088dd16762daf94191.tar.gz
frameworks_base-1c436bd911373810b2ac14088dd16762daf94191.tar.bz2
media: allow feature-can-swap-width-height to be optional.
We have enabled this only optionally in media_codecs.xml Bug: 21568607 Change-Id: I11a12883afc051ba8c479255acc59388fb9a6722
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaCodecInfo.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java
index 89d419a..6c26220 100644
--- a/media/java/android/media/MediaCodecInfo.java
+++ b/media/java/android/media/MediaCodecInfo.java
@@ -1382,7 +1382,7 @@ public final class MediaCodecInfo {
// upper limit.
// for now we are keeping the profile specific "width/height
// in macroblocks" limits.
- if (Integer.valueOf(1).equals(map.get("feature-can-swap-width-height"))) {
+ if (map.containsKey("feature-can-swap-width-height")) {
if (widths != null) {
mSmallerDimensionUpperLimit =
Math.min(widths.getUpper(), heights.getUpper());