diff options
| author | Gaurav Sarode <sgaurav@google.com> | 2018-01-09 11:24:24 -0800 |
|---|---|---|
| committer | Gaurav Sarode <sgaurav@google.com> | 2018-01-09 11:24:24 -0800 |
| commit | 507c4324d916ecd164bbf410af7df4191ec2b827 (patch) | |
| tree | 1f0dec9c0c265727b557747742d98fc4625a5467 | |
| parent | bc0d32c5316b9ee84002cf1df92e860d90b16fa4 (diff) | |
| parent | 7fe628a5dc5f8e960527f3d581f7ff845762156b (diff) | |
| download | libxcam-507c4324d916ecd164bbf410af7df4191ec2b827.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into masterandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1
Bug: 64765755
Test: Local build
Change-Id: I7469f111f7899f0b1134bca829ef33066a9045a8
| -rw-r--r-- | Android.mk | 5 | ||||
| -rw-r--r-- | modules/soft/soft_blender.cpp | 2 | ||||
| -rw-r--r-- | modules/soft/soft_stitcher.cpp | 6 |
3 files changed, 11 insertions, 2 deletions
@@ -10,11 +10,16 @@ ifeq ($(ENABLE_DEBUG), 1) 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 # ================================================= 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 { 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 @@ StitcherImpl::init_config (uint32_t count) 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 |