diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-19 17:09:15 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2012-09-20 09:19:16 -0700 |
| commit | 52e9ad48ddd3c2e7c90a9002a2a65a5d63125b78 (patch) | |
| tree | b219692ff28ae15e1923e08b1cf234202c0e589b /services/camera/libcameraservice/camera2/CaptureSequencer.h | |
| parent | a4247b833599882b23db39e9f773746dc2fd9693 (diff) | |
| download | frameworks_av-52e9ad48ddd3c2e7c90a9002a2a65a5d63125b78.zip frameworks_av-52e9ad48ddd3c2e7c90a9002a2a65a5d63125b78.tar.gz frameworks_av-52e9ad48ddd3c2e7c90a9002a2a65a5d63125b78.tar.bz2 | |
Camera2: State must be STOPPED before JPEG callback is fired.
Move handling of JPEG callback to CaptureSequencer instead of
JpegProcessor, so that we can be sure the camera state is updated to
STOPPED before the JPEG callback is sent to the application layer.
Bug: 7172743
Change-Id: Ie8752d946d3eb8254230c77f10e5c38a83dc5371
Diffstat (limited to 'services/camera/libcameraservice/camera2/CaptureSequencer.h')
| -rw-r--r-- | services/camera/libcameraservice/camera2/CaptureSequencer.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/camera2/CaptureSequencer.h b/services/camera/libcameraservice/camera2/CaptureSequencer.h index 474bdac..f0d1e79 100644 --- a/services/camera/libcameraservice/camera2/CaptureSequencer.h +++ b/services/camera/libcameraservice/camera2/CaptureSequencer.h @@ -17,6 +17,7 @@ #ifndef ANDROID_SERVERS_CAMERA_CAMERA2_CAPTURESEQUENCER_H #define ANDROID_SERVERS_CAMERA_CAMERA2_CAPTURESEQUENCER_H +#include <binder/MemoryBase.h> #include <utils/Thread.h> #include <utils/String16.h> #include <utils/Vector.h> @@ -58,8 +59,8 @@ class CaptureSequencer: // Notifications from the frame processor virtual void onFrameAvailable(int32_t frameId, CameraMetadata &frame); - // Notifications from the capture processor - void onCaptureAvailable(nsecs_t timestamp); + // Notifications from the JPEG processor + void onCaptureAvailable(nsecs_t timestamp, sp<MemoryBase> captureBuffer); void dump(int fd, const Vector<String16>& args); @@ -85,6 +86,7 @@ class CaptureSequencer: bool mNewCaptureReceived; nsecs_t mCaptureTimestamp; + sp<MemoryBase> mCaptureBuffer; Condition mNewCaptureSignal; /** |