diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TranscodeQualityTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TranscodeQualityTest.java index 36ba9e6f7d..fce08f376e 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TranscodeQualityTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TranscodeQualityTest.java @@ -59,7 +59,7 @@ public final class TranscodeQualityTest { new DefaultEncoderFactory.Builder(context) .setRequestedVideoEncoderSettings( new VideoEncoderSettings.Builder() - .setEnableHighQualityTargeting(true) + .experimentalSetEnableHighQualityTargeting(true) .build()) .build()) .setRemoveAudio(true) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java index 40a3b9f392..b51fc60f7b 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java @@ -427,7 +427,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { requestedFormat.frameRate); // Resets the flag after getting a targeted bitrate, so that supportedEncodingSetting can have // bitrate set. - supportedEncodingSettingBuilder.setEnableHighQualityTargeting(false); + supportedEncodingSettingBuilder.experimentalSetEnableHighQualityTargeting(false); } int closestSupportedBitrate = EncoderUtil.getSupportedBitrateRange(pickedEncoderInfo, mimeType).clamp(requestedBitrate); diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoEncoderSettings.java b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoEncoderSettings.java index c41ee71a06..66a79a8222 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/VideoEncoderSettings.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/VideoEncoderSettings.java @@ -102,7 +102,7 @@ public final class VideoEncoderSettings { /** * Sets {@link VideoEncoderSettings#bitrate}. The default value is {@link #NO_VALUE}. * - *
Can not be set if enabling {@link #setEnableHighQualityTargeting(boolean)}. + *
Can not be set if enabling {@link #experimentalSetEnableHighQualityTargeting(boolean)}. * * @param bitrate The {@link VideoEncoderSettings#bitrate}. * @return This builder. @@ -182,6 +182,8 @@ public final class VideoEncoderSettings { /** * Sets whether to enable automatic adjustment of the bitrate to target a high quality encoding. * + *
This method is experimental and may be removed or changed without warning. + * *
Default value is {@code false}. * *
Requires {@link android.media.MediaCodecInfo.EncoderCapabilities#BITRATE_MODE_VBR}. @@ -189,7 +191,7 @@ public final class VideoEncoderSettings { *
Can not be enabled alongside setting a custom bitrate with {@link #setBitrate(int)}. */ @CanIgnoreReturnValue - public Builder setEnableHighQualityTargeting(boolean enableHighQualityTargeting) { + public Builder experimentalSetEnableHighQualityTargeting(boolean enableHighQualityTargeting) { this.enableHighQualityTargeting = enableHighQualityTargeting; return this; } diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/DefaultEncoderFactoryTest.java b/libraries/transformer/src/test/java/androidx/media3/transformer/DefaultEncoderFactoryTest.java index fb993c8789..ecf0ea9bdd 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/DefaultEncoderFactoryTest.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/DefaultEncoderFactoryTest.java @@ -178,7 +178,9 @@ public class DefaultEncoderFactoryTest { Format actualVideoFormat = new DefaultEncoderFactory.Builder(context) .setRequestedVideoEncoderSettings( - new VideoEncoderSettings.Builder().setEnableHighQualityTargeting(true).build()) + new VideoEncoderSettings.Builder() + .experimentalSetEnableHighQualityTargeting(true) + .build()) .build() .createForVideoEncoding(requestedVideoFormat) .getConfigurationFormat();