Skip to content

fix adjustImageScaling and Camera2Loader #502

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix adjustImageScaling and Camera2Loader #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d37081a
fix Camera2Loader, replace or with ||
Jun 16, 2020
ff7a0e8
fix adjustImageScaling to get correct vertex coordinates
Jun 22, 2020
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
5 changes: 5 additions & 0 deletions library/src/main/java/jp/co/cyberagent/android/gpuimage/GPUImageRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,11 @@ private void adjustImageScaling() {
addDistance(textureCords[6], distHorizontal), addDistance(textureCords[7], distVertical),
};
} else {
if (rotation == Rotation.ROTATION_270 || rotation == Rotation.ROTATION_90) {
ratioWidth = ratioWidth + ratioHeight;
ratioHeight = ratioWidth - ratioHeight;
ratioWidth = ratioWidth - ratioHeight;
}
cube = new float[]{
CUBE[0] / ratioHeight, CUBE[1] / ratioWidth,
CUBE[2] / ratioHeight, CUBE[3] / ratioWidth,
Expand Down
4 changes: 2 additions & 2 deletions sample/src/main/java/jp/co/cyberagent/android/gpuimage/sample/utils/Camera2Loader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ class Camera2Loader(private val activity: Activity) : CameraLoader() {
?.getOutputSizes(ImageFormat.YUV_420_888)

val orientation = getCameraOrientation()
val maxPreviewWidth = if (orientation == 90 or 270) viewHeight else viewWidth
val maxPreviewHeight = if (orientation == 90 or 270) viewWidth else viewHeight
val maxPreviewWidth = if (orientation == 90 || orientation == 270) viewHeight else viewWidth
val maxPreviewHeight = if (orientation == 90 || orientation == 270) viewWidth else viewHeight

return outputSizes?.filter {
it.width < maxPreviewWidth / 2 && it.height < maxPreviewHeight / 2
Expand Down