Skip to content

fix(player): guard against a non-finite video aspect ratio crashing the player layout #57

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
Priveetee wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(player): guard against a non-finite video aspect ratio crashing the player layout #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions app/src/main/java/org/schabi/newpipe/views/ExpandableSurfaceView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec
@Override
protected void onLayout(final boolean changed,
final int left, final int top, final int right, final int bottom) {
setScaleX(scaleX);
setScaleY(scaleY);
// Defensive: never push a non-finite scale into the view (it throws and takes down layout).
setScaleX(Float.isFinite(scaleX) ? scaleX : 1.0f);
setScaleY(Float.isFinite(scaleY) ? scaleY : 1.0f);
}

/**
Expand Down Expand Up @@ -102,11 +103,15 @@ public int getResizeMode() {
}

public void setAspectRatio(final float aspectRatio) {
if (videoAspectRatio == aspectRatio) {
// A 0x0 / not-yet-known video gives NaN (or Infinity) here; keep it as "no ratio" (0) so the
// measure path skips scaling instead of pushing NaN into setScaleX, which throws
// IllegalArgumentException and crashes the player during layout (#2515).
final float sanitized = Float.isFinite(aspectRatio) ? aspectRatio : 0.0f;
if (videoAspectRatio == sanitized) {
return;
}

videoAspectRatio = aspectRatio;
videoAspectRatio = sanitized;
requestLayout();
}
}