Sort preferences add psyche

app/SupportedList.txt

@@ -12,6 +12,7 @@ xiaomi:laurus
 xiaomi:thor
 xiaomi:ishtar
 xiaomi:earth
+xiaomi:psyche
 oneplus:oneplus7
 oneplus:oneplus7t
 oneplus:oneplus7tpro

app/specific/SpecificList.txt

@@ -4,6 +4,7 @@ xiaomi:thor
 xiaomi:ishtar
 xiaomi:alioth
 xiaomi:earth
+xiaomi:psyche
 oneplus:guacamole
 oneplus:guacamoles
 oneplus:guacamoleb

app/specific/sensors/xiaomi/psyche.txt

@@ -0,0 +1,23 @@
+sensor_0
+NoiseModelA = { 1.1688593151064156e-06,1.1645933521258543e-06,1.1607250813532187e-06,1.192559145441634e-06 }
+NoiseModelB = { 6.600944605194753e-06,1.2998201254067048e-05,1.3236566557241736e-05,2.821401899165929e-06 }
+NoiseModelC = { 3.7287757364607875e-12,3.634003674693985e-12,3.785336846016539e-12,3.784479595310842e-12 }
+NoiseModelD = { 1.9263642292739626e-07,7.91924782616922e-08,8.177636356521293e-08,2.441411738540428e-07 }
+
+sensor_1
+NoiseModelA = { 2.3712498773749313e-06,2.0699967379605705e-06,2.093837312613175e-06,2.8209164576575583e-06 }
+NoiseModelB = { 5.2238260822426465e-05,7.463061242949811e-05,7.907612949182591e-05,1.842195481394183e-05 }
+NoiseModelC = { 3.5154097833406655e-11,3.078573053221737e-11,2.93532285608987e-11,3.7477671878708655e-11 }
+NoiseModelD = { 1.0837352128402998e-06,1.1442111072586444e-06,9.228387056258597e-07,9.821303756227033e-07 }
+
+sensor_2
+NoiseModelA = { 1.7341362466240484e-06,2.1326849524816564e-06,2.0834336152972614e-06,3.0762220015572816e-07 }
+NoiseModelB = { 0.00014142249831488788,0.0001313169602312188,0.00013801687999154418,0.0031110943587791587 }
+NoiseModelC = { -6.545771953983537e-13,-1.922869117621309e-12,-9.747066435222829e-13,4.010942706439424e-11 }
+NoiseModelD = { 3.453281422510121e-07,1.3686603657279494e-08,-2.6626925334969122e-08,-2.248541145179639e-05 }
+
+sensor_3
+NoiseModelA = { 3.75341724806624e-06,3.7672308356931316e-06,3.741385858214053e-06,4.005850312699668e-06 }
+NoiseModelB = { 8.906994640706069e-06,1.9097353095000992e-05,1.9945585918647218e-05,-1.3951199540442167e-05 }
+NoiseModelC = { -4.544328021521826e-12,-5.325442645594475e-12,-5.80007505375903e-12,9.467173444114522e-13 }
+NoiseModelD = { 8.395598056852442e-07,6.774955832576914e-07,6.943390454609391e-07,9.14308642683009e-07 }

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

@@ -39,6 +39,7 @@
 import android.hardware.camera2.params.MeteringRectangle;
 import android.hardware.camera2.params.OutputConfiguration;
 import android.hardware.camera2.params.StreamConfigurationMap;
+import android.hardware.camera2.params.TonemapCurve;
 import android.media.CamcorderProfile;
 import android.media.ImageReader;
 import android.media.MediaRecorder;
@@ -1417,7 +1418,24 @@ private void setCaptureRequestBuilder() throws CameraAccessException {
         } else {
             mPreviewRequestBuilder = mCameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
         }
-
+        float r[] = new float[64];
+        float g[] = new float[64];
+        float b[] = new float[64];
+        for (int i = 0; i < 64; i++) {
+            float v = i / 63.0f;
+            float l = 0.02f;
+            float ga = 1.45f - 1.2f * (float)Math.pow(v, 0.25f);
+            //r[i] = 1.f/(1.f + (float)Math.exp(-6.0f * (v - 0.5f)));
+            //g[i] = 1.f/(1.f + (float)Math.exp(-6.0f * (v - 0.5f)));
+            //b[i] = 1.f/(1.f + (float)Math.exp(-6.0f * (v - 0.5f)));
+            r[i] = (float) Math.pow(Math.max((v-l)/(1.0-l),0),ga);
+            g[i] = (float) Math.pow(Math.max(v,0),ga);
+            b[i] = (float) Math.pow(Math.max((v-l)/(1.0-l),0),ga);
+        }
+        TonemapCurve curve = new TonemapCurve(r, g, b);
+        Log.d(TAG, "Curve:" + curve.toString());
+        mPreviewRequestBuilder.set(CaptureRequest.TONEMAP_CURVE, curve);
+        mPreviewRequestBuilder.set(CaptureRequest.TONEMAP_MODE, CaptureRequest.TONEMAP_MODE_CONTRAST_CURVE);
         mPreviewRequestBuilder.addTarget(surface);
         mPreviewMeteringAF = mPreviewRequestBuilder.get(CONTROL_AF_REGIONS);
         mPreviewAFMode = mPreviewRequestBuilder.get(CONTROL_AF_MODE);

app/src/main/java/com/particlesdevs/photoncamera/ui/settings/SettingsActivity.java

@@ -215,7 +215,7 @@ private void setSupportedDevices() {
                 if (preference != null) {
                     preference.setSummary((mSettingsManager.getStringSet(PreferenceKeys.Key.DEVICES_PREFERENCE_FILE_NAME.mValue,
                             ALL_DEVICES_NAMES_KEY, Collections.singleton(mContext.getString(R.string.list_not_loaded)))
-                            .stream().map(s -> s + "\n").reduce("\n", String::concat)));
+                            .stream().sorted().map(s -> s + "\n").reduce("\n", String::concat)));
                 }
            });
         }

app/src/main/res/xml/preferences.xml

@@ -347,6 +347,13 @@
                     android:summary="@string/version_summary"
                     android:enabled="false"
                     />
+            <Preference
+                    android:layout="@layout/preference_about"
+                    app:singleLineTitle="true"
+                    android:enabled="false"
+                    android:persistent="false"
+                    android:key="@string/pref_this_device_key"
+                    />
             <Preference
                     android:layout="@layout/preference_about"
                     android:key="@string/pref_contributors_key"
@@ -366,13 +373,6 @@
                     android:persistent="false"
                     android:key="@string/all_devices_names"
                     />
-            <Preference
-                    android:layout="@layout/preference_about"
-                    app:singleLineTitle="true"
-                    android:enabled="false"
-                    android:persistent="false"
-                    android:key="@string/pref_this_device_key"
-                    />
         </PreferenceScreen>
     </PreferenceCategory>
 </PreferenceScreen>

app/version.properties

@@ -1,2 +1,2 @@
-#Thu Apr 25 18:53:10 MSK 2024
-VERSION_BUILD=16324
+#Mon Apr 29 19:39:52 MSK 2024
+VERSION_BUILD=16377