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/ExCameraParameters.cpp b/ExCameraParameters.cpp
index b1c23be..7c86f45 100755
--- a/ExCameraParameters.cpp
+++ b/ExCameraParameters.cpp
@@ -22,8 +22,8 @@
#include <string.h>
#include <stdlib.h>
-#include <ExCameraParameters.h>
#include "CameraHal.h"
+#include <ExCameraParameters.h>
namespace android {
@@ -198,5 +198,14 @@ const char ExCameraParameters::ORIENTATION_SENSOR_NONE[] = "0";
const char ExCameraParameters::ORIENTATION_SENSOR_90[] = "90";
const char ExCameraParameters::ORIENTATION_SENSOR_180[] = "180";
const char ExCameraParameters::ORIENTATION_SENSOR_270[] = "270";
+#ifdef METADATA_MODE_FOR_PREVIEW_CALLBACK
+ //extensions to add preview callback in metadata mode
+const char ExCameraParameters::KEY_PREVEIW_CALLBACK_IN_METADATA_ENABLE[] = "preview-callback-in-metadata-enable";
+const char ExCameraParameters::KEY_PREVEIW_CALLBACK_IN_METADATA_LENGTH[] = "preview-callback-in-metadata-length";
+const char ExCameraParameters::PREVEIW_CALLBACK_IN_METADATA_ENABLE[] = "1";
+const char ExCameraParameters::PREVEIW_CALLBACK_IN_METADATA_DISABLE[] = "0";
+const char ExCameraParameters::PREVEIW_CALLBACK_IN_METADATA_LENGTH_NONE[] = "0";
+const char ExCameraParameters::PREVEIW_CALLBACK_IN_METADATA_LENGTH[] = "16";
+#endif
};