diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-16 11:17:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-16 11:17:16 -0700 |
| commit | 697d2c4aa17c95051d8b14738856334db37ee1c9 (patch) | |
| tree | 7e1fdf0a9fc3f8671c9e7988f7f1c872d1eeb124 /services | |
| parent | 5120e1f0c7fd1e524407895ba624ea39dc559f9d (diff) | |
| parent | 74a7bcc052d9bdd0f555e9be6f5ecaf92c6b22d8 (diff) | |
| download | frameworks_av-697d2c4aa17c95051d8b14738856334db37ee1c9.zip frameworks_av-697d2c4aa17c95051d8b14738856334db37ee1c9.tar.gz frameworks_av-697d2c4aa17c95051d8b14738856334db37ee1c9.tar.bz2 | |
am 74a7bcc0: am 54717320: Camera2: Don\'t touch frame counter on output frames.
* commit '74a7bcc052d9bdd0f555e9be6f5ecaf92c6b22d8':
Camera2: Don't touch frame counter on output frames.
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/Camera2Device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/Camera2Device.h b/services/camera/libcameraservice/Camera2Device.h index 29830bd..41df2e4 100644 --- a/services/camera/libcameraservice/Camera2Device.h +++ b/services/camera/libcameraservice/Camera2Device.h @@ -230,7 +230,7 @@ class Camera2Device : public virtual RefBase { // Real interfaces. On enqueue, queue takes ownership of buffer pointer // On dequeue, user takes ownership of buffer pointer. status_t enqueue(camera_metadata_t *buf); - status_t dequeue(camera_metadata_t **buf, bool incrementCount = true); + status_t dequeue(camera_metadata_t **buf, bool incrementCount = false); int getBufferCount(); status_t waitForBuffer(nsecs_t timeout); // Wait until a buffer with the given ID is dequeued. Will return |