Updated hybrid merging algorithm, updated specific check, changed dual session algorithms, added specific for Samsung S23 Ultra, burst camera2api bugfixes

Author: eszdman

app/SupportedList.txt

@@ -27,6 +27,8 @@ poco:surya
 redmi:galahad
 realme:rmx1931l1
 samsung:x1s
+samsung:dm3
+samsung:dm3q
 motorola:sofiar
 lge:flashlm
 lge:flashlmdd

app/specific/SpecificList.txt

@@ -15,3 +15,5 @@ oneplus:oneplus7pro
 oneplus:oneplus7pronr
 samsung:p3s
 samsung:r0q
+samsung:dm3
+samsung:dm3q

app/specific/samsung/dm3_specificsettings.txt

@@ -0,0 +1 @@
+cameraIDS = {5,0,2,6,7,1}

app/specific/samsung/dm3q_specificsettings.txt

@@ -0,0 +1 @@
+cameraIDS = {5,0,2,6,7,1}

app/src/main/java/com/particlesdevs/photoncamera/WrapperGPU.java

@@ -37,6 +37,8 @@ public class WrapperGPU {
      * @param bufferptr Image buffer.
      */
     public static native void loadFrame(ByteBuffer bufferptr, float Exposure);
+
+    public static native void packImages();
     public static native void loadFrameAlignments(ByteBuffer bufferptr, float Exposure);
 
     public static native void loadInterpolatedGainMap(ByteBuffer GainMap);

app/src/main/java/com/particlesdevs/photoncamera/api/CameraManager2.java

@@ -51,8 +51,17 @@ public final class CameraManager2 {
      */
     public CameraManager2(CameraManager cameraManager, SettingsManager settingsManager) {
         this.mSettingsManager = settingsManager;
+
+        //Spinlock waiting for specific manager
+        for(int i =0; i<100; i++){
+            if(PhotonCamera.getSpecific().isLoaded) break;
+            try {
+                Thread.sleep(1);
+            } catch (InterruptedException ignored) {}
+        }
         SpecificSetting sp = PhotonCamera.getSpecific().specificSetting;
         int[] ids = sp.cameraIDS;
+        Log.d("CameraManager2", "Loaded ids:"+ Arrays.toString(ids));
             if (!isLoaded()) {
                 if(ids == null)
                     scanAllCameras(cameraManager);
@@ -66,6 +75,7 @@ public CameraManager2(CameraManager cameraManager, SettingsManager settingsManag
                         } catch (Exception ignored) {
                         }
                     }
+                    findLensZoomFactor(mCameraLensDataMap);
                 }
                 //Override ID detection
                 save();

app/src/main/java/com/particlesdevs/photoncamera/app/PhotonCamera.java

@@ -50,6 +50,7 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
+import java.util.Objects;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -222,7 +223,6 @@ public void onCreate() {
     }
     private void initModules() {
 
-
         SensorManager sensorManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
         mGravity = new Gravity(sensorManager);
 
@@ -231,6 +231,8 @@ private void initModules() {
         mVibration = new Vibration(this);
 
         mSettingsManager = new SettingsManager(this);
+        mSupportedDevice = new SupportedDevice(mSettingsManager);
+        //mSupportedDevice.loadCheck();
 
         MigrationManager.migrate(mSettingsManager);
 
@@ -240,7 +242,6 @@ private void initModules() {
 
         mParameters = new Parameters();
         mPreviewParameters = new PreviewParameters();
-        mSupportedDevice = new SupportedDevice(mSettingsManager);
         mAssetLoader = new AssetLoader(this);
         mRS = RenderScript.create(this);
         mDebugger = new Debugger();

app/src/main/java/com/particlesdevs/photoncamera/capture/CaptureController.java

@@ -94,7 +94,7 @@ public void unregister() {
     }
 
     long[] capturingTimes;
-    int capturingNumber = 0;
+    public int capturingNumber = 0;
     boolean integrate = false;
     float x,y,z;
     private ArrayList<GyroBurst> BurstShakiness;

app/src/main/java/com/particlesdevs/photoncamera/control/Gyro.java

@@ -24,13 +24,13 @@ public void addRAW16(Image image) {
         IMAGE_BUFFER.add(image);
     }
 
-    public void runRaw(ImageReader imageReader, CameraCharacteristics characteristics, CaptureResult captureResult, ArrayList<GyroBurst> burstShakiness, int cameraRotation) {
-        super.runRaw(imageReader,characteristics,captureResult,burstShakiness,cameraRotation);
+    public void runRaw(int imageFormat, CameraCharacteristics characteristics, CaptureResult captureResult, ArrayList<GyroBurst> burstShakiness, int cameraRotation) {
+        super.runRaw(imageFormat,characteristics,captureResult,burstShakiness,cameraRotation);
         Log.d("DebugSender","RunDebug sender");
         PhotonCamera.getDebugger().debugClient.sendRaw(IMAGE_BUFFER.get(0));
         processingEventsListener.onProcessingFinished("Saved Unprocessed RAW");
         IMAGE_BUFFER.clear();
-        clearImageReader(imageReader);
+        //clearImageReader(imageReader);
     }
 
 }