From 521e0678078ff6e4800bc8aa28c3ae7b31219871 Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Fri, 6 May 2022 15:54:21 +0100 Subject: [PATCH] Disable transcoding when reading content URIs Before this change, we list the formats for which we don't want transcoding. This change disables transcoding altogether. This was tested by checking that transcoding takes place on a short camera recording only when the added flag is not present (and AndroidManifest does not declare support for HEVC). PiperOrigin-RevId: 446986580 --- .../upstream/ContentDataSource.java | 29 ++----------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/library/datasource/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java b/library/datasource/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java index 0933b9c5a6..15f340c865 100644 --- a/library/datasource/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java +++ b/library/datasource/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java @@ -21,18 +21,12 @@ import static java.lang.Math.min; import android.content.ContentResolver; import android.content.Context; import android.content.res.AssetFileDescriptor; -import android.media.ApplicationMediaCapabilities; -import android.media.MediaFeature; -import android.media.MediaFormat; import android.net.Uri; import android.os.Bundle; import android.provider.MediaStore; -import androidx.annotation.DoNotInline; import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.PlaybackException; -import com.google.android.exoplayer2.util.Util; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; @@ -76,6 +70,7 @@ public final class ContentDataSource extends BaseDataSource { } @Override + @SuppressWarnings("InlinedApi") // We are inlining EXTRA_ACCEPT_ORIGINAL_MEDIA_FORMAT. public long open(DataSpec dataSpec) throws ContentDataSourceException { try { Uri uri = dataSpec.uri; @@ -86,9 +81,8 @@ public final class ContentDataSource extends BaseDataSource { AssetFileDescriptor assetFileDescriptor; if ("content".equals(dataSpec.uri.getScheme())) { Bundle providerOptions = new Bundle(); - if (Util.SDK_INT >= 31) { - Api31.disableTranscoding(providerOptions); - } + // We don't want compatible media transcoding. + providerOptions.putBoolean(MediaStore.EXTRA_ACCEPT_ORIGINAL_MEDIA_FORMAT, true); assetFileDescriptor = resolver.openTypedAssetFileDescriptor(uri, /* mimeType= */ "*/*", providerOptions); } else { @@ -230,21 +224,4 @@ public final class ContentDataSource extends BaseDataSource { } } } - - @RequiresApi(31) - private static final class Api31 { - - @DoNotInline - public static void disableTranscoding(Bundle providerOptions) { - ApplicationMediaCapabilities mediaCapabilities = - new ApplicationMediaCapabilities.Builder() - .addSupportedVideoMimeType(MediaFormat.MIMETYPE_VIDEO_HEVC) - .addSupportedHdrType(MediaFeature.HdrType.DOLBY_VISION) - .addSupportedHdrType(MediaFeature.HdrType.HDR10) - .addSupportedHdrType(MediaFeature.HdrType.HDR10_PLUS) - .addSupportedHdrType(MediaFeature.HdrType.HLG) - .build(); - providerOptions.putParcelable(MediaStore.EXTRA_MEDIA_CAPABILITIES, mediaCapabilities); - } - } }