loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-06 23:20:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix method name to return all encode-able MIME types

Browse Source 
PiperOrigin-RevId: 495093939
This commit is contained in:
claincly 2022-12-13 20:23:11 +00:00 committed by Ian Baker
parent 395cf4debc
commit b1425aa6f4
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderCapabilityAnalysisTest.java
View File

@ -27,6 +27,7 @@ import android.util.Pair;
import android.util.Range; import android.util.Range;
import android.util.Size; import android.util.Size;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.media3.common.MimeTypes;
import androidx.media3.common.util.Util; import androidx.media3.common.util.Util;
import androidx.media3.transformer.AndroidTestUtil; import androidx.media3.transformer.AndroidTestUtil;
import androidx.media3.transformer.EncoderUtil; import androidx.media3.transformer.EncoderUtil;
@ -34,6 +35,7 @@ import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
@ -86,7 +88,9 @@ public class EncoderCapabilityAnalysisTest {
@Test @Test
public void logEncoderCapabilities() throws Exception { 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. // Map from MIME type to a list of maps from capability name to value.
LinkedHashMap<String, List<Map<String, Object>>> mimeTypeToEncoderInfo = new LinkedHashMap<>(); LinkedHashMap<String, List<Map<String, Object>>> mimeTypeToEncoderInfo = new LinkedHashMap<>();

4
libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java
View File

@ -66,8 +66,8 @@ public final class EncoderUtil {
return ImmutableList.copyOf(mimeTypeToEncoders.get(Ascii.toLowerCase(mimeType))); return ImmutableList.copyOf(mimeTypeToEncoders.get(Ascii.toLowerCase(mimeType)));
} }
/** Returns a list of video {@linkplain MimeTypes MIME types} that can be encoded. */ /** Returns a list of {@linkplain MimeTypes MIME types} that can be encoded. */
public static synchronized ImmutableSet<String> getSupportedVideoMimeTypes() { public static synchronized ImmutableSet<String> getSupportedMimeTypes() {
maybePopulateEncoderInfo(); maybePopulateEncoderInfo();
return ImmutableSet.copyOf(mimeTypeToEncoders.keySet()); return ImmutableSet.copyOf(mimeTypeToEncoders.keySet());
} }