diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-08 16:40:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-08 16:40:12 -0700 |
| commit | 04c7d0f842ae1d3b52c426fccf7178861493431d (patch) | |
| tree | 0ff20abba735d2ffa8df01c1fade36cbc9694e1c /core | |
| parent | 1ecf5d28817f0a051e77488380dcd5bc622ea169 (diff) | |
| parent | 59c1a935295cb30c2ba2f759855e89c174b42a07 (diff) | |
| download | frameworks_base-04c7d0f842ae1d3b52c426fccf7178861493431d.zip frameworks_base-04c7d0f842ae1d3b52c426fccf7178861493431d.tar.gz frameworks_base-04c7d0f842ae1d3b52c426fccf7178861493431d.tar.bz2 | |
Merge change 6525 into donut
* changes:
Add timestamps to video frames to improve A/V sync. Bug 1927069.
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 77a8a72..57b5aa6 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -55,6 +55,7 @@ public: ~JNICameraContext() { release(); } virtual void notify(int32_t msgType, int32_t ext1, int32_t ext2); virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr); + virtual void postDataTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr); sp<Camera> getCamera() { Mutex::Autolock _l(mLock); return mCamera; } void release(); @@ -188,6 +189,12 @@ void JNICameraContext::postData(int32_t msgType, const sp<IMemory>& dataPtr) } } +void JNICameraContext::postDataTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr) +{ + // TODO: plumb up to Java. For now, just drop the timestamp + postData(msgType, dataPtr); +} + // connect to camera service static void android_hardware_Camera_native_setup(JNIEnv *env, jobject thiz, jobject weak_this) { |