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/ExCameraParameters.h b/inc/ExCameraParameters.h
index 7af46db..99afd5a 100755
--- a/inc/ExCameraParameters.h
+++ b/inc/ExCameraParameters.h
@@ -234,6 +234,14 @@ static const char ORIENTATION_SENSOR_270[];
static const char FACING_FRONT[];
static const char FACING_BACK[];
+#ifdef METADATA_MODE_FOR_PREVIEW_CALLBACK
+static const char KEY_PREVEIW_CALLBACK_IN_METADATA_ENABLE[];
+static const char KEY_PREVEIW_CALLBACK_IN_METADATA_LENGTH[];
+static const char PREVEIW_CALLBACK_IN_METADATA_ENABLE[];
+static const char PREVEIW_CALLBACK_IN_METADATA_DISABLE[];
+static const char PREVEIW_CALLBACK_IN_METADATA_LENGTH_NONE[];
+static const char PREVEIW_CALLBACK_IN_METADATA_LENGTH[];
+#endif
};
};