Skip to content

[camera_android_camerax] Remove logic used to previously correct preview rotation #8256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 12 commits into from
Jan 9, 2025
Merged

[camera_android_camerax] Remove logic used to previously correct preview rotation #8256

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f21a0d3
Remove rotation correction logic
camsim99 Dec 9, 2024
afcd094
remove unused code
camsim99 Dec 11, 2024
6efe07a
Delete rotation tests
camsim99 Dec 11, 2024
d1d0590
Add 90 degree rotation
camsim99 Dec 18, 2024
483c7a9
Working as of today on real devices on OpenGLES and Vulkan
camsim99 Jan 7, 2025
647af2b
Merge remote-tracking branch 'upstream/main' into camx_remove_rot_corr
camsim99 Jan 7, 2025
54cb329
Merge remote-tracking branch 'upstream/main' into camx_remove_rot_corr
camsim99 Jan 7, 2025
27cc91a
Fix analyze hopefully
camsim99 Jan 7, 2025
e79d794
bump
camsim99 Jan 7, 2025
1d0de24
Fix test, format
camsim99 Jan 7, 2025
9ec26fd
Merge remote-tracking branch 'upstream/main' into camx_remove_rot_corr
camsim99 Jan 7, 2025
40513e4
fix analyze
camsim99 Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Remove rotation correction logic
  • Loading branch information
@camsim99
camsim99 committed Dec 9, 2024
commit f21a0d37a7209ad0ad8466d5d8dccdb3ec40ad7e
124 changes: 62 additions & 62 deletions packages/camera/camera_android_camerax/lib/src/android_camera_camerax.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,68 +865,68 @@ class AndroidCameraCameraX extends CameraPlatform {
);
}

final Widget cameraPreview = Texture(textureId: cameraId);
final Map<DeviceOrientation, int> degreesForDeviceOrientation =
<DeviceOrientation, int>{
DeviceOrientation.portraitUp: 0,
DeviceOrientation.landscapeRight: 90,
DeviceOrientation.portraitDown: 180,
DeviceOrientation.landscapeLeft: 270,
};
int naturalDeviceOrientationDegrees =
degreesForDeviceOrientation[naturalOrientation]!;

if (isPreviewPreTransformed) {
// If the camera preview is backed by a SurfaceTexture, the transformation
// needed to correctly rotate the preview has already been applied.
// However, we may need to correct the camera preview rotation if the
// device is naturally landscape-oriented.
if (naturalOrientation == DeviceOrientation.landscapeLeft ||
naturalOrientation == DeviceOrientation.landscapeRight) {
final int quarterTurnsToCorrectForLandscape =
(-naturalDeviceOrientationDegrees + 360) ~/ 4;
return RotatedBox(
quarterTurns: quarterTurnsToCorrectForLandscape,
child: cameraPreview);
}
return cameraPreview;
}

// Fix for the rotation of the camera preview not backed by a SurfaceTexture
// with respect to the naturalOrientation of the device:

final int signForCameraDirection = cameraIsFrontFacing ? 1 : -1;

if (signForCameraDirection == 1 &&
(currentDeviceOrientation == DeviceOrientation.landscapeLeft ||
currentDeviceOrientation == DeviceOrientation.landscapeRight)) {
// For front-facing cameras, the image buffer is rotated counterclockwise,
// so we determine the rotation needed to correct the camera preview with
// respect to the naturalOrientation of the device based on the inverse of
// naturalOrientation.
naturalDeviceOrientationDegrees += 180;
}

// See https://developer.android.com/media/camera/camera2/camera-preview#orientation_calculation
// for more context on this formula.
final double rotation = (sensorOrientation +
naturalDeviceOrientationDegrees * signForCameraDirection +
360) %
360;
int quarterTurnsToCorrectPreview = rotation ~/ 90;

if (naturalOrientation == DeviceOrientation.landscapeLeft ||
naturalOrientation == DeviceOrientation.landscapeRight) {
// We may need to correct the camera preview rotation if the device is
// naturally landscape-oriented.
quarterTurnsToCorrectPreview +=
(-naturalDeviceOrientationDegrees + 360) ~/ 4;
return RotatedBox(
quarterTurns: quarterTurnsToCorrectPreview, child: cameraPreview);
}

return RotatedBox(
quarterTurns: quarterTurnsToCorrectPreview, child: cameraPreview);
return Texture(textureId: cameraId);
// final Map<DeviceOrientation, int> degreesForDeviceOrientation =
// <DeviceOrientation, int>{
// DeviceOrientation.portraitUp: 0,
// DeviceOrientation.landscapeRight: 90,
// DeviceOrientation.portraitDown: 180,
// DeviceOrientation.landscapeLeft: 270,
// };
// int naturalDeviceOrientationDegrees =
// degreesForDeviceOrientation[naturalOrientation]!;

// if (isPreviewPreTransformed) {
// // If the camera preview is backed by a SurfaceTexture, the transformation
// // needed to correctly rotate the preview has already been applied.
// // However, we may need to correct the camera preview rotation if the
// // device is naturally landscape-oriented.
// if (naturalOrientation == DeviceOrientation.landscapeLeft ||
// naturalOrientation == DeviceOrientation.landscapeRight) {
// final int quarterTurnsToCorrectForLandscape =
// (-naturalDeviceOrientationDegrees + 360) ~/ 4;
// return RotatedBox(
// quarterTurns: quarterTurnsToCorrectForLandscape,
// child: cameraPreview);
// }
// return cameraPreview;
// }

// // Fix for the rotation of the camera preview not backed by a SurfaceTexture
// // with respect to the naturalOrientation of the device:

// final int signForCameraDirection = cameraIsFrontFacing ? 1 : -1;

// if (signForCameraDirection == 1 &&
// (currentDeviceOrientation == DeviceOrientation.landscapeLeft ||
// currentDeviceOrientation == DeviceOrientation.landscapeRight)) {
// // For front-facing cameras, the image buffer is rotated counterclockwise,
// // so we determine the rotation needed to correct the camera preview with
// // respect to the naturalOrientation of the device based on the inverse of
// // naturalOrientation.
// naturalDeviceOrientationDegrees += 180;
// }

// // See https://developer.android.com/media/camera/camera2/camera-preview#orientation_calculation
// // for more context on this formula.
// final double rotation = (sensorOrientation +
// naturalDeviceOrientationDegrees * signForCameraDirection +
// 360) %
// 360;
// int quarterTurnsToCorrectPreview = rotation ~/ 90;

// if (naturalOrientation == DeviceOrientation.landscapeLeft ||
// naturalOrientation == DeviceOrientation.landscapeRight) {
// // We may need to correct the camera preview rotation if the device is
// // naturally landscape-oriented.
// quarterTurnsToCorrectPreview +=
// (-naturalDeviceOrientationDegrees + 360) ~/ 4;
// return RotatedBox(
// quarterTurns: quarterTurnsToCorrectPreview, child: cameraPreview);
// }

// return RotatedBox(
// quarterTurns: quarterTurnsToCorrectPreview, child: cameraPreview);
}

/// Captures an image and returns the file where it was saved.
Expand Down
Loading