summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2013-11-11 20:50:31 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-11 20:50:31 -0800
commit41e7ae8f7f1ec93f8473142d1f3bfe07b22c5c51 (patch)
tree5617abecb89dfaddc547f4c73d8363d9d7f92ce6 /include
parent0f3984ed3271484e223826e8a2e5f70c4111e08f (diff)
parentcc5aeced30609326c7495eca1286163af3933fe1 (diff)
downloadframeworks_av-41e7ae8f7f1ec93f8473142d1f3bfe07b22c5c51.zip
frameworks_av-41e7ae8f7f1ec93f8473142d1f3bfe07b22c5c51.tar.gz
frameworks_av-41e7ae8f7f1ec93f8473142d1f3bfe07b22c5c51.tar.bz2
am cc5aeced: am e100b813: Merge "StageFrightRecorder: do not use meta-data mode for software encoders" into klp-dev
* commit 'cc5aeced30609326c7495eca1286163af3933fe1': StageFrightRecorder: do not use meta-data mode for software encoders
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/CameraSourceTimeLapse.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/media/stagefright/CameraSourceTimeLapse.h b/include/media/stagefright/CameraSourceTimeLapse.h
index 6b7a63c..34213be 100644
--- a/include/media/stagefright/CameraSourceTimeLapse.h
+++ b/include/media/stagefright/CameraSourceTimeLapse.h
@@ -41,7 +41,8 @@ public:
Size videoSize,
int32_t videoFrameRate,
const sp<IGraphicBufferProducer>& surface,
- int64_t timeBetweenTimeLapseFrameCaptureUs);
+ int64_t timeBetweenTimeLapseFrameCaptureUs,
+ bool storeMetaDataInVideoBuffers = true);
virtual ~CameraSourceTimeLapse();
@@ -116,7 +117,8 @@ private:
Size videoSize,
int32_t videoFrameRate,
const sp<IGraphicBufferProducer>& surface,
- int64_t timeBetweenTimeLapseFrameCaptureUs);
+ int64_t timeBetweenTimeLapseFrameCaptureUs,
+ bool storeMetaDataInVideoBuffers = true);
// Wrapper over CameraSource::signalBufferReturned() to implement quick stop.
// It only handles the case when mLastReadBufferCopy is signalled. Otherwise