diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-04 20:54:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-04 20:54:00 +0000 |
| commit | 7b66f713fc53ee81453763788c02f3c741d19520 (patch) | |
| tree | 3d0d35ea132cae45a53600cdd32a4807bd7675a8 /include | |
| parent | 5d46bd54a279f24d0476b83947ce29e786b5c72c (diff) | |
| parent | 57f75272fcd16b205ed60cdd0b33ffc19991fd10 (diff) | |
| download | frameworks_av-7b66f713fc53ee81453763788c02f3c741d19520.zip frameworks_av-7b66f713fc53ee81453763788c02f3c741d19520.tar.gz frameworks_av-7b66f713fc53ee81453763788c02f3c741d19520.tar.bz2 | |
am 57f75272: Merge "stagefright: add support for native flex-YUV formats" into lmp-mr1-dev
* commit '57f75272fcd16b205ed60cdd0b33ffc19991fd10':
stagefright: add support for native flex-YUV formats
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 8509d55..595ace8 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -78,7 +78,7 @@ struct ACodec : public AHierarchicalStateMachine, public CodecBase { static bool isFlexibleColorFormat( const sp<IOMX> &omx, IOMX::node_id node, - uint32_t colorFormat, OMX_U32 *flexibleEquivalent); + uint32_t colorFormat, bool usingNativeBuffers, OMX_U32 *flexibleEquivalent); // Returns 0 if configuration is not supported. NOTE: this is treated by // some OMX components as auto level, and by others as invalid level. @@ -251,12 +251,13 @@ private: status_t setVideoPortFormatType( OMX_U32 portIndex, OMX_VIDEO_CODINGTYPE compressionFormat, - OMX_COLOR_FORMATTYPE colorFormat); + OMX_COLOR_FORMATTYPE colorFormat, + bool usingNativeBuffers = false); - status_t setSupportedOutputFormat(); + status_t setSupportedOutputFormat(bool getLegacyFlexibleFormat); status_t setupVideoDecoder( - const char *mime, const sp<AMessage> &msg); + const char *mime, const sp<AMessage> &msg, bool usingNativeBuffers); status_t setupVideoEncoder( const char *mime, const sp<AMessage> &msg); |