diff options
| author | Lajos Molnar <lajos@google.com> | 2013-09-30 13:18:55 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2013-09-30 13:58:35 -0700 |
| commit | c16c203047ca0f0d76573ead2c42764a78baf521 (patch) | |
| tree | 9aab816caeeb3cc953594345310f3860e830f98d /media/libstagefright/OMXCodec.cpp | |
| parent | 3d97e23fcd78f752443cb6c30a1ee39f49f1f987 (diff) | |
| download | frameworks_av-c16c203047ca0f0d76573ead2c42764a78baf521.zip frameworks_av-c16c203047ca0f0d76573ead2c42764a78baf521.tar.gz frameworks_av-c16c203047ca0f0d76573ead2c42764a78baf521.tar.bz2 | |
MediaCodecInfo: report supported color formats for non-native-window mode
Revert the change in behavior when checking for adaptive playback was
introduced.
Change-Id: I59dc2450a4299b912015f2e4c9ec018a19a20b84
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 10921537
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -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; |