summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--Android.mk2
-rwxr-xr-xAppCallbackNotifier.cpp21
-rwxr-xr-xCameraHal.cpp25
-rwxr-xr-xCameraHal_Module.cpp2
-rwxr-xr-xExCameraParameters.cpp11
-rwxr-xr-xV4LCameraAdapter/V4LCameraAdapter.cpp88
-rwxr-xr-xinc/CameraHal.h20
-rwxr-xr-xinc/ExCameraParameters.h8
-rwxr-xr-xinc/V4LCameraAdapter/V4LCameraAdapter.h5
-rwxr-xr-xutils/util.cpp1
10 files changed, 176 insertions, 7 deletions
diff --git a/inc/V4LCameraAdapter/V4LCameraAdapter.h b/inc/V4LCameraAdapter/V4LCameraAdapter.h
index aee6b43..1f1c504 100755
--- a/inc/V4LCameraAdapter/V4LCameraAdapter.h
+++ b/inc/V4LCameraAdapter/V4LCameraAdapter.h
@@ -419,6 +419,11 @@ private:
struct VideoInfo *mVideoInfo;
int mCameraHandle;
+#ifdef ION_MODE_FOR_METADATA_MODE
+ bool ion_mode;
+ int mIonClient;
+ unsigned int mPhyAddr[NB_BUFFER];
+#endif
enum device_type_e m_eDeviceType;
enum v4l2_memory m_eV4l2Memory;