Allow space as a date-time separator in Util.parseXsDateTime

.github/ISSUE_TEMPLATE/bug.yml

@@ -19,6 +19,7 @@ body:
       options:
         - Media3 main branch
         - Media3 pre-release (alpha, beta or RC not in this list)
+        - Media3 1.8.0
         - Media3 1.7.1 (same as 1.6.1)
         - Media3 1.7.0 (do not use)
         - Media3 1.6.1

constants.gradle

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 project.ext {
-    releaseVersion = '1.8.0-alpha01'
-    releaseVersionCode = 1_008_000_0_01
+    releaseVersion = '1.8.0'
+    releaseVersionCode = 1_008_000_3_00
     minSdkVersion = 21
     // See https://developer.android.com/training/cars/media/automotive-os#automotive-module
     automotiveMinSdkVersion = 28

core_settings.gradle

@@ -62,8 +62,6 @@ include modulePrefix + 'lib-datasource'
 project(modulePrefix + 'lib-datasource').projectDir = new File(rootDir, 'libraries/datasource')
 include modulePrefix + 'lib-datasource-cronet'
 project(modulePrefix + 'lib-datasource-cronet').projectDir = new File(rootDir, 'libraries/datasource_cronet')
-include modulePrefix + 'lib-datasource-httpengine'
-project(modulePrefix + 'lib-datasource-httpengine').projectDir = new File(rootDir, 'libraries/datasource_httpengine')
 include modulePrefix + 'lib-datasource-rtmp'
 project(modulePrefix + 'lib-datasource-rtmp').projectDir = new File(rootDir, 'libraries/datasource_rtmp')
 include modulePrefix + 'lib-datasource-okhttp'
@@ -73,8 +71,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'

demos/composition/src/main/java/androidx/media3/demo/composition/CompositionPreviewViewModel.kt

@@ -286,10 +286,7 @@ class CompositionPreviewViewModel(application: Application, val compositionLayou
         else -> 1 // Sequence
       }
     // TODO(b/417365294): Improve how sequences are built
-    val videoSequenceBuilders =
-      MutableList<EditedMediaItemSequence.Builder>(numSequences) { _ ->
-        EditedMediaItemSequence.Builder()
-      }
+    val videoSequenceBuilders = MutableList(numSequences) { EditedMediaItemSequence.Builder() }
     val videoSequences = mutableListOf<EditedMediaItemSequence>()
     for (sequenceIndex in 0 until numSequences) {
       var hasItem = false

demos/composition/src/main/java/androidx/media3/demo/composition/ui/UiComponents.kt

@@ -29,8 +29,6 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.pointer.PointerEventPass
 import androidx.compose.ui.input.pointer.pointerInput

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

@@ -32,6 +32,7 @@
 import androidx.media3.common.Player;
 import androidx.media3.common.util.Assertions;
 import androidx.media3.common.util.GlUtil;
+import androidx.media3.common.util.GlUtil.GlException;
 import androidx.media3.common.util.Util;
 import androidx.media3.datasource.DataSource;
 import androidx.media3.datasource.DefaultDataSource;
@@ -77,10 +78,16 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
     Context context = getApplicationContext();
     boolean requestSecureSurface = getIntent().hasExtra(DRM_SCHEME_EXTRA);
-    if (requestSecureSurface && !GlUtil.isProtectedContentExtensionSupported(context)) {
-      Toast.makeText(
-              context, R.string.error_protected_content_extension_not_supported, Toast.LENGTH_LONG)
-          .show();
+    try {
+      if (requestSecureSurface && !GlUtil.isProtectedContentExtensionSupported(context)) {
+        Toast.makeText(
+                context,
+                R.string.error_protected_content_extension_not_supported,
+                Toast.LENGTH_LONG)
+            .show();
+      }
+    } catch (GlException e) {
+      Toast.makeText(context, R.string.gl_error_occurred, Toast.LENGTH_LONG).show();
     }
 
     VideoProcessingGLSurfaceView videoProcessingGLSurfaceView =

demos/gl/src/main/res/values/strings.xml

@@ -18,5 +18,6 @@
   <string name="application_name">ExoPlayer GL demo</string>
 
   <string name="error_protected_content_extension_not_supported">The GL protected content extension is not supported.</string>
+  <string name="gl_error_occurred">GL error occurred.</string>
 
 </resources>

demos/main/build.gradle

@@ -83,7 +83,6 @@ dependencies {
     implementation project(modulePrefix + 'lib-datasource-cronet')
     implementation project(modulePrefix + 'lib-exoplayer-ima')
     withDecoderExtensionsImplementation project(modulePrefix + 'lib-decoder-av1')
-    withDecoderExtensionsImplementation project(modulePrefix + 'lib-decoder-dav1d')
     withDecoderExtensionsImplementation project(modulePrefix + 'lib-decoder-ffmpeg')
     withDecoderExtensionsImplementation project(modulePrefix + 'lib-decoder-flac')
     withDecoderExtensionsImplementation project(modulePrefix + 'lib-decoder-opus')

demos/main/src/main/java/androidx/media3/demo/main/DownloadTracker.java

@@ -409,10 +409,8 @@ public void execute() {
               () -> {
                 OfflineLicenseHelper offlineLicenseHelper =
                     OfflineLicenseHelper.newWidevineInstance(
-                        drmConfiguration.licenseUri.toString(),
-                        drmConfiguration.forceDefaultLicenseUri,
+                        drmConfiguration,
                         dataSourceFactory,
-                        drmConfiguration.licenseRequestHeaders,
                         new DrmSessionEventListener.EventDispatcher());
                 try {
                   keySetId = offlineLicenseHelper.downloadLicense(format);

demos/session/src/main/java/androidx/media3/demo/session/MainActivity.kt

@@ -116,7 +116,7 @@ class MainActivity : AppCompatActivity() {
   override fun onRequestPermissionsResult(
     requestCode: Int,
     permissions: Array<out String>,
-    grantResults: IntArray
+    grantResults: IntArray,
   ) {
     super.onRequestPermissionsResult(requestCode, permissions, grantResults)
     if (grantResults.isEmpty()) {
@@ -134,7 +134,7 @@ class MainActivity : AppCompatActivity() {
     browserFuture =
       MediaBrowser.Builder(
           this,
-          SessionToken(this, ComponentName(this, PlaybackService::class.java))
+          SessionToken(this, ComponentName(this, PlaybackService::class.java)),
         )
         .buildAsync()
     browserFuture.addListener({ pushRoot() }, ContextCompat.getMainExecutor(this))
@@ -153,7 +153,7 @@ class MainActivity : AppCompatActivity() {
         mediaItem.mediaId,
         /* page= */ 0,
         /* pageSize= */ Int.MAX_VALUE,
-        /* params= */ null
+        /* params= */ null,
       )
 
     subItemMediaList.clear()
@@ -164,7 +164,7 @@ class MainActivity : AppCompatActivity() {
         subItemMediaList.addAll(children)
         mediaListAdapter.notifyDataSetChanged()
       },
-      ContextCompat.getMainExecutor(this)
+      ContextCompat.getMainExecutor(this),
     )
   }
 
@@ -175,7 +175,7 @@ class MainActivity : AppCompatActivity() {
 
   private fun popPathStack() {
     treePathStack.removeLast()
-    if (treePathStack.size == 0) {
+    if (treePathStack.isEmpty()) {
       finish()
       return
     }
@@ -197,14 +197,14 @@ class MainActivity : AppCompatActivity() {
         val root: MediaItem = result.value!!
         pushPathStack(root)
       },
-      ContextCompat.getMainExecutor(this)
+      ContextCompat.getMainExecutor(this),
     )
   }
 
   private class FolderMediaItemArrayAdapter(
     context: Context,
     viewID: Int,
-    mediaItemList: List<MediaItem>
+    mediaItemList: List<MediaItem>,
   ) : ArrayAdapter<MediaItem>(context, viewID, mediaItemList) {
     override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
       val mediaItem = getItem(position)!!

demos/session_service/src/main/java/androidx/media3/demo/session/DemoPlaybackService.kt

@@ -161,12 +161,11 @@ open class DemoPlaybackService : MediaLibraryService() {
           // The media session always supports skip, except at the start and end of the playlist.
           // Reserve the space for the skip action in these cases to avoid custom actions jumping
           // around when the user skips.
-          mediaLibrarySession.setSessionExtras(
+          mediaLibrarySession.sessionExtras =
             bundleOf(
               MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_PREV to true,
               MediaConstants.EXTRAS_KEY_SLOT_RESERVATION_SEEK_TO_NEXT to true,
             )
-          )
         }
   }
 

demos/shortform/src/main/java/androidx/media3/demo/shortform/MediaItemDatabase.kt

@@ -29,7 +29,7 @@ class MediaItemDatabase {
     )
 
   fun get(index: Int): MediaItem {
-    val uri = mediaUris.get(index.mod(mediaUris.size))
+    val uri = mediaUris[index.mod(mediaUris.size)]
     return MediaItem.Builder().setUri(uri).setMediaId(index.toString()).build()
   }
 }

docsamples/build.gradle

@@ -0,0 +1,35 @@
+// Copyright 2023 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+apply from: "$gradle.ext.androidxMediaSettingsDir/common_library_config.gradle"
+
+apply plugin: 'kotlin-android'
+
+android {
+    namespace 'androidx.media3.docsamples'
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    defaultConfig {
+        minSdkVersion 23
+    }
+}
+
+dependencies {
+    implementation project(modulePrefix + 'lib-exoplayer')
+    implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
+    implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
+    implementation 'androidx.activity:activity-compose:1.9.0'
+}

libraries/decoder_dav1d/src/main/AndroidManifest.xml → docsamples/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2024 The Android Open Source Project
+<!-- Copyright 2023 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<manifest package="androidx.media3.decoder.dav1d">
+<manifest package="androidx.media3.docsamples">
   <uses-sdk />
 </manifest>

docsamples/src/main/java/androidx/media3/docsamples/PreloadManagerKotlinSnippets.kt

@@ -0,0 +1,137 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.media3.docsamples
+
+import android.os.Bundle
+import androidx.annotation.OptIn
+import androidx.appcompat.app.AppCompatActivity
+import androidx.media3.common.C
+import androidx.media3.common.MediaItem
+import androidx.media3.common.util.UnstableApi
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.source.preload.DefaultPreloadManager
+import androidx.media3.exoplayer.source.preload.TargetPreloadStatusControl
+import java.lang.Math.abs
+
+// constants to make the code snippets work
+const val currentPlayingIndex = 10
+
+@UnstableApi
+// [START android_defaultpreloadmanager_MyTargetPreloadStatusControl]
+class MyTargetPreloadStatusControl(currentPlayingIndex: Int = C.INDEX_UNSET) :
+  TargetPreloadStatusControl<Int, DefaultPreloadManager.PreloadStatus> {
+
+  override fun getTargetPreloadStatus(index: Int): DefaultPreloadManager.PreloadStatus? {
+    if (index - currentPlayingIndex == 1) { // next track
+      // return a PreloadStatus that is labelled by STAGE_SPECIFIED_RANGE_LOADED and
+      // suggest loading 3000ms from the default start position
+      return DefaultPreloadManager.PreloadStatus.specifiedRangeLoaded(3000L)
+    } else if (index - currentPlayingIndex == -1) { // previous track
+      // return a PreloadStatus that is labelled by STAGE_SPECIFIED_RANGE_LOADED and
+      // suggest loading 3000ms from the default start position
+      return DefaultPreloadManager.PreloadStatus.specifiedRangeLoaded(3000L)
+    } else if (abs(index - currentPlayingIndex) == 2) {
+      // return a PreloadStatus that is labelled by STAGE_TRACKS_SELECTED
+      return DefaultPreloadManager.PreloadStatus.TRACKS_SELECTED
+    } else if (abs(index - currentPlayingIndex) <= 4) {
+      // return a PreloadStatus that is labelled by STAGE_SOURCE_PREPARED
+      return DefaultPreloadManager.PreloadStatus.SOURCE_PREPARED
+    }
+    return null
+  }
+}
+
+// [END android_defaultpreloadmanager_MyTargetPreloadStatusControl]
+
+class PreloadManagerSnippetsKotlin {
+
+  class PreloadSnippetsActivity : AppCompatActivity() {
+    private val context = this
+
+    @OptIn(UnstableApi::class)
+    override fun onCreate(savedInstanceState: Bundle?) {
+      super.onCreate(savedInstanceState)
+
+      // [START android_defaultpreloadmanager_createPLM]
+      val targetPreloadStatusControl = MyTargetPreloadStatusControl()
+      val preloadManagerBuilder = DefaultPreloadManager.Builder(context, targetPreloadStatusControl)
+      val preloadManager = preloadManagerBuilder.build()
+      // [END android_defaultpreloadmanager_createPLM]
+
+      val player = preloadManagerBuilder.buildExoPlayer()
+
+      // [START android_defaultpreloadmanager_addMedia]
+      val initialMediaItems = pullMediaItemsFromService(count = 20)
+      for (index in 0 until initialMediaItems.size) {
+        preloadManager.add(initialMediaItems.get(index), /* rankingData= */ index)
+      }
+      // items aren't actually loaded yet! need to call invalidate() after this
+      // [END android_defaultpreloadmanager_addMedia]
+
+      // [START android_defaultpreloadmanager_invalidate]
+      preloadManager.invalidate()
+      // [END android_defaultpreloadmanager_invalidate]
+    }
+
+    @OptIn(UnstableApi::class)
+    private fun fetchMedia(
+      preloadManager: DefaultPreloadManager,
+      mediaItem: MediaItem,
+      player: ExoPlayer,
+      currentIndex: Int,
+    ) {
+      // [START android_defaultpreloadmanager_getAndPlayMedia]
+      // When a media item is about to display on the screen
+      val mediaSource = preloadManager.getMediaSource(mediaItem)
+      if (mediaSource != null) {
+        player.setMediaSource(mediaSource)
+      } else {
+        // If mediaSource is null, that mediaItem hasn't been added to the preload manager
+        // yet. So, send it directly to the player when it's about to play
+        player.setMediaItem(mediaItem)
+      }
+      player.prepare()
+
+      // When the media item is displaying at the center of the screen
+      player.play()
+      preloadManager.setCurrentPlayingIndex(currentIndex)
+
+      // Need to call invalidate() to update the priorities
+      preloadManager.invalidate()
+      // [END android_defaultpreloadmanager_getAndPlayMedia]
+    }
+
+    @OptIn(UnstableApi::class)
+    private fun removeMedia(mediaItem: MediaItem, preloadManager: DefaultPreloadManager) {
+      // [START android_defaultpreloadmanager_removeItem]
+      preloadManager.remove(mediaItem)
+      // [END android_defaultpreloadmanager_removeItem]
+    }
+
+    @OptIn(UnstableApi::class)
+    private fun releasePLM(preloadManager: DefaultPreloadManager) {
+      // [START android_defaultpreloadmanager_releasePLM]
+      preloadManager.release()
+      // [END android_defaultpreloadmanager_releasePLM]
+    }
+
+    // no-op methods to support the code snippets
+    private fun pullMediaItemsFromService(count: Int): List<MediaItem> {
+      return listOf()
+    }
+  }
+}