Revert from 1.43, don't set preview fps for camera2 unless needed for video with custom fps. (927347fd) · Commits · e / os / Camera

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -448,7 +448,10 @@ public class CameraController2 extends CameraController {
		Log.d(TAG, "auto mode");
		Log.d(TAG, "flash_value: " + flash_value);
		}
		if( ae_target_fps_range != null ) {
		Log.d(TAG, "set ae_target_fps_range: " + ae_target_fps_range);
		builder.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, ae_target_fps_range);
		}

		// prefer to set flash via the ae mode (otherwise get even worse results), except for torch which we can't
		switch(flash_value) {

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

+24 −5

Original line number	Diff line number	Diff line
		@@ -3832,7 +3832,7 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
		Log.d(TAG, "fps_ranges not available");
		return;
		}
		int [] selected_fps;
		int [] selected_fps = null;
		if( this.is_video ) {
		// For Nexus 5 and Nexus 6, we need to set the preview fps using matchPreviewFpsToVideo to avoid problem of dark preview in low light, as described above.
		// When the video recording starts, the preview automatically adjusts, but still good to avoid too-dark preview before the user starts recording.
		@@ -3844,13 +3844,20 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
		// but leaving the code as it is, to be safe.
		// Update for v1.43: implementing setPreviewFpsRange() for CameraController2 caused the dark preview problem on
		// OnePlus 3T. So enable the preview_too_dark for all devices on Camera2.
		// Update for v1.43.3: had reports of problems (e.g., setting manual mode with video on camera2) since 1.43. It's unclear
		// if there is any benefit to setting the preview fps when we aren't requesting a specific fps value, so seems safest to
		// revert to the old behaviour (where CameraController2.setPreviewFpsRange() did nothing).
		boolean preview_too_dark = using_android_l \|\| Build.MODEL.equals("Nexus 5") \|\| Build.MODEL.equals("Nexus 6");
		String fps_value = applicationInterface.getVideoFPSPref();
		if( MyDebug.LOG ) {
		Log.d(TAG, "preview_too_dark? " + preview_too_dark);
		Log.d(TAG, "fps_value: " + fps_value);
		}
		if( fps_value.equals("default") && preview_too_dark ) {
		if( fps_value.equals("default") && using_android_l ) {
		if( MyDebug.LOG )
		Log.d(TAG, "don't set preview fps for camera2 and default fps video");
		}
		else if( fps_value.equals("default") && preview_too_dark ) {
		selected_fps = chooseBestPreviewFps(fps_ranges);
		}
		else {
		@@ -3863,12 +3870,24 @@ public class Preview implements SurfaceHolder.Callback, TextureView.SurfaceTextu
		// we could hardcode behaviour like we do for video, but this is the same way that Google Camera chooses preview fps for photos
		// or I could hardcode behaviour for Galaxy Nexus, but since it's an old device (and an obscure bug anyway - most users don't really need continuous focus in photo mode), better to live with the bug rather than complicating the code
		// Update for v1.29: this doesn't seem to happen on Galaxy Nexus with continuous picture focus mode, which is what we now use
		// Update for v1.31: we no longer seem to need this - I no longer get a dark preview in photo or video mode if we don't set the fps range;
		// Update for v1.31: we no longer seem to need this for old API - I no longer get a dark preview in photo or video mode if we don't set the fps range;
		// but leaving the code as it is, to be safe.
		// Update for v1.43.3: as noted above, setPreviewFpsRange() was implemented for CameraController2 in v1.43, but no evidence this
		// is needed for anything, so thinking about it, best to keep things as they were before for Camera2
		if( using_android_l ) {
		if( MyDebug.LOG )
		Log.d(TAG, "don't set preview fps for camera2 and photo");
		}
		else {
		selected_fps = chooseBestPreviewFps(fps_ranges);
		}
		}
		if( selected_fps != null ) {
		if( MyDebug.LOG )
		Log.d(TAG, "set preview fps range: " + selected_fps);
		camera_controller.setPreviewFpsRange(selected_fps[0], selected_fps[1]);
		}
		}

		public void switchVideo(boolean during_startup, boolean change_user_pref) {
		if( MyDebug.LOG )