summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-06-25 17:04:09 -0700
committerLajos Molnar <lajos@google.com>2015-06-26 17:09:42 -0700
commitc93a13669ce1b5a9e6527b4c86c9d8f5e92be828 (patch)
tree5fb41cc9ed232bdf147470e50d6411bfe435f2d4 /include/media
parent064b2bf712788d30928b9a8bafecd0f3308d7aa4 (diff)
downloadframeworks_av-c93a13669ce1b5a9e6527b4c86c9d8f5e92be828.zip
frameworks_av-c93a13669ce1b5a9e6527b4c86c9d8f5e92be828.tar.gz
frameworks_av-c93a13669ce1b5a9e6527b4c86c9d8f5e92be828.tar.bz2
stagefright: ask for flex-YUV camera buffers for software encoders
Bug: 13222807 Change-Id: I854b73a63cf9239311729598241725d84e8513aa
Diffstat (limited to 'include/media')
-rw-r--r--include/media/stagefright/MediaCodecSource.h3
-rw-r--r--include/media/stagefright/MetaData.h4
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',