drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3ed95fe2: Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev

Browse Source 
* commit '3ed95fe2589c01e9255f4d75636fb8b0c83a01d5':
  media: add support for 160-byte image info in MediaCodec
This commit is contained in:
Lajos Molnar
2014-11-25 22:15:11 +00:00
committed by Android Git Automerger
parent ba94fd5e6c 3ed95fe258
commit c60a5d781a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/MediaCodec.java
View File

@ -1784,11 +1784,11 @@ final public class MediaCodec {
mYOffset = yOffset; mYOffset = yOffset;
mInfo = info; mInfo = info;
// read media-info. the size of media info can be 80 or 156 depending on // read media-info. the size of media info can be 80 or 156/160 depending on
// whether it was created on a 32- or 64-bit process. See MediaImage // whether it was created on a 32- or 64-bit process. See MediaImage
if (info.remaining() == 80 || info.remaining() == 156) { if (info.remaining() == 80 || info.remaining() == 156 || info.remaining() == 160) {
boolean sizeIsLong = info.remaining() == 156; boolean sizeIsLong = info.remaining() != 80;
int type = info.getInt(); int type = readInt(info, info.remaining() == 160);
if (type != TYPE_YUV) { if (type != TYPE_YUV) {
throw new UnsupportedOperationException("unsupported type: " + type); throw new UnsupportedOperationException("unsupported type: " + type);
} }