Skip to content

Commit

Permalink
Add workaround for wrong PerformancePoints on some devices.
Browse files Browse the repository at this point in the history
Some devices were reported to have wrong PerformancePoint sets
that cause 60 fps to be marked as unsupported even though they
are supported.

Issue: #10898

#minor-release

PiperOrigin-RevId: 512580395
  • Loading branch information
tonihei committed Feb 27, 2023
1 parent 39935d7 commit 04f0cc9
Showing 1 changed file with 15 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,7 @@ private static boolean needsAdaptationFlushWorkaround(String mimeType) {
* @param name The name of the codec.
* @return Whether to enable the workaround.
*/
private static final boolean needsRotatedVerticalResolutionWorkaround(String name) {
private static boolean needsRotatedVerticalResolutionWorkaround(String name) {
if ("OMX.MTK.VIDEO.DECODER.HEVC".equals(name) && "mcv5a".equals(Util.DEVICE)) {
// See https://github.com/google/ExoPlayer/issues/6612.
return false;
Expand All @@ -874,6 +874,17 @@ private static boolean needsProfileExcludedWorkaround(String mimeType, int profi
&& ("sailfish".equals(Util.DEVICE) || "marlin".equals(Util.DEVICE));
}

/** Whether the device is known to have wrong {@link PerformancePoint} declarations. */
private static boolean needsIgnorePerformancePointsWorkaround() {
// See https://github.com/google/ExoPlayer/issues/10898 and [internal ref: b/267324685].
return /* Chromecast with Google TV */ Util.DEVICE.equals("sabrina")
|| Util.DEVICE.equals("boreal")
/* Lenovo Tablet M10 FHD Plus */
|| Util.MODEL.startsWith("Lenovo TB-X605")
|| Util.MODEL.startsWith("Lenovo TB-X606")
|| Util.MODEL.startsWith("Lenovo TB-X616");
}

/** Possible outcomes of evaluating PerformancePoint coverage */
@Documented
@Retention(RetentionPolicy.SOURCE)
Expand All @@ -898,7 +909,9 @@ private static final class Api29 {
VideoCapabilities videoCapabilities, int width, int height, double frameRate) {
List<PerformancePoint> performancePointList =
videoCapabilities.getSupportedPerformancePoints();
if (performancePointList == null || performancePointList.isEmpty()) {
if (performancePointList == null
|| performancePointList.isEmpty()
|| needsIgnorePerformancePointsWorkaround()) {
return COVERAGE_RESULT_NO_EMPTY_LIST;
}

Expand Down

0 comments on commit 04f0cc9

Please sign in to comment.