Merge branch 'main' of https://github.com/androidx/media

androidx · Oct 18, 2023 · 563aaf0 · 563aaf0
2 parents e3a81ce + ff330bd
commit 563aaf0
Show file tree

Hide file tree

Showing 326 changed files with 6,544 additions and 1,632 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -4,45 +4,99 @@
 
 *   Common Library:
 *   ExoPlayer:
+    *   Add luma and chroma bitdepth to `ColorInfo`
+        [#491](https://github.com/androidx/media/pull/491).
 *   Transformer:
+    *   Add support for flattening H.265/HEVC SEF slow motion videos.
 *   Track Selection:
+    *   Add `DefaultTrackSelector.Parameters.allowAudioNonSeamlessAdaptiveness`
+        to explicitly allow or disallow non-seamless adaptation. The default
+        stays at its current behavior of `true`.
 *   Extractors:
 *   Audio:
+    *   Fix DTS Express audio buffer underflow issue
+        ([#650](https://github.com/androidx/media/pull/650)).
 *   Video:
 *   Text:
+    *   Remove `ExoplayerCuesDecoder`. Text tracks with `sampleMimeType =
+        application/x-media3-cues` are now directly handled by `TextRenderer`
+        without needing a `SubtitleDecoder` instance.
 *   Metadata:
-    *   `MetadataDecoder.decode` will no longer be called for "decode-only"
-        samples as the implementation must return null anyway.
 *   DRM:
 *   Effect:
 *   Muxers:
 *   IMA extension:
 *   Session:
-    *   Add session demo module for Automotive OS and enable session demo for
-        Android Auto.
+    *   Do not set the queue of the framework session when
+        `COMMAND_GET_TIMELINE` is not available for the media notification
+        controller. With Android Auto as the client controller reading from the
+        framework session, this has the effect that the `queue` button in the UI
+        of Android Auto is not displayed
+        (([#339](https://github.com/androidx/media/issues/339)).
 *   UI:
 *   Downloads:
 *   OkHttp Extension:
 *   Cronet Extension:
 *   RTMP Extension:
 *   HLS Extension:
+    *   Refresh the HLS live playlist with an interval calculated from the last
+        load start time rather than the last load completed time
+        ([#663](https://github.com/androidx/media/issues/663)).
 *   DASH Extension:
-    *   Allow multiple of the same DASH identifier in segment template url.
+    *   Add experimental support for parsing subtitles during extraction. This
+        has better support for merging overlapping subtitles, including
+        resolving flickering when transitioning between subtitle segments. You
+        can enable this using
+        `DashMediaSource.Factory.experimentalParseSubtitlesDuringExtraction()`
+        ([#288](https://github.com/androidx/media/issues/288)).
 *   Smooth Streaming Extension:
 *   RTSP Extension:
-*   Decoder Extensions (FFmpeg, VP9, AV1, etc.):
-    *   Add `DecoderOutputBuffer.shouldBeSkipped` to directly mark output
-        buffers that don't need to be presented. This is preferred over
-        `C.BUFFER_FLAG_DECODE_ONLY`.
-*   MIDI extension:
+*   Decoder Extensions (FFmpeg, VP9, AV1, MIDI, etc.):
+    *   Fix bug publishing MIDI decoder artifact to Maven repository. The
+        artifact is renamed to `media3-exoplayer-midi`
+        ([#734](https://github.com/androidx/media/issues/734)).
 *   Leanback extension:
 *   Cast Extension:
 *   Test Utilities:
 *   Remove deprecated symbols:
+    *   Remove deprecated `DownloadNotificationHelper.buildProgressNotification`
+        method, use a non deprecated method that takes a `notMetRequirements`
+        parameter instead.
 
 ## 1.2
 
-### 1.2.0-alpha02 (2023-089-29)
+### 1.2.0-beta01 (2023-10-18)
+
+This release includes the following changes since the
+[1.2.0-alpha02 release](#120-alpha02-2023-09-29)):
+
+*   Audio:
+    *   Add `onAudioTrackInitialized` and `onAudioTrackReleased` callbacks to
+        `AnalyticsListener`, `AudioRendererEventListener` and
+        `AudioSink.Listener`.
+*   Metadata:
+    *   `MetadataDecoder.decode` will no longer be called for "decode-only"
+        samples as the implementation must return null anyway.
+*   Session:
+    *   Add session demo module for Automotive OS and enable session demo for
+        Android Auto.
+*   DASH Extension:
+    *   Allow multiple of the same DASH identifier in segment template url.
+*   Smooth Streaming Extension:
+*   RTSP Extension:
+    *   Use RTSP Setup Response timeout value in time interval of sending
+        keep-alive RTSP Options requests
+        ([#662](https://github.com/androidx/media/issues/662)).
+*   Decoder Extensions (FFmpeg, VP9, AV1, MIDI, etc.):
+    *   Add `DecoderOutputBuffer.shouldBeSkipped` to directly mark output
+        buffers that don't need to be presented. This is preferred over
+        `C.BUFFER_FLAG_DECODE_ONLY` that will be deprecated.
+    *   Add `Decoder.setOutputStartTimeUs` and
+        `SimpleDecoder.isAtLeastOutputStartTimeUs` to allow decoders to drop
+        decode-only samples before the start time. This should be preferred to
+        `Buffer.isDecodeOnly` that will be deprecated.
+
+### 1.2.0-alpha02 (2023-09-29)
 
 This release includes the following changes since the
 [1.2.0-alpha01 release](#120-alpha01-2023-08-17)):
@@ -89,6 +143,8 @@ This release includes the following changes since the
     *   Renamed `onExperimentalSleepingForOffloadChanged` as
         `onSleepingForOffloadChanged` and `onExperimentalOffloadedPlayback` as
         `onOffloadedPlayback`.
+    *   Move audio offload mode related `TrackSelectionParameters` interfaces
+        and definitions to an inner `AudioOffloadPreferences` class.
 *   Effect:
     *   Changed `frameRate` and `durationUs` parameters of
         `VideoFrameProcessor.queueInputBitmap` to `TimestampIterator`.

diff --git a/api.txt b/api.txt
@@ -226,8 +226,8 @@ package androidx.media3.common {
 
   public final class MediaItem {
     method public androidx.media3.common.MediaItem.Builder buildUpon();
-    method public static androidx.media3.common.MediaItem fromUri(String);
     method public static androidx.media3.common.MediaItem fromUri(android.net.Uri);
+    method public static androidx.media3.common.MediaItem fromUri(String);
     field public static final String DEFAULT_MEDIA_ID = "";
     field public static final androidx.media3.common.MediaItem EMPTY;
     field public final androidx.media3.common.MediaItem.ClippingConfiguration clippingConfiguration;
@@ -264,8 +264,8 @@ package androidx.media3.common {
     method public androidx.media3.common.MediaItem.Builder setRequestMetadata(androidx.media3.common.MediaItem.RequestMetadata);
     method public androidx.media3.common.MediaItem.Builder setSubtitleConfigurations(java.util.List<androidx.media3.common.MediaItem.SubtitleConfiguration>);
     method public androidx.media3.common.MediaItem.Builder setTag(@Nullable Object);
-    method public androidx.media3.common.MediaItem.Builder setUri(@Nullable String);
     method public androidx.media3.common.MediaItem.Builder setUri(@Nullable android.net.Uri);
+    method public androidx.media3.common.MediaItem.Builder setUri(@Nullable String);
   }
 
   public static class MediaItem.ClippingConfiguration {
@@ -617,8 +617,8 @@ package androidx.media3.common {
 
   public class PlaybackException extends java.lang.Exception {
     method @CallSuper public boolean errorInfoEquals(@Nullable androidx.media3.common.PlaybackException);
-    method public static String getErrorCodeName(@androidx.media3.common.PlaybackException.ErrorCode int);
     method public final String getErrorCodeName();
+    method public static String getErrorCodeName(@androidx.media3.common.PlaybackException.ErrorCode int);
     field public static final int CUSTOM_ERROR_CODE_BASE = 1000000; // 0xf4240
     field public static final int ERROR_CODE_AUDIO_TRACK_INIT_FAILED = 5001; // 0x1389
     field public static final int ERROR_CODE_AUDIO_TRACK_WRITE_FAILED = 5002; // 0x138a
@@ -674,8 +674,8 @@ package androidx.media3.common {
     method public void addListener(androidx.media3.common.Player.Listener);
     method public void addMediaItem(androidx.media3.common.MediaItem);
     method public void addMediaItem(int, androidx.media3.common.MediaItem);
-    method public void addMediaItems(java.util.List<androidx.media3.common.MediaItem>);
     method public void addMediaItems(int, java.util.List<androidx.media3.common.MediaItem>);
+    method public void addMediaItems(java.util.List<androidx.media3.common.MediaItem>);
     method public boolean canAdvertiseSession();
     method public void clearMediaItems();
     method public void clearVideoSurface();
@@ -751,8 +751,8 @@ package androidx.media3.common {
     method public void replaceMediaItems(int, int, java.util.List<androidx.media3.common.MediaItem>);
     method public void seekBack();
     method public void seekForward();
-    method public void seekTo(long);
     method public void seekTo(int, long);
+    method public void seekTo(long);
     method public void seekToDefaultPosition();
     method public void seekToDefaultPosition(int);
     method public void seekToNext();
@@ -765,8 +765,8 @@ package androidx.media3.common {
     method @Deprecated public void setDeviceVolume(@IntRange(from=0) int);
     method public void setDeviceVolume(@IntRange(from=0) int, int);
     method public void setMediaItem(androidx.media3.common.MediaItem);
-    method public void setMediaItem(androidx.media3.common.MediaItem, long);
     method public void setMediaItem(androidx.media3.common.MediaItem, boolean);
+    method public void setMediaItem(androidx.media3.common.MediaItem, long);
     method public void setMediaItems(java.util.List<androidx.media3.common.MediaItem>);
     method public void setMediaItems(java.util.List<androidx.media3.common.MediaItem>, boolean);
     method public void setMediaItems(java.util.List<androidx.media3.common.MediaItem>, int, long);
@@ -1522,8 +1522,8 @@ package androidx.media3.session {
     method public final void addListener(androidx.media3.common.Player.Listener);
     method public final void addMediaItem(androidx.media3.common.MediaItem);
     method public final void addMediaItem(int, androidx.media3.common.MediaItem);
-    method public final void addMediaItems(java.util.List<androidx.media3.common.MediaItem>);
     method public final void addMediaItems(int, java.util.List<androidx.media3.common.MediaItem>);
+    method public final void addMediaItems(java.util.List<androidx.media3.common.MediaItem>);
     method public final boolean canAdvertiseSession();
     method public final void clearMediaItems();
     method public final void clearVideoSurface();
@@ -1590,8 +1590,8 @@ package androidx.media3.session {
     method public final boolean isLoading();
     method public final boolean isPlaying();
     method public final boolean isPlayingAd();
-    method public final boolean isSessionCommandAvailable(@androidx.media3.session.SessionCommand.CommandCode int);
     method public final boolean isSessionCommandAvailable(androidx.media3.session.SessionCommand);
+    method public final boolean isSessionCommandAvailable(@androidx.media3.session.SessionCommand.CommandCode int);
     method public final void moveMediaItem(int, int);
     method public final void moveMediaItems(int, int, int);
     method public final void pause();
@@ -1606,8 +1606,8 @@ package androidx.media3.session {
     method public final void replaceMediaItems(int, int, java.util.List<androidx.media3.common.MediaItem>);
     method public final void seekBack();
     method public final void seekForward();
-    method public final void seekTo(long);
     method public final void seekTo(int, long);
+    method public final void seekTo(long);
     method public final void seekToDefaultPosition();
     method public final void seekToDefaultPosition(int);
     method public final void seekToNext();
@@ -1621,17 +1621,17 @@ package androidx.media3.session {
     method @Deprecated public final void setDeviceVolume(@IntRange(from=0) int);
     method public final void setDeviceVolume(@IntRange(from=0) int, @androidx.media3.common.C.VolumeFlags int);
     method public final void setMediaItem(androidx.media3.common.MediaItem);
-    method public final void setMediaItem(androidx.media3.common.MediaItem, long);
     method public final void setMediaItem(androidx.media3.common.MediaItem, boolean);
+    method public final void setMediaItem(androidx.media3.common.MediaItem, long);
     method public final void setMediaItems(java.util.List<androidx.media3.common.MediaItem>);
     method public final void setMediaItems(java.util.List<androidx.media3.common.MediaItem>, boolean);
     method public final void setMediaItems(java.util.List<androidx.media3.common.MediaItem>, int, long);
     method public final void setPlayWhenReady(boolean);
     method public final void setPlaybackParameters(androidx.media3.common.PlaybackParameters);
     method public final void setPlaybackSpeed(float);
     method public final void setPlaylistMetadata(androidx.media3.common.MediaMetadata);
-    method public final com.google.common.util.concurrent.ListenableFuture<androidx.media3.session.SessionResult> setRating(String, androidx.media3.common.Rating);
     method public final com.google.common.util.concurrent.ListenableFuture<androidx.media3.session.SessionResult> setRating(androidx.media3.common.Rating);
+    method public final com.google.common.util.concurrent.ListenableFuture<androidx.media3.session.SessionResult> setRating(String, androidx.media3.common.Rating);
     method public final void setRepeatMode(@androidx.media3.common.Player.RepeatMode int);
     method public final void setShuffleModeEnabled(boolean);
     method public final void setTrackSelectionParameters(androidx.media3.common.TrackSelectionParameters);
@@ -1743,8 +1743,8 @@ package androidx.media3.session {
     method public default void onDisconnected(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo);
     method @Deprecated @androidx.media3.session.SessionResult.Code public default int onPlayerCommandRequest(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo, @androidx.media3.common.Player.Command int);
     method public default void onPostConnect(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo);
-    method public default com.google.common.util.concurrent.ListenableFuture<androidx.media3.session.SessionResult> onSetRating(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo, String, androidx.media3.common.Rating);
     method public default com.google.common.util.concurrent.ListenableFuture<androidx.media3.session.SessionResult> onSetRating(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo, androidx.media3.common.Rating);
+    method public default com.google.common.util.concurrent.ListenableFuture<androidx.media3.session.SessionResult> onSetRating(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo, String, androidx.media3.common.Rating);
   }
 
   public static final class MediaSession.ConnectionResult {

diff --git a/constants.gradle b/constants.gradle
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 project.ext {
-    releaseVersion = '1.2.0-alpha02'
-    releaseVersionCode = 1_002_000_0_02
+    releaseVersion = '1.2.0-beta01'
+    releaseVersionCode = 1_002_000_1_01
     minSdkVersion = 16
     // See https://developer.android.com/training/cars/media/automotive-os#automotive-module
     automotiveMinSdkVersion = 28

diff --git a/demos/cast/src/main/java/androidx/media3/demo/cast/package-info.java b/demos/cast/src/main/java/androidx/media3/demo/cast/package-info.java
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 @NonNullApi
+@OptIn(markerClass = UnstableApi.class)
 package androidx.media3.demo.cast;
 
+import androidx.annotation.OptIn;
 import androidx.media3.common.util.NonNullApi;
+import androidx.media3.common.util.UnstableApi;
diff --git a/demos/gl/src/main/java/androidx/media3/demo/gl/package-info.java b/demos/gl/src/main/java/androidx/media3/demo/gl/package-info.java
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 @NonNullApi
+@OptIn(markerClass = UnstableApi.class)
 package androidx.media3.demo.gl;
 
+import androidx.annotation.OptIn;
 import androidx.media3.common.util.NonNullApi;
+import androidx.media3.common.util.UnstableApi;
diff --git a/demos/main/src/main/assets/media.exolist.json b/demos/main/src/main/assets/media.exolist.json
@@ -260,13 +260,6 @@
       {
         "name": "Super speed (MP4, H264, Clear)",
         "uri": "https://playready.directtaps.net/smoothstreaming/SSWSS720H264/SuperSpeedway_720.ism/Manifest"
-      },
-      {
-        "name": "Super speed (MP4, H264, PlayReady)",
-        "uri": "https://playready.directtaps.net/smoothstreaming/SSWSS720H264PR/SuperSpeedway_720.ism/Manifest",
-        "drm_scheme": "playready",
-        "drm_license_uri": "https://playready.directtaps.net/pr/svc/rightsmanager.asmx",
-        "drm_force_default_license_uri": true
       }
     ]
   },

diff --git a/demos/session/src/main/AndroidManifest.xml b/demos/session/src/main/AndroidManifest.xml
@@ -61,6 +61,7 @@
       <intent-filter>
         <action android:name="androidx.media3.session.MediaSessionService"/>
         <action android:name="android.media.browse.MediaBrowserService"/>
+        <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH"/>
       </intent-filter>
     </service>
 

diff --git a/demos/session/src/main/java/androidx/media3/demo/session/MainActivity.kt b/demos/session/src/main/java/androidx/media3/demo/session/MainActivity.kt
@@ -15,8 +15,11 @@
  */
 package androidx.media3.demo.session
 
+import android.Manifest
 import android.content.ComponentName
 import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.MenuItem
@@ -25,6 +28,7 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.ListView
 import android.widget.TextView
+import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -81,6 +85,14 @@ class MainActivity : AppCompatActivity() {
         }
       }
     )
+
+    if (
+      Build.VERSION.SDK_INT >= 33 &&
+        checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) !=
+          PackageManager.PERMISSION_GRANTED
+    ) {
+      requestPermissions(arrayOf(Manifest.permission.POST_NOTIFICATIONS), /* requestCode= */ 0)
+    }
   }
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -101,6 +113,23 @@ class MainActivity : AppCompatActivity() {
     super.onStop()
   }
 
+  override fun onRequestPermissionsResult(
+    requestCode: Int,
+    permissions: Array<out String>,
+    grantResults: IntArray
+  ) {
+    super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+    if (grantResults.isEmpty()) {
+      // Empty results are triggered if a permission is requested while another request was already
+      // pending and can be safely ignored in this case.
+      return
+    }
+    if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {
+      Toast.makeText(applicationContext, R.string.notification_permission_denied, Toast.LENGTH_LONG)
+        .show()
+    }
+  }
+
   private fun initializeBrowser() {
     browserFuture =
       MediaBrowser.Builder(

diff --git a/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt b/demos/session/src/main/java/androidx/media3/demo/session/PlayableFolderActivity.kt
@@ -43,7 +43,7 @@ import com.google.common.util.concurrent.ListenableFuture
 class PlayableFolderActivity : AppCompatActivity() {
   private lateinit var browserFuture: ListenableFuture<MediaBrowser>
   private val browser: MediaBrowser?
-    get() = if (browserFuture.isDone) browserFuture.get() else null
+    get() = if (browserFuture.isDone && !browserFuture.isCancelled) browserFuture.get() else null
 
   private lateinit var mediaList: ListView
   private lateinit var mediaListAdapter: PlayableMediaItemArrayAdapter
@@ -88,7 +88,7 @@ class PlayableFolderActivity : AppCompatActivity() {
       browser.shuffleModeEnabled = true
       browser.prepare()
       browser.play()
-      browser?.sessionActivity?.send()
+      browser.sessionActivity?.send()
     }
 
     findViewById<Button>(R.id.play_button).setOnClickListener {