Focus stacking

.cproject

@@ -5,9 +5,9 @@
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.android.toolchain.gcc.1245095277" moduleId="org.eclipse.cdt.core.settings" name="Default">
 				<externalSettings/>
 				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -45,10 +45,8 @@
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="OpenCamera.null.1547786032" name="OpenCamera"/>
 	</storageModule>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Default">
-			<resource resourceType="PROJECT" workspacePath="/OpenCamera"/>
-		</configuration>
+	<storageModule moduleId="refreshScope" versionNumber="1">
+		<resource resourceType="PROJECT" workspacePath="/OpenCamera"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

.project

@@ -55,7 +55,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
+					<value>false</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>

.settings/org.eclipse.cdt.core.prefs

@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 environment/project/com.android.toolchain.gcc.1245095277/PATH/delimiter=\:
 environment/project/com.android.toolchain.gcc.1245095277/PATH/operation=replace
-environment/project/com.android.toolchain.gcc.1245095277/PATH/value=/usr/lib/lightdm/lightdm\:/usr/local/sbin\:/usr/local/bin\:/usr/sbin\:/usr/bin\:/sbin\:/bin\:/usr/games\:/usr/local/games\:/home/sergey/android_tools/android-ndk-r10d
+environment/project/com.android.toolchain.gcc.1245095277/PATH/value=/usr/lib/lightdm/lightdm\:/usr/local/sbin\:/usr/local/bin\:/usr/sbin\:/usr/bin\:/sbin\:/bin\:/usr/games\:/usr/local/games\:/home/ivan/Android/android-ndk-r12b
 environment/project/com.android.toolchain.gcc.1245095277/append=true
 environment/project/com.android.toolchain.gcc.1245095277/appendContributed=true

AndroidManifest.xml

@@ -2,17 +2,17 @@
 
 <!-- +++
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	  package="com.almalence.opencam_plus"
+	  package="com.almalence.focuscam_plus"
       android:installLocation="auto"
-      android:versionCode="99"
-      android:versionName="3.40">
+      android:versionCode="101"
+      android:versionName="1.0">
 +++ -->
 <!-- -+-  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	  package="com.almalence.opencam"
+	  package="com.almalence.focuscam"
       android:installLocation="auto"
-      android:versionCode="119"
-      android:versionName="3.40">
+      android:versionCode="123"
+      android:versionName="1.0">
 <!--  -+- -->
 
     <supports-screens       
@@ -47,13 +47,13 @@
     <!-- android:debuggable="true"> -->
 
 		<!-- +++
-   		<activity android:name="com.almalence.opencam_plus.MainScreen"
+   		<activity android:name="com.almalence.focuscam_plus.MainScreen"
                   android:label="@string/app_name"
                   android:theme="@style/AlmalenceOpenCameraTheme"
                   android:screenOrientation="portrait">
 		+++ -->
 		<!-- -+-  -->
-		<activity android:name="com.almalence.opencam.MainScreen"
+		<activity android:name="com.almalence.focuscam.MainScreen"
                   android:label="@string/app_name"
                   android:launchMode="singleInstance"
                   android:theme="@style/AlmalenceOpenCameraTheme"
@@ -78,35 +78,35 @@
         </activity>
 
    		<!-- +++
-   		<activity android:name="com.almalence.opencam_plus.Processing"
+   		<activity android:name="com.almalence.focuscam_plus.Processing"
 		        		android:label="Processing"
         				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
 
-		<activity android:name="com.almalence.opencam_plus.Preferences"
+		<activity android:name="com.almalence.focuscam_plus.Preferences"
 				        android:label="@string/app_name"
 				        android:icon="@drawable/gui_almalence_settings_more_settings"
 				        android:hardwareAccelerated="true"/>
 
-		<activity android:name="com.almalence.opencam_plus.FolderPicker"
+		<activity android:name="com.almalence.focuscam_plus.FolderPicker"
 		        		android:label="@string/choose_folder"/>
 
-		<activity android:name="com.almalence.opencam_plus.FolderPickerLollipop"
+		<activity android:name="com.almalence.focuscam_plus.FolderPickerLollipop"
 		        		android:label="@string/choose_folder"/>
 		+++ -->
 		<!-- -+-  -->
-		<activity android:name="com.almalence.opencam.Processing"
+		<activity android:name="com.almalence.focuscam.Processing"
 		        		android:label="Processing"
         				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
 
-		<activity android:name="com.almalence.opencam.Preferences"
+		<activity android:name="com.almalence.focuscam.Preferences"
 				        android:label="@string/app_name"
 				        android:icon="@drawable/gui_almalence_settings_more_settings"
 				        android:hardwareAccelerated="true"/>
 
-		<activity android:name="com.almalence.opencam.FolderPicker"
+		<activity android:name="com.almalence.focuscam.FolderPicker"
 		        		android:label="@string/choose_folder"/>
 
-		<activity android:name="com.almalence.opencam.FolderPickerLollipop"
+		<activity android:name="com.almalence.focuscam.FolderPickerLollipop"
 		        		android:label="@string/choose_folder"/>
 		<!--  -+- -->
 
@@ -122,26 +122,26 @@
 		</receiver>
 
 		<!-- +++
-		<receiver android:name="com.almalence.opencam_plus.AlarmReceiver"></receiver>
+		<receiver android:name="com.almalence.focuscam_plus.AlarmReceiver"></receiver>
 		+++ -->
 		<!-- -+-  -->
-		<receiver android:name="com.almalence.opencam.AlarmReceiver"></receiver>
+		<receiver android:name="com.almalence.focuscam.AlarmReceiver"></receiver>
 		<!--  -+- -->
 
 		<!-- +++
 		<service
-            android:name="com.almalence.opencam_plus.ProcessingService"
+            android:name="com.almalence.focuscam_plus.ProcessingService"
             android:exported="false"/>
 		<service
-            android:name="com.almalence.opencam_plus.SavingService"
+            android:name="com.almalence.focuscam_plus.SavingService"
             android:exported="false"/>
 		+++ -->
 		<!-- -+-  -->
 		<service
-            android:name="com.almalence.opencam.ProcessingService"
+            android:name="com.almalence.focuscam.ProcessingService"
             android:exported="false"/>
 		<service
-            android:name="com.almalence.opencam.SavingService"
+            android:name="com.almalence.focuscam.SavingService"
             android:exported="false"/>
 		<!--  -+- -->
 
@@ -164,5 +164,5 @@
 	-->
 
 	<uses-sdk 	android:minSdkVersion="14"
-	    		android:targetSdkVersion="23"/>
+	    		android:targetSdkVersion="24"/>
 </manifest> 

assets/opencamera_modes.xml

@@ -72,7 +72,7 @@
 
 	</mode>
 
-	<mode id="expobracketing" name="expobracketing_mode_name"  savename="BKT">
+	<!-- <mode id="expobracketing" name="expobracketing_mode_name"  savename="BKT">
 
 	    <icon		id="gui_almalence_mode_expobracketing"/>
 
@@ -89,6 +89,32 @@
 
 	    <filter/>    
 
+	    <export 	id="com.almalence.plugins.export"/>
+
+		<sku/>
+
+		<howtotext  id=""/>
+
+	</mode> -->
+
+
+	<mode id="focusbracketing" name="focusbracketing_mode_name"  savename="FBKT">
+
+	    <icon		id="gui_almalence_mode_expobracketing"/>
+
+	    <vf 		id="com.almalence.plugins.gridvf"/>
+	    <vf 		id="com.almalence.plugins.zoomvf"/>
+	    <vf 		id="com.almalence.plugins.focusvf"/>
+	    <vf 		id="com.almalence.plugins.infosetvf"/>
+	    <vf 		id="com.almalence.plugins.aeawlockvf"/>
+	    <vf 		id="com.almalence.plugins.gyrovf"/>
+
+	    <capture 	id="com.almalence.plugins.focusbracketingcapture" />    
+
+	    <processing	id="com.almalence.plugins.focusstackingprocessing" />
+
+	    <filter/>    
+
 	    <export 	id="com.almalence.plugins.export"/>
 
 		<sku/>
@@ -276,6 +302,6 @@
 	</mode>
 
 	<!--  Default plugin for initial start -->     
-    <defaultmode id="single"/>
+    <defaultmode id="focusbracketing"/>
 
 </config>	

jni/Android.mk

@@ -92,6 +92,9 @@ include $(MY_CORE_PATH)/bestshot/Android.mk
 # Night plugin
 include $(MY_CORE_PATH)/nightprocessing/Android.mk
 
+# FocusStacking plugin
+include $(MY_CORE_PATH)/focusstacking/Android.mk
+
 # HDR plugin
 include $(MY_CORE_PATH)/hdrprocessing/Android.mk
 
@@ -122,5 +125,8 @@ include $(MY_CORE_PATH)/histogram/Android.mk
 # yuvimage helper
 include $(MY_CORE_PATH)/yuvimage/Android.mk
 
+# yuvbitmap helper
+include $(MY_CORE_PATH)/yuvbitmap/Android.mk
+
 # swapheap helper (move data between native and java heaps)
 include $(MY_CORE_PATH)/swapheap/Android.mk

jni/focusstacking/Android.mk

@@ -0,0 +1,13 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+include $(LOCAL_PATH)/../Flags.mk
+
+LOCAL_MODULE    := almashot-fstacking
+LOCAL_SRC_FILES := almashot-fstacking.cpp
+LOCAL_CFLAGS += -DLOG_ON
+LOCAL_STATIC_LIBRARIES := almalib gomp
+LOCAL_LDLIBS := -ldl -lz -llog
+
+include $(BUILD_SHARED_LIBRARY)