diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-06 13:31:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-06 13:31:54 +0000 |
| commit | 5549bb5b651db8465ac846b3490eee9378253a76 (patch) | |
| tree | 2757856f19bcb7ad453411ed3c8ab4ac3ce8cf2e /media/libstagefright/MediaCodec.cpp | |
| parent | 9fdb3bd42af0876a9b76bae42d7aba2287b53af4 (diff) | |
| parent | e576086224f6e630159eaeec59ab5146c8533dc7 (diff) | |
| download | frameworks_av-5549bb5b651db8465ac846b3490eee9378253a76.zip frameworks_av-5549bb5b651db8465ac846b3490eee9378253a76.tar.gz frameworks_av-5549bb5b651db8465ac846b3490eee9378253a76.tar.bz2 | |
am e5760862: am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for native flex-YUV support" into lmp-mr1-dev
* commit 'e576086224f6e630159eaeec59ab5146c8533dc7':
stagefright: add fallback for native flex-YUV support
Diffstat (limited to 'media/libstagefright/MediaCodec.cpp')
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index c838427..50e6bd0 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -879,9 +879,9 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { CHECK(msg->findString("componentName", &mComponentName)); if (mComponentName.startsWith("OMX.google.")) { - mFlags |= kFlagIsSoftwareCodec; + mFlags |= kFlagUsesSoftwareRenderer; } else { - mFlags &= ~kFlagIsSoftwareCodec; + mFlags &= ~kFlagUsesSoftwareRenderer; } if (mComponentName.endsWith(".secure")) { @@ -904,6 +904,11 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { CHECK(msg->findMessage("input-format", &mInputFormat)); CHECK(msg->findMessage("output-format", &mOutputFormat)); + int32_t usingSwRenderer; + if (mOutputFormat->findInt32("using-sw-renderer", &usingSwRenderer) + && usingSwRenderer) { + mFlags |= kFlagUsesSoftwareRenderer; + } setState(CONFIGURED); (new AMessage)->postReply(mReplyID); break; @@ -999,7 +1004,7 @@ void MediaCodec::onMessageReceived(const sp<AMessage> &msg) { if (mSoftRenderer == NULL && mNativeWindow != NULL && - (mFlags & kFlagIsSoftwareCodec)) { + (mFlags & kFlagUsesSoftwareRenderer)) { AString mime; CHECK(msg->findString("mime", &mime)); |