loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rollback of d58f5fdf7d

Browse Source 
PiperOrigin-RevId: 566258299
This commit is contained in:
ibaker 2023-09-18 04:08:04 -07:00 committed by Copybara-Service
parent f89053dbb0
commit 2c0d9ba4c3
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants.gradle
View File

@ -24,7 +24,7 @@ project.ext {
junitVersion = '4.13.2' junitVersion = '4.13.2'
// Use the same Guava version as the Android repo: // Use the same Guava version as the Android repo:
// https://cs.android.com/android/platform/superproject/+/master:external/guava/METADATA // https://cs.android.com/android/platform/superproject/+/master:external/guava/METADATA
guavaVersion = '32.1.2-android' guavaVersion = '31.1-android'
mockitoVersion = '3.12.4' mockitoVersion = '3.12.4'
robolectricVersion = '4.10.3' robolectricVersion = '4.10.3'
// Keep this in sync with Google's internal Checker Framework version. // Keep this in sync with Google's internal Checker Framework version.

15
libraries/common/src/main/java/androidx/media3/common/util/Util.java
View File

@ -1661,6 +1661,11 @@ public final class Util {
* @param roundingMode The rounding mode to use if the result of the division is not an integer. * @param roundingMode The rounding mode to use if the result of the division is not an integer.
* @return The scaled value. * @return The scaled value.
*/ */
// LongMath.saturatedMultiply is @Beta in the version of Guava we currently depend on (31.1)
// but it is no longer @Beta from 32.0.0. This suppression is therefore safe because there's
// no version of Guava after 31.1 that doesn't contain this symbol.
// TODO(b/290045069): Remove this suppression when we depend on Guava 32+.
@SuppressWarnings("UnstableApiUsage")
@UnstableApi @UnstableApi
public static long scaleLargeValue( public static long scaleLargeValue(
long value, long multiplier, long divisor, RoundingMode roundingMode) { long value, long multiplier, long divisor, RoundingMode roundingMode) {
@ -1693,6 +1698,11 @@ public final class Util {
* @param roundingMode The rounding mode to use if the result of the division is not an integer. * @param roundingMode The rounding mode to use if the result of the division is not an integer.
* @return The scaled values. * @return The scaled values.
*/ */
// LongMath.saturatedMultiply is @Beta in the version of Guava we currently depend on (31.1)
// but it is no longer @Beta from 32.0.0. This suppression is therefore safe because there's
// no version of Guava after 31.1 that doesn't contain this symbol.
// TODO(b/290045069): Remove this suppression when we depend on Guava 32+.
@SuppressWarnings("UnstableApiUsage")
@UnstableApi @UnstableApi
public static long[] scaleLargeValues( public static long[] scaleLargeValues(
List<Long> values, long multiplier, long divisor, RoundingMode roundingMode) { List<Long> values, long multiplier, long divisor, RoundingMode roundingMode) {
@ -1792,6 +1802,11 @@ public final class Util {
* <p>This implementation should be used after simpler simplifying efforts have failed (such as * <p>This implementation should be used after simpler simplifying efforts have failed (such as
* checking if {@code value} or {@code multiplier} are exact multiples of {@code divisor}). * checking if {@code value} or {@code multiplier} are exact multiples of {@code divisor}).
*/ */
// LongMath.saturatedMultiply is @Beta in the version of Guava we currently depend on (31.1)
// but it is no longer @Beta from 32.0.0. This suppression is therefore safe because there's
// no version of Guava after 31.1 that doesn't contain this symbol.
// TODO(b/290045069): Remove this suppression when we depend on Guava 32+.
@SuppressWarnings("UnstableApiUsage")
private static long scaleLargeValueFallback( private static long scaleLargeValueFallback(
long value, long multiplier, long divisor, RoundingMode roundingMode) { long value, long multiplier, long divisor, RoundingMode roundingMode) {
long numerator = LongMath.saturatedMultiply(value, multiplier); long numerator = LongMath.saturatedMultiply(value, multiplier);

4
libraries/common/src/test/java/androidx/media3/common/util/UtilScaleLargeValueParameterizedTest.java
View File

@ -231,6 +231,8 @@ public class UtilScaleLargeValueParameterizedTest {
* floating-point branch (which will cause this test to fail because passing * floating-point branch (which will cause this test to fail because passing
* RoundingMode.UNNECESSARY won't be allowed). * RoundingMode.UNNECESSARY won't be allowed).
*/ */
// TODO(b/290045069): Remove this suppression when we depend on Guava 32+.
@SuppressWarnings("UnstableApiUsage")
@Test @Test
public void cancelsRatherThanFallThroughToFloatingPoint() { public void cancelsRatherThanFallThroughToFloatingPoint() {
long value = 24960; long value = 24960;
@ -245,6 +247,8 @@ public class UtilScaleLargeValueParameterizedTest {
assertThat(result).isEqualTo(520000); assertThat(result).isEqualTo(520000);
} }
// TODO(b/290045069): Remove this suppression when we depend on Guava 32+.
@SuppressWarnings("UnstableApiUsage")
@Test @Test
public void numeratorOverflowsAndCantBeCancelled() { public void numeratorOverflowsAndCantBeCancelled() {
// Use three Mersenne primes so nothing can cancel, and the numerator will (just) overflow 64 // Use three Mersenne primes so nothing can cancel, and the numerator will (just) overflow 64