diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java
index 45546a0409..7b51ba45b7 100644
--- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java
+++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java
@@ -27,6 +27,7 @@ import android.util.Pair;
 import android.util.Range;
 import android.util.Size;
 import androidx.annotation.Nullable;
+import androidx.media3.common.MimeTypes;
 import androidx.media3.common.util.Util;
 import androidx.media3.transformer.AndroidTestUtil;
 import androidx.media3.transformer.EncoderUtil;
@@ -34,6 +35,7 @@ import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -86,7 +88,9 @@ public class EncoderCapabilityAnalysisTest {
 
   @Test
   public void logEncoderCapabilities() throws Exception {
-    ImmutableSet<String> supportedVideoMimeTypes = EncoderUtil.getSupportedVideoMimeTypes();
+    ImmutableSet<String> supportedVideoMimeTypes =
+        ImmutableSet.copyOf(
+            Iterables.filter(EncoderUtil.getSupportedMimeTypes(), MimeTypes::isVideo));
 
     // Map from MIME type to a list of maps from capability name to value.
     LinkedHashMap<String, List<Map<String, Object>>> mimeTypeToEncoderInfo = new LinkedHashMap<>();
diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java b/libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java
index a957873b0b..f412e89b85 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java
@@ -66,8 +66,8 @@ public final class EncoderUtil {
     return ImmutableList.copyOf(mimeTypeToEncoders.get(Ascii.toLowerCase(mimeType)));
   }
 
-  /** Returns a list of video {@linkplain MimeTypes MIME types} that can be encoded. */
-  public static synchronized ImmutableSet<String> getSupportedVideoMimeTypes() {
+  /** Returns a list of {@linkplain MimeTypes MIME types} that can be encoded. */
+  public static synchronized ImmutableSet<String> getSupportedMimeTypes() {
     maybePopulateEncoderInfo();
     return ImmutableSet.copyOf(mimeTypeToEncoders.keySet());
   }