diff options
| author | Igor Murashkin <iam@google.com> | 2013-05-01 10:52:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-01 10:52:49 -0700 |
| commit | bfbe189e1052fe44f668efedb8eca6c9b3c9abaf (patch) | |
| tree | d2547411f203decdfb3ae456c7e1bda901fb6775 /services/camera/libcameraservice/Camera2Client.h | |
| parent | bae8df127ed4b76cce410922e33ce65e525bb405 (diff) | |
| parent | 7a0f7d9f6cdad84e4b5f6c6b164874393d541824 (diff) | |
| download | frameworks_av-bfbe189e1052fe44f668efedb8eca6c9b3c9abaf.zip frameworks_av-bfbe189e1052fe44f668efedb8eca6c9b3c9abaf.tar.gz frameworks_av-bfbe189e1052fe44f668efedb8eca6c9b3c9abaf.tar.bz2 | |
am 7a0f7d9f: am d24b0653: Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev
* commit '7a0f7d9f6cdad84e4b5f6c6b164874393d541824':
Camera3: Add ZSL stream support
camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames
Camera3: Add input stream support
Diffstat (limited to 'services/camera/libcameraservice/Camera2Client.h')
| -rw-r--r-- | services/camera/libcameraservice/Camera2Client.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.h b/services/camera/libcameraservice/Camera2Client.h index 46c6ceb..52e5d1c 100644 --- a/services/camera/libcameraservice/Camera2Client.h +++ b/services/camera/libcameraservice/Camera2Client.h @@ -23,7 +23,7 @@ #include "camera2/FrameProcessor.h" #include "camera2/StreamingProcessor.h" #include "camera2/JpegProcessor.h" -#include "camera2/ZslProcessor.h" +#include "camera2/ZslProcessorInterface.h" #include "camera2/CaptureSequencer.h" #include "camera2/CallbackProcessor.h" #include "Camera2ClientBase.h" @@ -157,6 +157,7 @@ private: void setPreviewCallbackFlagL(Parameters ¶ms, int flag); status_t updateRequests(Parameters ¶ms); + int mDeviceVersion; // Used with stream IDs static const int NO_STREAM = -1; @@ -176,7 +177,8 @@ private: sp<camera2::CaptureSequencer> mCaptureSequencer; sp<camera2::JpegProcessor> mJpegProcessor; - sp<camera2::ZslProcessor> mZslProcessor; + sp<camera2::ZslProcessorInterface> mZslProcessor; + sp<Thread> mZslProcessorThread; /** Notification-related members */ |