diff options
| author | Lajos Molnar <lajos@google.com> | 2014-11-24 18:05:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-24 18:05:46 +0000 |
| commit | 0b10f9c0ab9a6c4003a2a300c2a38f7ca2144fdb (patch) | |
| tree | df53b9c696ba663662b281b0800cce6fed965f59 | |
| parent | bd9567e1569a6fc5222427f18cc653c29c0beb89 (diff) | |
| parent | 63845f1b5853aa3a84df4a161f6c8e96b98fba8a (diff) | |
| download | frameworks_base-0b10f9c0ab9a6c4003a2a300c2a38f7ca2144fdb.zip frameworks_base-0b10f9c0ab9a6c4003a2a300c2a38f7ca2144fdb.tar.gz frameworks_base-0b10f9c0ab9a6c4003a2a300c2a38f7ca2144fdb.tar.bz2 | |
am 63845f1b: am c398f175: Merge "media: fix isSupportedFormat for integer frame rate" into lmp-mr1-dev
* commit '63845f1b5853aa3a84df4a161f6c8e96b98fba8a':
media: fix isSupportedFormat for integer frame rate
| -rw-r--r-- | media/java/android/media/MediaCodecInfo.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index 01f8193..1029fcc 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -973,7 +973,7 @@ public final class MediaCodecInfo { } private boolean supports( - Integer width, Integer height, Double rate) { + Integer width, Integer height, Number rate) { boolean ok = true; if (ok && width != null) { @@ -985,7 +985,7 @@ public final class MediaCodecInfo { && (height % mHeightAlignment == 0); } if (ok && rate != null) { - ok = mFrameRateRange.contains(Utils.intRangeFor(rate)); + ok = mFrameRateRange.contains(Utils.intRangeFor(rate.doubleValue())); } if (ok && height != null && width != null) { ok = Math.min(height, width) <= mSmallerDimensionUpperLimit; @@ -998,7 +998,7 @@ public final class MediaCodecInfo { new Rational(widthInBlocks, heightInBlocks)) && mAspectRatioRange.contains(new Rational(width, height)); if (ok && rate != null) { - double blocksPerSec = blockCount * rate; + double blocksPerSec = blockCount * rate.doubleValue(); ok = mBlocksPerSecondRange.contains( Utils.longRangeFor(blocksPerSec)); } @@ -1013,7 +1013,7 @@ public final class MediaCodecInfo { final Map<String, Object> map = format.getMap(); Integer width = (Integer)map.get(MediaFormat.KEY_WIDTH); Integer height = (Integer)map.get(MediaFormat.KEY_HEIGHT); - Double rate = (Double)map.get(MediaFormat.KEY_FRAME_RATE); + Number rate = (Number)map.get(MediaFormat.KEY_FRAME_RATE); // we ignore color-format for now as it is not reliably reported by codec |