loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent forwarding of zero video size to Leanback

Browse Source 
Leanback isn't prepared to handle these values and will throw
ArithmeticExceptions.

Issue: androidx/media#617
PiperOrigin-RevId: 561413740
This commit is contained in:
tonihei 2023-08-30 12:18:28 -07:00 committed by Copybara-Service
parent 53b882d803
commit ba4b96d2c1
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASENOTES.md
View File

@ -50,6 +50,9 @@
([#577](https://github.com/androidx/media/issues/577)). ([#577](https://github.com/androidx/media/issues/577)).
* Decoder Extensions (FFmpeg, VP9, AV1, etc.): * Decoder Extensions (FFmpeg, VP9, AV1, etc.):
* MIDI extension: * MIDI extension:
* Leanback extension:
* Fix bug where disabling a surface can cause an `ArithmeticException` in
Leanback code ([#617](https://github.com/androidx/media/issues/617)).
* Cast Extension: * Cast Extension:
* Test Utilities: * Test Utilities:
* Remove deprecated symbols: * Remove deprecated symbols:

5
libraries/ui_leanback/src/main/java/androidx/media3/ui/leanback/LeanbackPlayerAdapter.java
View File

@ -286,6 +286,11 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter implements Runnab
@SuppressWarnings("nullness:dereference.of.nullable") @SuppressWarnings("nullness:dereference.of.nullable")
@Override @Override
public void onVideoSizeChanged(VideoSize videoSize) { public void onVideoSizeChanged(VideoSize videoSize) {
if (videoSize.width == 0 || videoSize.height == 0) {
// Do not report unknown or placeholder sizes as Leanback can't handle these cases correctly
// (see https://github.com/androidx/media/issues/617).
return;
}
// There's no way to pass pixelWidthHeightRatio to leanback, so we scale the width that we // There's no way to pass pixelWidthHeightRatio to leanback, so we scale the width that we
// pass to take it into account. This is necessary to ensure that leanback uses the correct // pass to take it into account. This is necessary to ensure that leanback uses the correct
// aspect ratio when playing content with non-square pixels. // aspect ratio when playing content with non-square pixels.