summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-10-01 17:23:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-01 17:23:13 -0700
commit136c663de16032c74754d6a935947934ba52e3a3 (patch)
tree09c6f186aaacb44f9748bddf9453f521f001db6f /include
parent7d1a65bab4a4d3bbffd716b692ef6ce37a36c5ca (diff)
parent8b3f009b9cb78663b6ba9ba0bb25379af0cfc866 (diff)
downloadframeworks_av-136c663de16032c74754d6a935947934ba52e3a3.zip
frameworks_av-136c663de16032c74754d6a935947934ba52e3a3.tar.gz
frameworks_av-136c663de16032c74754d6a935947934ba52e3a3.tar.bz2
am 5db05850: am 1a0d1670: Merge "Optionally have SurfaceMediaSource return absolute timestamps" into jb-mr1-dev
* commit '5db05850d02939e63800ae5b1fcf53a767f2e895': Optionally have SurfaceMediaSource return absolute timestamps
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/SurfaceMediaSource.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/media/stagefright/SurfaceMediaSource.h b/include/media/stagefright/SurfaceMediaSource.h
index 82e5965..e56527d 100644
--- a/include/media/stagefright/SurfaceMediaSource.h
+++ b/include/media/stagefright/SurfaceMediaSource.h
@@ -116,6 +116,9 @@ public:
// To be called before start()
status_t setMaxAcquiredBufferCount(size_t count);
+ // To be called before start()
+ status_t setUseAbsoluteTimestamps();
+
protected:
// Implementation of the BufferQueue::ConsumerListener interface. These
@@ -212,6 +215,8 @@ private:
size_t mMaxAcquiredBufferCount;
+ bool mUseAbsoluteTimestamps;
+
// mFrameAvailableCondition condition used to indicate whether there
// is a frame available for dequeuing
Condition mFrameAvailableCondition;