diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-03-11 08:44:35 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-11 08:44:35 -0800 |
| commit | 203616faff0be6c2306f02d82f3ce305746beb49 (patch) | |
| tree | c54ef9ad6a5166f7a8b3c42a134370b874f12c07 /include | |
| parent | 0592e3cc541aa0c6477e00ddb052558a5a3e17c1 (diff) | |
| parent | 2eb62955eb84b97695e8a7e56e14310cbb86412b (diff) | |
| download | frameworks_av-203616faff0be6c2306f02d82f3ce305746beb49.zip frameworks_av-203616faff0be6c2306f02d82f3ce305746beb49.tar.gz frameworks_av-203616faff0be6c2306f02d82f3ce305746beb49.tar.bz2 | |
am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1
* commit '92f2f3ff2ea5c5b474722f2055cfee4916010e26':
Bug 3012968 DRM output control
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index f7d837a..93b5d24 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -50,6 +50,9 @@ struct OMXCodec : public MediaSource, // Only submit one input buffer at one time. kOnlySubmitOneInputBufferAtOneTime = 64, + + // Enable GRALLOC_USAGE_PROTECTED for output buffers from native window + kEnableGrallocUsageProtected = 128, }; static sp<MediaSource> Create( const sp<IOMX> &omx, @@ -197,6 +200,7 @@ private: bool mIsMetaDataStoredInVideoBuffers; bool mOnlySubmitOneBufferAtOneTime; + bool mEnableGrallocUsageProtected; OMXCodec(const sp<IOMX> &omx, IOMX::node_id node, uint32_t quirks, bool isEncoder, const char *mime, const char *componentName, |