Merge branch 'androidx:release' into dlb/ac4-level4/dev

Author: ybai001

.github/ISSUE_TEMPLATE/bug.yml

@@ -5,34 +5,29 @@ body:
   - type: markdown
     attributes:
       value: |
-        We can only process bug reports that are actionable. Unclear bug reports or reports with
-        insufficient information may not get attention.
+        We can only process bug reports that are actionable. Unclear bug reports or reports with insufficient information may not get attention.
 
         Before filing a bug:
         -------------------------
 
-        - Search existing issues, including issues that are closed:
-          https://github.com/androidx/media/issues?q=is%3Aissue
-        - For ExoPlayer-related bugs, please also check for existing issues on the ExoPlayer
-          tracker: https://github.com/google/ExoPlayer/issues?q=is%3Aissue
+        - Search existing issues, including issues that are closed: https://github.com/androidx/media/issues?q=is%3Aissue
+        - For ExoPlayer-related bugs, please also check for existing issues on the ExoPlayer tracker: https://github.com/google/ExoPlayer/issues?q=is%3Aissue
   - type: dropdown
     attributes:
       label: Version
       description: What version of Media3 (or ExoPlayer) are you using?
       options:
-        - Media3 1.2.0
-        - Media3 1.1.1
-        - Media3 1.1.0
-        - Media3 1.0.2
-        - Media3 1.0.1
-        - Media3 1.0.0
-        - Media3 `main` branch
+        - Media3 main branch
         - Media3 pre-release (alpha, beta or RC not in this list)
-        - ExoPlayer 2.19.1
-        - ExoPlayer 2.19.0
-        - ExoPlayer 2.18.7
-        - ExoPlayer 2.18.6
-        - ExoPlayer 2.18.5
+        - Media3 1.3.1
+        - Media3 1.3.0
+        - Media3 1.2.1
+        - Media3 1.2.0
+        - Media3 1.1.1 / ExoPlayer 2.19.1
+        - Media3 1.1.0 / ExoPlayer 2.19.0
+        - Media3 1.0.2 / ExoPlayer 2.18.7
+        - Media3 1.0.1 / ExoPlayer 2.18.6
+        - Media3 1.0.0 / ExoPlayer 2.18.5
         - ExoPlayer 2.18.4
         - ExoPlayer 2.18.3
         - ExoPlayer 2.18.2
@@ -47,14 +42,14 @@ body:
         - ExoPlayer 2.14.2
         - ExoPlayer 2.14.1
         - ExoPlayer 2.14.0
-        - ExoPlayer `dev-v2` branch
+        - ExoPlayer dev-v2 branch
         - Older (unsupported)
     validations:
       required: true
   - type: textarea
     attributes:
       label: More version details
-      description: |
+      description: >
         Required if you selected `main` or `dev-v2` (please provide an exact commit SHA),
         or 'pre-release' or 'older' (please provide the version).
   - type: textarea

README.md

@@ -154,6 +154,26 @@ implementation project(':media-lib-exoplayer-dash')
 implementation project(':media-lib-ui')
 ```
 
+#### MIDI module
+
+By default the [MIDI module](libraries/decoder_midi) is disabled as a local
+dependency, because it requires additional Maven repository config. If you want
+to use it as a local dependency, please configure the JitPack repository as
+[described in the module README](libraries/decoder_midi/README.md#getting-the-module),
+and then enable building the module in your `settings.gradle.kts` file:
+
+```kotlin
+gradle.extra.apply {
+  set("androidxMediaEnableMidiModule", true)
+}
+```
+
+Or in Gradle Groovy DSL `settings.gradle`:
+
+```groovy
+gradle.ext.androidxMediaEnableMidiModule = true
+```
+
 ## Developing AndroidX Media
 
 #### Project branches

RELEASENOTES.md

@@ -763,7 +763,7 @@ package androidx.media3.common {
     method @Deprecated public void setDeviceMuted(boolean);
     method public void setDeviceMuted(boolean, @androidx.media3.common.C.VolumeFlags int);
     method @Deprecated public void setDeviceVolume(@IntRange(from=0) int);
-    method public void setDeviceVolume(@IntRange(from=0) int, int);
+    method public void setDeviceVolume(@IntRange(from=0) int, @androidx.media3.common.C.VolumeFlags int);
     method public void setMediaItem(androidx.media3.common.MediaItem);
     method public void setMediaItem(androidx.media3.common.MediaItem, boolean);
     method public void setMediaItem(androidx.media3.common.MediaItem, long);

api.txt

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 project.ext {
-    releaseVersion = '1.2.0'
-    releaseVersionCode = 1_002_000_3_00
-    minSdkVersion = 16
+    releaseVersion = '1.3.1'
+    releaseVersionCode = 1_003_001_3_00
+    minSdkVersion = 19
     // See https://developer.android.com/training/cars/media/automotive-os#automotive-module
     automotiveMinSdkVersion = 28
     appTargetSdkVersion = 34
@@ -23,12 +23,14 @@ project.ext {
     targetSdkVersion = 30
     compileSdkVersion = 34
     dexmakerVersion = '2.28.3'
+    // Use the same JUnit version as the Android repo:
+    // https://cs.android.com/android/platform/superproject/main/+/main:external/junit/METADATA
     junitVersion = '4.13.2'
     // Use the same Guava version as the Android repo:
     // https://cs.android.com/android/platform/superproject/main/+/main:external/guava/METADATA
     guavaVersion = '32.1.3-android'
     mockitoVersion = '3.12.4'
-    robolectricVersion = '4.10.3'
+    robolectricVersion = '4.11'
     // Keep this in sync with Google's internal Checker Framework version.
     checkerframeworkVersion = '3.13.0'
     errorProneVersion = '2.18.0'
@@ -43,9 +45,7 @@ project.ext {
     // Updating this to 1.9.0+ will import Kotlin stdlib [internal ref: b/277891049].
     androidxCoreVersion = '1.8.0'
     androidxExifInterfaceVersion = '1.3.6'
-    androidxFuturesVersion = '1.1.0'
-    androidxMediaVersion = '1.6.0'
-    androidxMedia2Version = '1.2.1'
+    androidxMediaVersion = '1.7.0'
     androidxMultidexVersion = '2.0.1'
     androidxRecyclerViewVersion = '1.3.0'
     androidxMaterialVersion = '1.8.0'
@@ -54,7 +54,6 @@ project.ext {
     androidxTestJUnitVersion = '1.1.5'
     androidxTestRunnerVersion = '1.5.2'
     androidxTestRulesVersion = '1.5.0'
-    androidxTestServicesStorageVersion = '1.4.2'
     androidxTestTruthVersion = '1.5.0'
     truthVersion = '1.1.3'
     okhttpVersion = '4.12.0'

constants.gradle

@@ -72,8 +72,10 @@ include modulePrefix + 'lib-decoder-ffmpeg'
 project(modulePrefix + 'lib-decoder-ffmpeg').projectDir = new File(rootDir, 'libraries/decoder_ffmpeg')
 include modulePrefix + 'lib-decoder-flac'
 project(modulePrefix + 'lib-decoder-flac').projectDir = new File(rootDir, 'libraries/decoder_flac')
-include modulePrefix + 'lib-decoder-midi'
-project(modulePrefix + 'lib-decoder-midi').projectDir = new File(rootDir, 'libraries/decoder_midi')
+if (gradle.ext.has('androidxMediaEnableMidiModule') && gradle.ext.androidxMediaEnableMidiModule) {
+    include modulePrefix + 'lib-decoder-midi'
+    project(modulePrefix + 'lib-decoder-midi').projectDir = new File(rootDir, 'libraries/decoder_midi')
+}
 include modulePrefix + 'lib-decoder-opus'
 project(modulePrefix + 'lib-decoder-opus').projectDir = new File(rootDir, 'libraries/decoder_opus')
 include modulePrefix + 'lib-decoder-vp9'
@@ -100,7 +102,3 @@ include modulePrefix + 'test-data'
 project(modulePrefix + 'test-data').projectDir = new File(rootDir, 'libraries/test_data')
 include modulePrefix + 'test-utils'
 project(modulePrefix + 'test-utils').projectDir = new File(rootDir, 'libraries/test_utils')
-include modulePrefix + 'test-session-common'
-project(modulePrefix + 'test-session-common').projectDir = new File(rootDir, 'libraries/test_session_common')
-include modulePrefix + 'test-session-current'
-project(modulePrefix + 'test-session-current').projectDir = new File(rootDir, 'libraries/test_session_current')

core_settings.gradle

@@ -44,6 +44,7 @@
 import com.google.android.gms.cast.framework.CastButtonFactory;
 import com.google.android.gms.cast.framework.CastContext;
 import com.google.android.gms.dynamite.DynamiteModule;
+import com.google.common.util.concurrent.MoreExecutors;
 
 /**
  * An activity that plays video using {@link ExoPlayer} and supports casting using ExoPlayer's Cast
@@ -65,7 +66,7 @@ public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     // Getting the cast context later than onStart can cause device discovery not to take place.
     try {
-      castContext = CastContext.getSharedInstance(this);
+      castContext = CastContext.getSharedInstance(this, MoreExecutors.directExecutor()).getResult();
     } catch (RuntimeException e) {
       Throwable cause = e.getCause();
       while (cause != null) {

demos/cast/src/main/java/androidx/media3/demo/cast/MainActivity.java

@@ -63,7 +63,7 @@ public BitmapOverlayVideoProcessor(Context context) {
     paint = new Paint();
     paint.setTextSize(64);
     paint.setAntiAlias(true);
-    paint.setARGB(0xFF, 0xFF, 0xFF, 0xFF);
+    paint.setColor(Color.WHITE);
     textures = new int[1];
     overlayBitmap = Bitmap.createBitmap(OVERLAY_WIDTH, OVERLAY_HEIGHT, Bitmap.Config.ARGB_8888);
     overlayCanvas = new Canvas(overlayBitmap);

demos/gl/src/main/java/androidx/media3/demo/gl/BitmapOverlayVideoProcessor.java

@@ -143,6 +143,12 @@
         "drm_scheme": "widevine",
         "drm_license_uri": "https://proxy.uat.widevine.com/proxy?video_id=GTS_HW_SECURE_ALL&provider=widevine_test"
       },
+      {
+        "name": "20s license with renewal",
+        "uri": "https://storage.googleapis.com/wvmedia/cenc/h264/tears/tears.mpd",
+        "drm_scheme": "widevine",
+        "drm_license_uri": "https://proxy.uat.widevine.com/proxy?video_id=GTS_CAN_RENEW&provider=widevine_test"
+      },
       {
         "name": "30s license (fails at ~30s)",
         "uri": "https://storage.googleapis.com/wvmedia/cenc/h264/tears/tears.mpd",

demos/main/src/main/assets/media.exolist.json

@@ -16,11 +16,13 @@
 package androidx.media3.demo.main;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
 
 import android.content.Context;
 import android.content.DialogInterface;
 import android.net.Uri;
-import android.os.AsyncTask;
+import android.os.Handler;
+import android.os.Looper;
 import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.annotation.OptIn;
@@ -54,6 +56,9 @@
 import java.util.HashMap;
 import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
 /** Tracks media that has been downloaded. */
 @OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
@@ -182,7 +187,7 @@ public void release() {
         trackSelectionDialog.dismiss();
       }
       if (widevineOfflineLicenseFetchTask != null) {
-        widevineOfflineLicenseFetchTask.cancel(false);
+        widevineOfflineLicenseFetchTask.cancel();
       }
     }
 
@@ -358,14 +363,16 @@ private DownloadRequest buildDownloadRequest() {
 
   /** Downloads a Widevine offline license in a background thread. */
   @RequiresApi(18)
-  private static final class WidevineOfflineLicenseFetchTask extends AsyncTask<Void, Void, Void> {
+  private static final class WidevineOfflineLicenseFetchTask {
 
     private final Format format;
     private final MediaItem.DrmConfiguration drmConfiguration;
     private final DataSource.Factory dataSourceFactory;
     private final StartDownloadDialogHelper dialogHelper;
     private final DownloadHelper downloadHelper;
+    private final ExecutorService executorService;
 
+    @Nullable Future<?> future;
     @Nullable private byte[] keySetId;
     @Nullable private DrmSession.DrmSessionException drmSessionException;
 
@@ -375,39 +382,50 @@ public WidevineOfflineLicenseFetchTask(
         DataSource.Factory dataSourceFactory,
         StartDownloadDialogHelper dialogHelper,
         DownloadHelper downloadHelper) {
+      checkState(drmConfiguration.scheme.equals(C.WIDEVINE_UUID));
+      this.executorService = Executors.newSingleThreadExecutor();
       this.format = format;
       this.drmConfiguration = drmConfiguration;
       this.dataSourceFactory = dataSourceFactory;
       this.dialogHelper = dialogHelper;
       this.downloadHelper = downloadHelper;
     }
 
-    @Override
-    protected Void doInBackground(Void... voids) {
-      OfflineLicenseHelper offlineLicenseHelper =
-          OfflineLicenseHelper.newWidevineInstance(
-              drmConfiguration.licenseUri.toString(),
-              drmConfiguration.forceDefaultLicenseUri,
-              dataSourceFactory,
-              drmConfiguration.licenseRequestHeaders,
-              new DrmSessionEventListener.EventDispatcher());
-      try {
-        keySetId = offlineLicenseHelper.downloadLicense(format);
-      } catch (DrmSession.DrmSessionException e) {
-        drmSessionException = e;
-      } finally {
-        offlineLicenseHelper.release();
+    public void cancel() {
+      if (future != null) {
+        future.cancel(/* mayInterruptIfRunning= */ false);
       }
-      return null;
     }
 
-    @Override
-    protected void onPostExecute(Void aVoid) {
-      if (drmSessionException != null) {
-        dialogHelper.onOfflineLicenseFetchedError(drmSessionException);
-      } else {
-        dialogHelper.onOfflineLicenseFetched(downloadHelper, checkNotNull(keySetId));
-      }
+    public void execute() {
+      future =
+          executorService.submit(
+              () -> {
+                OfflineLicenseHelper offlineLicenseHelper =
+                    OfflineLicenseHelper.newWidevineInstance(
+                        drmConfiguration.licenseUri.toString(),
+                        drmConfiguration.forceDefaultLicenseUri,
+                        dataSourceFactory,
+                        drmConfiguration.licenseRequestHeaders,
+                        new DrmSessionEventListener.EventDispatcher());
+                try {
+                  keySetId = offlineLicenseHelper.downloadLicense(format);
+                } catch (DrmSession.DrmSessionException e) {
+                  drmSessionException = e;
+                } finally {
+                  offlineLicenseHelper.release();
+                  new Handler(Looper.getMainLooper())
+                      .post(
+                          () -> {
+                            if (drmSessionException != null) {
+                              dialogHelper.onOfflineLicenseFetchedError(drmSessionException);
+                            } else {
+                              dialogHelper.onOfflineLicenseFetched(
+                                  downloadHelper, checkNotNull(keySetId));
+                            }
+                          });
+                }
+              });
     }
   }
 }