Merge branch 'main' into resumeintime

Author: nift4

RELEASENOTES.md

@@ -1495,6 +1495,23 @@ package androidx.media3.exoplayer.util {
 
 }
 
+package androidx.media3.muxer {
+
+  public final class MediaMuxerCompat {
+    ctor public MediaMuxerCompat(java.io.FileDescriptor, int) throws java.io.IOException;
+    ctor public MediaMuxerCompat(String, int) throws java.io.IOException;
+    method public int addTrack(android.media.MediaFormat);
+    method public void release();
+    method public void setLocation(@FloatRange(from=-90.0, to=90.0) float, @FloatRange(from=-180.0, to=180.0) float);
+    method public void setOrientationHint(int);
+    method public void start();
+    method public void stop();
+    method public void writeSampleData(int, java.nio.ByteBuffer, android.media.MediaCodec.BufferInfo);
+    field public static final int OUTPUT_FORMAT_MP4 = 0; // 0x0
+  }
+
+}
+
 package androidx.media3.session {
 
   public final class CommandButton {
@@ -1858,6 +1875,7 @@ package androidx.media3.session {
 
   @com.google.errorprone.annotations.DoNotMock public class MediaSession {
     method public final void broadcastCustomCommand(androidx.media3.session.SessionCommand, android.os.Bundle);
+    method public static int getBitmapDimensionLimit(android.content.Context);
     method public final java.util.List<androidx.media3.session.MediaSession.ControllerInfo> getConnectedControllers();
     method @Nullable public final androidx.media3.session.MediaSession.ControllerInfo getControllerForCurrentRequest();
     method public final String getId();

api.txt

@@ -17,7 +17,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.8.1'
+        classpath 'com.android.tools.build:gradle:8.12.3'
         classpath 'com.google.android.gms:strict-version-matcher-plugin:1.2.4'
         classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20'
         classpath 'org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.20'

build.gradle

@@ -21,7 +21,7 @@ project.ext {
     // Upgrading this requires [Internal ref: b/193254928] to be fixed, or some
     // additional robolectric config.
     targetSdkVersion = 31
-    compileSdkVersion = 36
+    compileSdkVersion = 35
     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
@@ -43,13 +43,17 @@ project.ext {
     androidxAnnotationExperimentalVersion = '1.3.1'
     androidxAppCompatVersion = '1.6.1'
     androidxCollectionVersion = '1.2.0'
+    androidxComposeBomVersion = '2024.12.01'
+    androidxConcurrentFuturesVersion = '1.2.0'
     androidxConstraintLayoutVersion = '2.1.4'
     androidxCoreVersion = '1.8.0'
     androidxExifInterfaceVersion = '1.3.6'
     androidxLifecycleVersion = '2.8.7'
     androidxMediaVersion = '1.7.0'
+    androidxNavigationVersion = '2.9.4'
     androidxRecyclerViewVersion = '1.3.0'
     androidxMaterialVersion = '1.8.0'
+    androidxMediaRouterVersion = '1.8.1'
     androidxTestCoreVersion = '1.5.0'
     androidxTestUiAutomatorVersion = '2.3.0'
     androidxWindowVersion = '1.3.0'
@@ -58,8 +62,11 @@ project.ext {
     androidxTestRunnerVersion = '1.5.2'
     androidxTestRulesVersion = '1.5.0'
     androidxTestTruthVersion = '1.5.0'
+    desugarJdkLibsVersion = '2.1.5'
+    lottieVersion = '6.6.0'
     truthVersion = '1.4.0'
     okhttpVersion = '4.12.0'
+    testParameterInjectorVersion = '1.18'
     modulePrefix = ':'
     if (gradle.ext.has('androidxMediaModulePrefix')) {
         modulePrefix += gradle.ext.androidxMediaModulePrefix

constants.gradle

@@ -54,6 +54,8 @@ include modulePrefix + 'lib-ui-leanback'
 project(modulePrefix + 'lib-ui-leanback').projectDir = new File(rootDir, 'libraries/ui_leanback')
 include modulePrefix + 'lib-ui-compose'
 project(modulePrefix + 'lib-ui-compose').projectDir = new File(rootDir, 'libraries/ui_compose')
+include modulePrefix + 'lib-ui-compose-material3'
+project(modulePrefix + 'lib-ui-compose-material3').projectDir = new File(rootDir, 'libraries/ui_compose_material3')
 
 include modulePrefix + 'lib-database'
 project(modulePrefix + 'lib-database').projectDir = new File(rootDir, 'libraries/database')
@@ -71,8 +73,6 @@ include modulePrefix + 'lib-decoder'
 project(modulePrefix + 'lib-decoder').projectDir = new File(rootDir, 'libraries/decoder')
 include modulePrefix + 'lib-decoder-av1'
 project(modulePrefix + 'lib-decoder-av1').projectDir = new File(rootDir, 'libraries/decoder_av1')
-include modulePrefix + 'lib-decoder-dav1d'
-project(modulePrefix + 'lib-decoder-dav1d').projectDir = new File(rootDir, 'libraries/decoder_dav1d')
 include modulePrefix + 'lib-decoder-ffmpeg'
 project(modulePrefix + 'lib-decoder-ffmpeg').projectDir = new File(rootDir, 'libraries/decoder_ffmpeg')
 include modulePrefix + 'lib-decoder-flac'
@@ -99,6 +99,9 @@ project(modulePrefix + 'lib-cast').projectDir = new File(rootDir, 'libraries/cas
 include modulePrefix + 'lib-effect'
 project(modulePrefix + 'lib-effect').projectDir = new File(rootDir, 'libraries/effect')
 
+include modulePrefix + 'lib-inspector'
+project(modulePrefix + 'lib-inspector').projectDir = new File(rootDir, 'libraries/inspector')
+
 include modulePrefix + 'lib-muxer'
 project(modulePrefix + 'lib-muxer').projectDir = new File(rootDir, 'libraries/muxer')
 

core_settings.gradle

@@ -64,20 +64,16 @@ android {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.12.01')
-    implementation composeBom
-
-    implementation 'androidx.activity:activity-compose:1.9.0'
+    implementation platform('androidx.compose:compose-bom:' + androidxComposeBomVersion)
     implementation 'androidx.compose.foundation:foundation'
     implementation 'androidx.compose.material3:material3'
-    implementation 'androidx.compose.material:material-icons-extended'
-    implementation 'androidx.compose.ui:ui-tooling-preview'
+
+    implementation 'androidx.activity:activity-compose:1.9.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-compose:' + androidxLifecycleVersion
-    implementation 'com.google.android.material:material:' + androidxMaterialVersion
+    implementation 'androidx.navigation:navigation-compose:' + androidxNavigationVersion
 
     implementation project(modulePrefix + 'lib-exoplayer')
-    implementation project(modulePrefix + 'lib-ui-compose')
-    debugImplementation 'androidx.compose.ui:ui-tooling'
+    implementation project(modulePrefix + 'lib-ui-compose-material3')
 
     // For detecting and debugging leaks only. LeakCanary is not needed for demo app to work.
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:' + leakCanaryVersion

demos/compose/build.gradle

@@ -0,0 +1,114 @@
+[
+  {
+    "name": "Playlists",
+    "samples": [
+      {
+        "name": "Cats -> Dogs",
+        "playlist": [
+          {
+            "uri": "https://html5demos.com/assets/dizzy.mp4"
+          },
+          {
+            "uri": "https://storage.googleapis.com/exoplayer-test-media-1/mkv/android-screens-lavf-56.36.100-aac-avc-main-1280x720.mkv"
+          }
+        ]
+      },
+      {
+        "name": "Video (MKV) -> Audio Only -> Video Only",
+        "playlist": [
+          {
+            "uri": "https://storage.googleapis.com/exoplayer-test-media-1/mkv/android-screens-lavf-56.36.100-aac-avc-main-1280x720.mkv"
+          },
+          {
+            "uri": "https://storage.googleapis.com/exoplayer-test-media-1/gen-3/screens/dash-vod-single-segment/audio-141.mp4"
+          },
+          {
+            "uri": "https://storage.googleapis.com/exoplayer-test-media-1/gen-3/screens/dash-vod-single-segment/video-137.mp4"
+          }
+        ]
+      },
+      {
+        "name": "Horizontal -> Vertical -> Horizontal -> Vertical",
+        "playlist": [
+          {
+            "uri": "https://html5demos.com/assets/dizzy.mp4"
+          },
+          {
+            "uri": "https://storage.googleapis.com/exoplayer-test-media-0/shortform_2.mp4"
+          },
+          {
+            "uri": "https://storage.googleapis.com/exoplayer-test-media-1/gen-3/screens/dash-vod-single-segment/video-vp9-360.webm"
+          },
+          {
+            "uri": "https://storage.googleapis.com/exoplayer-test-media-0/shortform_3.mp4"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "name": "Progressive",
+    "samples": [
+      {
+        "name": "Dizzy (MP4)",
+        "uri": "https://html5demos.com/assets/dizzy.mp4"
+      },
+      {
+        "name": "Apple 10s (AAC)",
+        "uri": "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_4x3/gear0/fileSequence0.aac"
+      },
+      {
+        "name": "Apple 10s (TS)",
+        "uri": "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_4x3/gear1/fileSequence0.ts"
+      },
+      {
+        "name": "Android screens (MKV)",
+        "uri": "https://storage.googleapis.com/exoplayer-test-media-1/mkv/android-screens-lavf-56.36.100-aac-avc-main-1280x720.mkv"
+      },
+      {
+        "name": "Screens 360p (WebM, VP9)",
+        "uri": "https://storage.googleapis.com/exoplayer-test-media-1/gen-3/screens/dash-vod-single-segment/video-vp9-360.webm"
+      },
+      {
+        "name": "Screens 480p (FMP4, H264)",
+        "uri": "https://storage.googleapis.com/exoplayer-test-media-1/gen-3/screens/dash-vod-single-segment/video-avc-baseline-480.mp4"
+      },
+      {
+        "name": "Screens 1080p (FMP4, H264)",
+        "uri": "https://storage.googleapis.com/exoplayer-test-media-1/gen-3/screens/dash-vod-single-segment/video-137.mp4"
+      },
+      {
+        "name": "Screens audio (FMP4)",
+        "uri": "https://storage.googleapis.com/exoplayer-test-media-1/gen-3/screens/dash-vod-single-segment/audio-141.mp4"
+      },
+      {
+        "name": "Google Play (MP3)",
+        "uri": "https://storage.googleapis.com/exoplayer-test-media-0/play.mp3"
+      },
+      {
+        "name": "Google Play (Ogg, Vorbis)",
+        "uri": "https://storage.googleapis.com/exoplayer-test-media-1/ogg/play.ogg"
+      },
+      {
+        "name": "Google Play (Flac)",
+        "uri": "https://storage.googleapis.com/exoplayer-test-media-1/flac/play.flac"
+      },
+      {
+        "name": "Big Buck Bunny 480p (MP4, AV1)",
+        "uri": "https://storage.googleapis.com/downloads.webmproject.org/av1/exoplayer/bbb-av1-480p.mp4"
+      },
+      {
+        "name": "One hour frame counter (MP4)",
+        "uri": "https://storage.googleapis.com/exoplayer-test-media-1/mp4/frame-counter-one-hour.mp4"
+      },
+      {
+        "name": "Immersive Audio Format Sample (MP4, IAMF)",
+        "uri": "https://github.com/AOMediaCodec/libiamf/raw/main/tests/test_000036_s.mp4"
+      },
+      {
+        "name": "MPEG-H HD (MP4, H265)",
+        "uri": "https://media.githubusercontent.com/media/Fraunhofer-IIS/mpegh-test-content/main/TRI_Fileset_17_514H_D1_D2_D3_O1_24bit1080p50.mp4"
+      }
+    ]
+  }
+]