Fix problems with flash on Camera2 for Samsung, OnePlus, Pixel; no longer need... (5f6e0809) · Commits · e / os / Camera

_docs/history.html

+2 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,8 @@
		Version 1.50 (Work in progress)

		FIXED HDR photos came out black on some Samsung Galaxy devices with Android 12.
		FIXED Problems with flash on Camera2 API (Samsung Galaxy, OnePlus, Pixel 6). Galaxy and OnePlus
		devices therefore no longer default to using the "alternative flash method".
		FIXED Granting only approximate location permission on Android 12 would turn geotagging option
		back off.
		FIXED On-screen text looked strange on Android 12.

app/src/main/java/net/sourceforge/opencamera/MainActivity.java

+13 −17

Original line number	Diff line number	Diff line
		@@ -739,36 +739,32 @@ public class MainActivity extends AppCompatActivity {
		void setDeviceDefaults() {
		if( MyDebug.LOG )
		Log.d(TAG, "setDeviceDefaults");
		SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
		boolean is_samsung = Build.MANUFACTURER.toLowerCase(Locale.US).contains("samsung");
		boolean is_oneplus = Build.MANUFACTURER.toLowerCase(Locale.US).contains("oneplus");
		//SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
		//boolean is_samsung = Build.MANUFACTURER.toLowerCase(Locale.US).contains("samsung");
		//boolean is_oneplus = Build.MANUFACTURER.toLowerCase(Locale.US).contains("oneplus");
		//boolean is_nexus = Build.MODEL.toLowerCase(Locale.US).contains("nexus");
		//boolean is_nexus6 = Build.MODEL.toLowerCase(Locale.US).contains("nexus 6");
		//boolean is_pixel_phone = Build.DEVICE != null && Build.DEVICE.equals("sailfish");
		//boolean is_pixel_xl_phone = Build.DEVICE != null && Build.DEVICE.equals("marlin");
		if( MyDebug.LOG ) {
		Log.d(TAG, "is_samsung? " + is_samsung);
		Log.d(TAG, "is_oneplus? " + is_oneplus);
		/*if( MyDebug.LOG ) {
		//Log.d(TAG, "is_samsung? " + is_samsung);
		//Log.d(TAG, "is_oneplus? " + is_oneplus);
		//Log.d(TAG, "is_nexus? " + is_nexus);
		//Log.d(TAG, "is_nexus6? " + is_nexus6);
		//Log.d(TAG, "is_pixel_phone? " + is_pixel_phone);
		//Log.d(TAG, "is_pixel_xl_phone? " + is_pixel_xl_phone);
		}
		if( is_samsung \|\| is_oneplus ) {
		// workaround needed for Samsung Galaxy S7 at least (tested on Samsung RTL)
		// workaround needed for OnePlus 3 at least (see http://forum.xda-developers.com/oneplus-3/help/camera2-support-t3453103 )
		// update for v1.37: significant improvements have been made for standard flash and Camera2 API. But OnePlus 3T still has problem
		// that photos come out with a blue tinge if flash is on, and the scene is bright enough not to need it; Samsung devices also seem
		// to work okay, testing on S7 on RTL, but still keeping the fake flash mode in place for these devices, until we're sure of good
		// behaviour
		// update for testing on Galaxy S10e: still needs fake flash
		// has also been reported to me that OnePlus 8 and 8 Pro have problems with flash on Camera2 API unless fake flash enabled
		}*/
		/*if( is_samsung \|\| is_oneplus ) {
		// The problems we used to have on Samsung Galaxy devices are now fixed, by setting
		// TEMPLATE_PREVIEW for the precaptureBuilder in CameraController2. This also fixes the
		// problems with OnePlus 3T having blue tinge if flash is on, and the scene is bright
		// enough not to need it
		if( MyDebug.LOG )
		Log.d(TAG, "set fake flash for camera2");
		SharedPreferences.Editor editor = sharedPreferences.edit();
		editor.putBoolean(PreferenceKeys.Camera2FakeFlashPreferenceKey, true);
		editor.apply();
		}
		}*/
		/*if( is_nexus6 ) {
		// Nexus 6 captureBurst() started having problems with Android 7 upgrade - images appeared in wrong order (and with wrong order of shutter speeds in exif info), as well as problems with the camera failing with serious errors
		// we set this even for Nexus 6 devices not on Android 7, as at some point they'll likely be upgraded to Android 7

app/src/main/java/net/sourceforge/opencamera/cameracontroller/CameraController2.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -6125,17 +6125,19 @@ public class CameraController2 extends CameraController {
		If do_af_trigger_for_continuous is true, we set CONTROL_AF_TRIGGER_START, and wait for
		CONTROL_AF_STATE_FOCUSED_LOCKED or CONTROL_AF_STATE_NOT_FOCUSED_LOCKED, similar to other focus
		methods.
		do_af_trigger_for_continuous==true has advantages:
		do_af_trigger_for_continuous==true used to have advantages:
		- On Nexus 6 for flash auto, it means ae state is set to FLASH_REQUIRED if it is required
		when it comes to taking the photo. If do_af_trigger_for_continuous==false, sometimes
		it's set to CONTROL_AE_STATE_CONVERGED even for dark scenes, so we think we can skip
		the precapture, causing photos to come out dark (or we can force always doing precapture,
		but that makes things slower when flash isn't needed)
		Update: this now seems hard to reproduce.
		- On OnePlus 3T, with do_af_trigger_for_continuous==false photos come out with blue tinge
		if the scene is not dark (but still dark enough that you'd want flash).
		do_af_trigger_for_continuous==true fixes this for cases where the flash fires for autofocus.
		Note that the problem is still not fixed for flash on where the scene is bright enough to
		not need flash (and so we don't fire flash for autofocus).
		Update: now fixed by setting TEMPLATE_PREVIEW for the precaptureBuilder.
		do_af_trigger_for_continuous==true has disadvantage:
		- On both Nexus 6 and OnePlus 3T, taking photos with flash is longer, as we have flash firing
		for autofocus and precapture. Though note this is the case with autofocus mode anyway.
		@@ -6143,8 +6145,7 @@ public class CameraController2 extends CameraController {
		af trigger for fake flash mode can sometimes mean flash fires for too long and we get a worse
		result).
		*/
		//private final static boolean do_af_trigger_for_continuous = false;
		private final static boolean do_af_trigger_for_continuous = true;
		private final static boolean do_af_trigger_for_continuous = false;

		@Override
		public void autoFocus(final AutoFocusCallback cb, boolean capture_follows_autofocus_hint) {
		@@ -7423,9 +7424,12 @@ public class CameraController2 extends CameraController {
		Log.e(TAG, "shouldn't be doing precapture for burst - should be using fake precapture!");
		}
		try {
		// use a separate builder for precapture - otherwise have problem that if we take photo with flash auto/on of dark scene, then point to a bright scene, the autoexposure isn't running until we autofocus again
		final CaptureRequest.Builder precaptureBuilder = camera.createCaptureRequest(previewIsVideoMode ? CameraDevice.TEMPLATE_VIDEO_SNAPSHOT : CameraDevice.TEMPLATE_STILL_CAPTURE);
		precaptureBuilder.set(CaptureRequest.CONTROL_CAPTURE_INTENT, CaptureRequest.CONTROL_CAPTURE_INTENT_STILL_CAPTURE);
		// Use a separate builder for precapture - otherwise have problem that if we take photo with flash auto/on of dark scene, then point to a bright scene, the autoexposure isn't running until we autofocus again.
		// Important that this is TEMPLATE_PREVIEW not TEMPLATE_STILL_CAPTURE, otherwise we have various problems with flash:
		// * Flash won't fire on Galaxy devices.
		// * End up with blue tinge on OnePlus 3T.
		// * Flash auto produces blue tinge and leaves torch on for Pixel 6 Pro.
		final CaptureRequest.Builder precaptureBuilder = camera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);

		camera_settings.setupBuilder(precaptureBuilder, false);
		precaptureBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER, CameraMetadata.CONTROL_AF_TRIGGER_IDLE);