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

am 7b5bcc68: am 89315051: am 00352e1e: Merge "MediaCodecInfo: allow getting info for secure codec" into lmp-dev

Browse Source 
* commit '7b5bcc68fd16be733a557931d78829c3ab9ce7ea':
  MediaCodecInfo: allow getting info for secure codec
This commit is contained in:
Lajos Molnar
2014-09-05 23:32:31 +00:00
committed by Android Git Automerger
parent e51ca9c528 18933561f3
commit 9092ed6c65
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1622,8 +1622,7 @@ final public class MediaCodec {
* @throws IllegalStateException if in the Uninitialized state.
*/
public MediaCodecInfo getCodecInfo() {
return MediaCodecList.getCodecInfoAt(
MediaCodecList.findCodecByName(getName()));
return MediaCodecList.getInfoFor(getName());
}
private native final ByteBuffer[] getBuffers(boolean input);

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

@@ -322,6 +322,9 @@ public final class MediaCodecInfo {
// check feature support
for (Feature feat: getValidFeatures()) {
Integer yesNo = (Integer)map.get(MediaFormat.KEY_FEATURE_ + feat.mName);
if (yesNo == null) {
continue;
}
if ((yesNo == 1 && !isFeatureSupported(feat.mName)) ||
(yesNo == 0 && isFeatureRequired(feat.mName))) {
return false;
@@ -471,13 +474,12 @@ public final class MediaCodecInfo {
Integer yesNo = (Integer)map.get(key);
if (yesNo == null) {
continue;
} else if (yesNo > 0) {
mFlagsRequired |= feat.mValue;
mDefaultFormat.setInteger(key, 1);
} else {
mFlagsSupported |= feat.mValue;
mDefaultFormat.setInteger(key, 1);
}
if (yesNo > 0) {
mFlagsRequired |= feat.mValue;
}
mFlagsSupported |= feat.mValue;
mDefaultFormat.setInteger(key, 1);
// TODO restrict features by mFlagsVerified once all codecs reliably verify them
}
}

5
media/java/android/media/MediaCodecList.java
View File

@@ -116,6 +116,11 @@ final public class MediaCodecList {
/* package private */ static native final int findCodecByName(String codec);
/** @hide */
public static MediaCodecInfo getInfoFor(String codec) {
return sAllCodecInfos[findCodecByName(codec)];
}
private static native final void native_init();
/**