Skip to content

SDK / exoplayer

Go to a project
Commit 557b7dcc by huangdarwin Committed by microkatz
Options

Demo: Request READ_MEDIA_VIDEO on API 33+ 

More info in: https://developer.android.com/about/versions/13/behavior-changes-13#granular-media-permissions

PiperOrigin-RevId: 506908079
parent 87ff3157
Inline Side-by-side
Showing with 19 additions and 17 deletions
demos/transformer/src/main/AndroidManifest.xml
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
<application <application
android:allowBackup="false" android:allowBackup="false"
......
demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/ConfigurationActivity.java
...@@ -15,10 +15,12 @@ ...@@ -15,10 +15,12 @@
*/ */
package com.google.android.exoplayer2.transformerdemo; package com.google.android.exoplayer2.transformerdemo;
import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
import static android.Manifest.permission.READ_MEDIA_VIDEO;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static com.google.android.exoplayer2.util.Assertions.checkState; import static com.google.android.exoplayer2.util.Assertions.checkState;
import static com.google.android.exoplayer2.util.Util.SDK_INT;
import android.Manifest;
import android.app.Activity; import android.app.Activity;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
...@@ -44,7 +46,6 @@ import androidx.core.app.ActivityCompat; ...@@ -44,7 +46,6 @@ import androidx.core.app.ActivityCompat;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.transformer.TransformationRequest; import com.google.android.exoplayer2.transformer.TransformationRequest;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util;
import com.google.android.material.slider.RangeSlider; import com.google.android.material.slider.RangeSlider;
import com.google.android.material.slider.Slider; import com.google.android.material.slider.Slider;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
...@@ -288,7 +289,7 @@ public final class ConfigurationActivity extends AppCompatActivity { ...@@ -288,7 +289,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
videoMimeSpinner.setAdapter(videoMimeAdapter); videoMimeSpinner.setAdapter(videoMimeAdapter);
videoMimeAdapter.addAll( videoMimeAdapter.addAll(
SAME_AS_INPUT_OPTION, MimeTypes.VIDEO_H263, MimeTypes.VIDEO_H264, MimeTypes.VIDEO_MP4V); SAME_AS_INPUT_OPTION, MimeTypes.VIDEO_H263, MimeTypes.VIDEO_H264, MimeTypes.VIDEO_MP4V);
if (Util.SDK_INT >= 24) { if (SDK_INT >= 24) {
videoMimeAdapter.add(MimeTypes.VIDEO_H265); videoMimeAdapter.add(MimeTypes.VIDEO_H265);
} }
...@@ -487,13 +488,11 @@ public final class ConfigurationActivity extends AppCompatActivity { ...@@ -487,13 +488,11 @@ public final class ConfigurationActivity extends AppCompatActivity {
} }
private void selectLocalFile(View view) { private void selectLocalFile(View view) {
int permissionStatus = String permission = SDK_INT >= 33 ? READ_MEDIA_VIDEO : READ_EXTERNAL_STORAGE;
ActivityCompat.checkSelfPermission( if (ActivityCompat.checkSelfPermission(/* context= */ this, permission)
ConfigurationActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE); != PackageManager.PERMISSION_GRANTED) {
if (permissionStatus != PackageManager.PERMISSION_GRANTED) {
String[] neededPermissions = {Manifest.permission.READ_EXTERNAL_STORAGE};
ActivityCompat.requestPermissions( ActivityCompat.requestPermissions(
ConfigurationActivity.this, neededPermissions, FILE_PERMISSION_REQUEST_CODE); /* activity= */ this, new String[] {permission}, FILE_PERMISSION_REQUEST_CODE);
} else { } else {
launchLocalFilePicker(); launchLocalFilePicker();
} }
......
demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/TransformerActivity.java
...@@ -16,10 +16,12 @@ ...@@ -16,10 +16,12 @@
package com.google.android.exoplayer2.transformerdemo; package com.google.android.exoplayer2.transformerdemo;
import static android.Manifest.permission.READ_EXTERNAL_STORAGE; import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
import static android.Manifest.permission.READ_MEDIA_VIDEO;
import static com.google.android.exoplayer2.transformer.Transformer.PROGRESS_STATE_NOT_STARTED; import static com.google.android.exoplayer2.transformer.Transformer.PROGRESS_STATE_NOT_STARTED;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static com.google.android.exoplayer2.util.Assertions.checkState; import static com.google.android.exoplayer2.util.Assertions.checkState;
import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull; import static com.google.android.exoplayer2.util.Assertions.checkStateNotNull;
import static com.google.android.exoplayer2.util.Util.SDK_INT;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
...@@ -44,6 +46,7 @@ import android.widget.Toast; ...@@ -44,6 +46,7 @@ import android.widget.Toast;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.annotation.StringRes; import androidx.annotation.StringRes;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
import com.google.android.exoplayer2.MediaItem; import com.google.android.exoplayer2.MediaItem;
...@@ -82,7 +85,6 @@ import com.google.android.exoplayer2.util.DebugViewProvider; ...@@ -82,7 +85,6 @@ import com.google.android.exoplayer2.util.DebugViewProvider;
import com.google.android.exoplayer2.util.Effect; import com.google.android.exoplayer2.util.Effect;
import com.google.android.exoplayer2.util.GlUtil; import com.google.android.exoplayer2.util.GlUtil;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util;
import com.google.android.material.card.MaterialCardView; import com.google.android.material.card.MaterialCardView;
import com.google.android.material.progressindicator.LinearProgressIndicator; import com.google.android.material.progressindicator.LinearProgressIndicator;
import com.google.common.base.Stopwatch; import com.google.common.base.Stopwatch;
...@@ -195,7 +197,7 @@ public final class TransformerActivity extends AppCompatActivity { ...@@ -195,7 +197,7 @@ public final class TransformerActivity extends AppCompatActivity {
"debugFrame", "debugFrame",
}) })
private void startTransformation() { private void startTransformation() {
requestTransformerPermission(); requestReadVideoPermission(/* activity= */ this);
Intent intent = getIntent(); Intent intent = getIntent();
Uri uri = checkNotNull(intent.getData()); Uri uri = checkNotNull(intent.getData());
...@@ -684,12 +686,11 @@ public final class TransformerActivity extends AppCompatActivity { ...@@ -684,12 +686,11 @@ public final class TransformerActivity extends AppCompatActivity {
} }
} }
private void requestTransformerPermission() { private static void requestReadVideoPermission(AppCompatActivity activity) {
if (Util.SDK_INT < 23) { String permission = SDK_INT >= 33 ? READ_MEDIA_VIDEO : READ_EXTERNAL_STORAGE;
return; if (ActivityCompat.checkSelfPermission(activity, permission)
} != PackageManager.PERMISSION_GRANTED) {
if (checkSelfPermission(READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { ActivityCompat.requestPermissions(activity, new String[] {permission}, /* requestCode= */ 0);
requestPermissions(new String[] {READ_EXTERNAL_STORAGE}, /* requestCode= */ 0);
} }
} }
......
library/transformer/src/androidTest/AndroidManifest.xml
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_MEDIA"/>
<uses-sdk/> <uses-sdk/>
<application <application
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment