diff options
| author | Lajos Molnar <lajos@google.com> | 2013-10-01 16:36:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-01 16:36:32 +0000 |
| commit | 5fd39f777d54368a93fc9d8a6a24da0239d41fcf (patch) | |
| tree | 4b3030c4a0e41daede98e436eb58834b562a84ef /media | |
| parent | 8b905e19548248904ab0fd0b63c9adcab2331a1a (diff) | |
| parent | c16c203047ca0f0d76573ead2c42764a78baf521 (diff) | |
| download | frameworks_av-5fd39f777d54368a93fc9d8a6a24da0239d41fcf.zip frameworks_av-5fd39f777d54368a93fc9d8a6a24da0239d41fcf.tar.gz frameworks_av-5fd39f777d54368a93fc9d8a6a24da0239d41fcf.tar.bz2 | |
Merge "MediaCodecInfo: report supported color formats for non-native-window mode" into klp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 7b37365..2c95ab4 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -4585,12 +4585,6 @@ status_t QueryCodec( caps->mFlags = 0; caps->mComponentName = componentName; - if (!isEncoder && !strncmp(mime, "video/", 6) && - omx->storeMetaDataInBuffers( - node, 1 /* port index */, OMX_TRUE) == OK) { - caps->mFlags |= CodecCapabilities::kFlagSupportsAdaptivePlayback; - } - OMX_VIDEO_PARAM_PROFILELEVELTYPE param; InitOMXParams(¶m); @@ -4626,6 +4620,12 @@ status_t QueryCodec( caps->mColorFormats.push(portFormat.eColorFormat); } + if (!isEncoder && !strncmp(mime, "video/", 6) && + omx->storeMetaDataInBuffers( + node, 1 /* port index */, OMX_TRUE) == OK) { + caps->mFlags |= CodecCapabilities::kFlagSupportsAdaptivePlayback; + } + CHECK_EQ(omx->freeNode(node), (status_t)OK); return OK; |