commit 6bd266236b4d1fb459cd90faeb32810e50b1a9d5
author Gaurav Sarode <sgaurav@google.com> Thu Jan 11 17:51:38 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 11 17:51:38 2018 +0000
tree 1f0dec9c0c265727b557747742d98fc4625a5467
parent 013dbd7233831a8a4077536a70eaea4e9b6b8bb0
parent 5cfa154cd124f3a0a3f9194e594a3be785727b28

Merge remote-tracking branch 'aosp/upstream-master' into master am: 507c4324d9 am: cdbaf6db45
am: 5cfa154cd1

Change-Id: I0319c3f4b492b5af13e0f4fb2b772f71634a708a

Android.mk

diff --git a/Android.mk b/Android.mk
index 9283828..87c00c1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,11 +10,16 @@
 XCAM_CFLAGS += -DDEBUG
 endif
 
+ENABLE_OPENCV := 0
+ifneq ($(filter $(TARGET_ARCH),x86 x86_64),)
+
 ifneq ($(wildcard external/opencv),)
 ENABLE_OPENCV := 1
 XCAM_CFLAGS += -DHAVE_OPENCV=1
 endif
 
+endif
+
 
 # For libxcam
 # =================================================

modules/soft/soft_blender.cpp

diff --git a/modules/soft/soft_blender.cpp b/modules/soft/soft_blender.cpp
index 2141f4e..7e0c678 100644
--- a/modules/soft/soft_blender.cpp
+++ b/modules/soft/soft_blender.cpp
@@ -30,7 +30,7 @@
 #define OVERLAP_POOL_SIZE 6
 #define LAP_POOL_SIZE 4
 
-#define DUMP_BLENDER 1
+#define DUMP_BLENDER 0
 
 namespace XCam {
 

modules/soft/soft_stitcher.cpp

diff --git a/modules/soft/soft_stitcher.cpp b/modules/soft/soft_stitcher.cpp
index c345dcd..42f0c93 100644
--- a/modules/soft/soft_stitcher.cpp
+++ b/modules/soft/soft_stitcher.cpp
@@ -43,7 +43,7 @@
 #define MAP_FACTOR_X  16
 #define MAP_FACTOR_Y  16
 
-#define DUMP_STITCHER 1
+#define DUMP_STITCHER 0
 
 namespace XCam {
 
@@ -352,7 +352,11 @@
         config.recur_offset_error = 8.0f;
         config.max_adjusted_offset = 24.0f;
         config.max_valid_offset_y = 20.0f;
+#ifndef ANDROID
         config.max_track_error = 28.0f;
+#else
+        config.max_track_error = 3600.0f;
+#endif
         _overlaps[i].matcher->set_config (config);
         _overlaps[i].matcher->set_fm_index (i);
 #endif