diff options
| author | Lajos Molnar <lajos@google.com> | 2015-06-29 22:42:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-29 22:42:47 +0000 |
| commit | ad949cd4ca52d19ea5e7a5c5dce84d1410fe5244 (patch) | |
| tree | d2ae58c71efba6d2a77bc54658a06b68a85b74bd /include/media | |
| parent | 29b7cec9a248828d2371bc8758d819308d0e84a4 (diff) | |
| parent | c93a13669ce1b5a9e6527b4c86c9d8f5e92be828 (diff) | |
| download | frameworks_av-ad949cd4ca52d19ea5e7a5c5dce84d1410fe5244.zip frameworks_av-ad949cd4ca52d19ea5e7a5c5dce84d1410fe5244.tar.gz frameworks_av-ad949cd4ca52d19ea5e7a5c5dce84d1410fe5244.tar.bz2 | |
Merge "stagefright: ask for flex-YUV camera buffers for software encoders" into mnc-dev
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/MediaCodecSource.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaCodecSource.h b/include/media/stagefright/MediaCodecSource.h index a991b02..71f58a9 100644 --- a/include/media/stagefright/MediaCodecSource.h +++ b/include/media/stagefright/MediaCodecSource.h @@ -108,6 +108,9 @@ private: bool mStarted; bool mStopping; bool mDoMoreWorkPending; + bool mSetEncoderFormat; + int mEncoderFormat; + int mEncoderDataSpace; sp<AMessage> mEncoderActivityNotify; sp<IGraphicBufferProducer> mGraphicBufferProducer; sp<IGraphicBufferConsumer> mGraphicBufferConsumer; diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index ca80123..726b197 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -70,7 +70,9 @@ enum { kKeyDriftTime = 'dftT', // int64_t (usecs) kKeyAnchorTime = 'ancT', // int64_t (usecs) kKeyDuration = 'dura', // int64_t (usecs) - kKeyColorFormat = 'colf', + kKeyPixelFormat = 'pixf', // int32_t + kKeyColorFormat = 'colf', // int32_t + kKeyColorSpace = 'cols', // int32_t kKeyPlatformPrivate = 'priv', // pointer kKeyDecoderComponent = 'decC', // cstring kKeyBufferID = 'bfID', |