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 f1d8741166..1e7d135960 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java @@ -34,7 +34,6 @@ import androidx.annotation.Nullable; import androidx.media3.common.ColorInfo; import androidx.media3.common.Format; import androidx.media3.common.MimeTypes; -import androidx.media3.common.util.Log; import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.Util; import com.google.common.collect.ImmutableList; @@ -463,8 +462,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { return abs( requestedWidth * requestedHeight - closestSupportedResolution.getWidth() * closestSupportedResolution.getHeight()); - }, - /* filterName= */ "resolution"); + }); } /** Returns a list of encoders that support the requested bitrate most closely. */ @@ -476,8 +474,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { int achievableBitrate = EncoderUtil.getSupportedBitrateRange(encoderInfo, mimeType).clamp(requestedBitrate); return abs(achievableBitrate - requestedBitrate); - }, - /* filterName= */ "bitrate"); + }); } /** Returns a list of encoders that support the requested bitrate mode. */ @@ -488,8 +485,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { /* cost= */ (encoderInfo) -> EncoderUtil.isBitrateModeSupported(encoderInfo, mimeType, requestedBitrateMode) ? 0 - : Integer.MAX_VALUE, // Drops encoder. - /* filterName= */ "bitrate mode"); + : Integer.MAX_VALUE); // Drops encoder. } private static final class VideoEncoderQueryResult { @@ -610,7 +606,7 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { * costs of all encoders are {@link Integer#MAX_VALUE}. */ private static ImmutableList filterEncoders( - List encoders, EncoderFallbackCost cost, String filterName) { + List encoders, EncoderFallbackCost cost) { List filteredEncoders = new ArrayList<>(encoders.size()); int minGap = Integer.MAX_VALUE; @@ -630,10 +626,6 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { } } - if (filteredEncoders.size() != encoders.size()) { - logRemovedEncoders(encoders, filteredEncoders, filterName); - } - return ImmutableList.copyOf(filteredEncoders); } @@ -666,17 +658,4 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { /* isDecoder= */ false, format); } - - private static void logRemovedEncoders( - List encoders, List filteredEncoders, String filterName) { - List removedEncoders = new ArrayList<>(encoders); - removedEncoders.removeAll(filteredEncoders); - StringBuilder stringBuilder = - new StringBuilder("Encoders removed for ").append(filterName).append(":\n"); - for (int i = 0; i < removedEncoders.size(); i++) { - MediaCodecInfo encoderInfo = removedEncoders.get(i); - stringBuilder.append(Util.formatInvariant(" %s\n", encoderInfo.getName())); - } - Log.d(TAG, stringBuilder.toString()); - } }