Upgrade libxcam to release_1.2.2
Test: build
Change-Id: I98df513804f8de29693248eead0f2aca12635f42
Exempt-From-Owner-Approval: upgrade
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 0a830b8..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "ext/atomisp"]
- path = ext/atomisp
- url = https://github.com/windyuan/atomisp_headers.git
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..5ef4c39
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,75 @@
+cc_defaults {
+ name: "libxcam_defaults",
+
+ cflags: [
+ // XCam Version Num 1.1.0
+ "-DXCAM_VERSION=0x110",
+
+ "-fPIC",
+ "-W",
+ "-Wall",
+ "-D_REENTRANT",
+ "-Wformat",
+ "-Wno-unused-parameter",
+ "-Wformat-security",
+ "-fstack-protector",
+ "-DANDROID",
+ ],
+
+ local_include_dirs: [
+ "xcore",
+ "modules",
+ ],
+}
+
+// For libxcam
+// =================================================
+cc_library_shared {
+ name: "libxcam",
+ defaults: ["libxcam_defaults"],
+
+ srcs: [
+ "xcore/buffer_pool.cpp",
+ "xcore/calibration_parser.cpp",
+ "xcore/file_handle.cpp",
+ "xcore/image_file_handle.cpp",
+ "xcore/image_handler.cpp",
+ "xcore/surview_fisheye_dewarp.cpp",
+ "xcore/thread_pool.cpp",
+ "xcore/video_buffer.cpp",
+ "xcore/worker.cpp",
+ "xcore/xcam_buffer.cpp",
+ "xcore/xcam_common.cpp",
+ "xcore/xcam_thread.cpp",
+ "xcore/xcam_utils.cpp",
+ "xcore/interface/blender.cpp",
+ "xcore/interface/feature_match.cpp",
+ "xcore/interface/geo_mapper.cpp",
+ "xcore/interface/stitcher.cpp",
+
+ "modules/soft/soft_blender.cpp",
+ "modules/soft/soft_blender_tasks_priv.cpp",
+ "modules/soft/soft_copy_task.cpp",
+ "modules/soft/soft_geo_mapper.cpp",
+ "modules/soft/soft_geo_tasks_priv.cpp",
+ "modules/soft/soft_handler.cpp",
+ "modules/soft/soft_stitcher.cpp",
+ "modules/soft/soft_video_buf_allocator.cpp",
+ "modules/soft/soft_worker.cpp",
+ ],
+
+ rtti: true,
+}
+
+// For test-soft-image
+// =================================================
+cc_test {
+ name: "test-soft-image",
+ defaults: ["libxcam_defaults"],
+
+ gtest: false,
+ srcs: ["tests/test-soft-image.cpp"],
+ shared_libs: ["libxcam"],
+
+ local_include_dirs: ["tests"],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index ecf1e22..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,120 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-# XCam Version Num 1.1.0
-XCAM_VERSION_CFLAGS := -DXCAM_VERSION=0x110
-
-XCAM_CFLAGS := -fPIC -Wall -Wno-unused-parameter -fstack-protector
-XCAM_CFLAGS += $(XCAM_VERSION_CFLAGS) -DANDROID
-
-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
-# =================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libxcam
-LOCAL_MODULE_TAGS := optional
-
-ifeq ($(ENABLE_OPENCV), 1)
-LOCAL_STATIC_LIBRARIES := libcv libcxcore
-endif
-
-XCAM_XCORE_SRC_FILES := \
- xcore/buffer_pool.cpp \
- xcore/calibration_parser.cpp \
- xcore/file_handle.cpp \
- xcore/image_file_handle.cpp \
- xcore/image_handler.cpp \
- xcore/surview_fisheye_dewarp.cpp \
- xcore/thread_pool.cpp \
- xcore/video_buffer.cpp \
- xcore/once_map_video_buffer_priv.cpp \
- xcore/worker.cpp \
- xcore/xcam_buffer.cpp \
- xcore/xcam_common.cpp \
- xcore/xcam_thread.cpp \
- xcore/xcam_utils.cpp \
- xcore/interface/blender.cpp \
- xcore/interface/feature_match.cpp \
- xcore/interface/geo_mapper.cpp \
- xcore/interface/stitcher.cpp \
- $(NULL)
-
-XCAM_SOFT_SRC_FILES := \
- modules/soft/soft_blender.cpp \
- modules/soft/soft_blender_tasks_priv.cpp \
- modules/soft/soft_copy_task.cpp \
- modules/soft/soft_geo_mapper.cpp \
- modules/soft/soft_geo_tasks_priv.cpp \
- modules/soft/soft_handler.cpp \
- modules/soft/soft_stitcher.cpp \
- modules/soft/soft_video_buf_allocator.cpp \
- modules/soft/soft_worker.cpp \
- $(NULL)
-
-ifeq ($(ENABLE_OPENCV), 1)
-XCAM_SOFT_SRC_FILES += \
- modules/ocv/cv_utils.cpp \
- modules/ocv/cv_capi_feature_match.cpp \
- $(NULL)
-endif
-
-LOCAL_SRC_FILES := $(XCAM_XCORE_SRC_FILES) $(XCAM_SOFT_SRC_FILES)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/xcore \
- $(LOCAL_PATH)/modules \
- $(NULL)
-
-ifeq ($(ENABLE_OPENCV), 1)
-LOCAL_C_INCLUDES += \
- external/opencv/cv/include/ \
- external/opencv/cxcore/include \
- $(NULL)
-endif
-
-LOCAL_CFLAGS := $(XCAM_CFLAGS)
-LOCAL_CPPFLAGS := $(LOCAL_CFLAGS) -frtti
-
-include $(BUILD_SHARED_LIBRARY)
-
-
-# For test-soft-image
-# =================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := test-soft-image
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SHARED_LIBRARIES := libxcam
-
-LOCAL_SRC_FILES := \
- tests/test-soft-image.cpp
- $(NULL)
-
-LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/xcore \
- $(LOCAL_PATH)/modules \
- $(LOCAL_PATH)/tests \
- $(NULL)
-
-LOCAL_CFLAGS := $(XCAM_CFLAGS)
-LOCAL_CPPFLAGS := $(LOCAL_CFLAGS)
-
-include $(BUILD_EXECUTABLE)
-
diff --git a/METADATA b/METADATA
index a27cae8..149456a 100644
--- a/METADATA
+++ b/METADATA
@@ -1,18 +1,15 @@
name: "LibXCam"
-description:
- "libXCam is a project for extended camera and computer "
- "vision features. This library can work on GPU, CPU and "
- "other HW platforms to improve image/video quality. "
- "OpenCL as one of the common parallel computing languages "
- "is used to improve performance in different platforms. "
- "Other shading language supports are in roadmap."
-
+description: "libXCam is a project for extended camera and computer vision features. This library can work on GPU, CPU and other HW platforms to improve image/video quality. OpenCL as one of the common parallel computing languages is used to improve performance in different platforms. Other shading language supports are in roadmap."
third_party {
url {
type: GIT
- value: "https://github.com/intel/libxcam.git"
+ value: "https://github.com/intel/libxcam"
}
- version: "1.0.0"
- last_upgrade_date { year: 2017 month: 9 day: 11 }
- license_type: "Apache-2.0"
+ version: "release_1.2.2"
+ license_type: NOTICE
+ last_upgrade_date {
+ year: 2019
+ month: 4
+ day: 4
+ }
}
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..49b573b
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+# Default code reviewers picked from top 3 or more developers.
+# Please update this list if you find better candidates.
+sgaurav@google.com
diff --git a/ext/atomisp b/ext/atomisp
deleted file mode 160000
index 79cf910..0000000
--- a/ext/atomisp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 79cf910fb8d8f547c80c3ceb3188b319c55c98d2
