diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 076324f5fb9..817b4d0fb14 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -5,41 +5,27 @@ 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.1.1 - - Media3 1.1.0 - - Media3 1.0.2 - - Media3 1.0.1 - - Media3 1.0.0 - - Media3 1.0.0-rc02 - - Media3 1.0.0-rc01 - - Media3 1.0.0-beta03 - - Media3 1.0.0-beta02 - - Media3 1.0.0-beta01 - - Media3 1.0.0-alpha03 - - Media3 1.0.0-alpha02 - - Media3 1.0.0-alpha01 - - Media3 `main` branch + - Media3 1.2.1 + - Media3 1.2.0 + - 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.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 @@ -54,14 +40,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 diff --git a/RELEASENOTES.md b/RELEASENOTES.md index e8779c4cccd..372e3faf531 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,138 +1,98 @@ # Release notes -### Unreleased changes +## 1.2 + +### 1.2.1 (2024-01-09) + +This release includes the following changes since the +[1.2.0 release](#120-2023-11-15): -* Common Library: * ExoPlayer: + * Fix issue where manual seeks outside of the + `LiveConfiguration.min/maxOffset` range keep adjusting the offset back + to `min/maxOffset`. + * Fix issue that OPUS and VORBIS channel layouts are wrong for 3, 5, 6, 7 + and 8 channels + ([#8396](https://github.com/google/ExoPlayer/issues/8396)). + * Fix issue where track selections after seek to zero in a live stream + incorrectly let the stream start at its default position + ([#9347](https://github.com/google/ExoPlayer/issues/9347)). + * Fix the issue where new instances of `CmcdData.Factory` were receiving + negative values for `bufferedDurationUs` from chunk sources, resulting + in an `IllegalArgumentException` + ([#888](https://github.com/androidx/media/issues/888)). * Transformer: -* Track Selection: + * Work around an issue where the encoder would throw at configuration time + due to setting a high operating rate. * Extractors: + * Mark secondary (unplayable) HEVC tracks in JPEG motion photos as + `ROLE_FLAG_ALTERNATE` to prevent them being automatically selected for + playback because of their higher resolution. + * Fix wrong keyframe detection for TS H264 streams + ([#864](https://github.com/androidx/media/pull/864)). + * Fix duration estimation of TS streams that are longer than 47721 seconds + ([#855](https://github.com/androidx/media/issues/855)). * Audio: + * Fix handling of EOS for `SilenceSkippingAudioProcessor` when called + multiple times ([#712](https://github.com/androidx/media/issues/712)). * Video: -* Text: + * Add workaround for a device issue on Galaxy Tab S7 FE, Chromecast with + Google TV, and Lenovo M10 FHD Plus that causes 60fps AVC streams to be + marked as unsupported + ([#693](https://github.com/androidx/media/issues/693)). * Metadata: + * Fix bug where `MediaMetadata` was only populated from Vorbis comments + with upper-case keys + ([#876](https://github.com/androidx/media/issues/876)). + * Catch `OutOfMemoryError` when parsing very large ID3 frames, meaning + playback can continue without the tag info instead of playback failing + completely. * DRM: -* Effect: -* Muxers: -* IMA extension: + * Extend workaround for spurious ClearKey `https://default.url` license + URL to API 33+ (previously the workaround only applied on API 33 + exactly) ([#837](https://github.com/androidx/media/pull/837)). + * Fix `ERROR_DRM_SESSION_NOT_OPENED` when switching from encrypted to + clear content without a surface attached to the player. The error was + due to incorrectly using a secure decoder to play the clear content. * Session: - * Add session demo module for Automotive OS and enable session demo for - Android Auto. + * Put the custom keys and values in `MediaMetadataCompat` to + `MediaMetadata.extras` and `MediaMetadata.extras` to + `MediaMetadataCompat` + ([#756](https://github.com/androidx/media/issues/756), + [#802](https://github.com/androidx/media/issues/802)). + * Fix broadcasting `notifyChildrenChanged` for legacy controllers + ([#644](https://github.com/androidx/media/issues/644)). + * Fix a bug where setting a negative time for a disabled `setWhen` timer + of the notification caused a crash on some devices + ([#903](https://github.com/androidx/media/issues/903)). + * Fix `IllegalStateException` when the media notification controller + hasn't completed connecting when the first notification update is + requested ([#917](https://github.com/androidx/media/issues/917)). * UI: -* Downloads: -* OkHttp Extension: -* Cronet Extension: -* RTMP Extension: -* HLS Extension: -* Smooth Streaming Extension: -* RTSP Extension: -* Decoder Extensions (FFmpeg, VP9, AV1, etc.): -* MIDI extension: -* Leanback extension: + * Fix issue where forward and rewind buttons are not visible when used + with Material Design in a BottomSheetDialogFragment + ([#511](https://github.com/androidx/media/issues/511)). + * Fix issue where the numbers in the fast forward button of the + `PlayerControlView` were misaligned + ([#547](https://github.com/androidx/media/issues/547)). +* DASH Extension: + * Parse "f800" as channel count of 5 for Dolby in DASH manifest + ([#688](https://github.com/androidx/media/issues/688)). +* Decoder Extensions (FFmpeg, VP9, AV1, MIDI, etc.): + * MIDI: Fix issue where seeking forward skips the Program Change events + ([#704](https://github.com/androidx/media/issues/704)). + * Migrate to FFmpeg 6.0 and update supported NDK to `r26b` + ([#707](https://github.com/androidx/media/pull/707), + [#867](https://github.com/androidx/media/pull/867)). * Cast Extension: -* Test Utilities: -* Remove deprecated symbols: - -## 1.2 + * Sanitize creation of a `Timeline` to not crash the app when loading + media fails on the cast device + ([#708](https://github.com/androidx/media/issues/708)). -### 1.2.0-alpha02 (2023-089-29) +### 1.2.0 (2023-11-15) This release includes the following changes since the -[1.2.0-alpha01 release](#120-alpha01-2023-08-17)): - -* Common Library: - * Upgrade `androidx.annotation:annotation-experimental` to `1.3.1`. This - also introduces a transitive dependency on the Kotlin standard library - from `media3-common`. Apps can - [downgrade to remove this dependency if they want](https://developer.android.com/guide/topics/media/exoplayer/shrinking#remove-kotlin-dep). - Fixes https://issuetracker.google.com/251172715. - * Move `ExoPlayer.setAudioAttributes` to the `Player` interface. -* ExoPlayer: - * Add additional fields to Common Media Client Data (CMCD) logging: next - object request (`nor`) and next range request (`nrr`) - ([#8699](https://github.com/google/ExoPlayer/issues/8699)). - * Add functionality to transmit Common Media Client Data (CMCD) data using - query parameters ([#553](https://github.com/androidx/media/issues/553)). - * Fix `ConcurrentModificationException` in `ExperimentalBandwidthMeter` - ([#612](https://github.com/androidx/media/issues/612)). - * Add `MediaPeriodId` parameter to - `CompositeMediaSource.getMediaTimeForChildMediaTime`. - * Support `ClippingMediaSource` (and other sources with period/window time - offsets) in `ConcatenatingMediaSource2` - ([#11226](https://github.com/google/ExoPlayer/issues/11226)). - * Change `BaseRenderer.onStreamChanged()` to also receive a - `MediaPeriodId` argument. -* Transformer: - * Changed `frameRate` and `durationUs` parameters of - `SampleConsumer.queueInputBitmap` to `TimestampIterator`. -* Extractors: - * Add `BmpExtractor`. - * Add `WebpExtractor`. - * Add `HeifExtractor`. - * Add - [QuickTime classic](https://developer.apple.com/standards/qtff-2001.pdf) - support to `Mp4Extractor`. -* Audio: - * Add support for Opus gapless metadata during offload playback. - * Allow renderer recovery by disabling offload if failed at first write - ([#627](https://github.com/androidx/media/issues/627)). - * Enable Offload Scheduling by default for audio-only offloaded playback. - * Delete `ExoPlayer.experimentalSetOffloadSchedulingEnabled` and - `AudioOffloadListener.onExperimentalOffloadSchedulingEnabledChanged`. - * Renamed `onExperimentalSleepingForOffloadChanged` as - `onSleepingForOffloadChanged` and `onExperimentalOffloadedPlayback` as - `onOffloadedPlayback`. -* Effect: - * Changed `frameRate` and `durationUs` parameters of - `VideoFrameProcessor.queueInputBitmap` to `TimestampIterator`. -* IMA extension: - * Fix bug where a multi-period DASH live stream that is not the first item - in a playlist can throw an exception - ([#571](https://github.com/androidx/media/issues/571)). - * Release StreamManager before calling `AdsLoader.destroy()` - * Bump IMA SDK version to 3.31.0. -* Session: - * Set the notifications foreground service behavior to - `FOREGROUND_SERVICE_IMMEDIATE` in `DefaultMediaNotificationProvider` - ([#167](https://github.com/androidx/media/issues/167)). - * Use only - `android.media.session.MediaSession.setMediaButtonBroadcastReceiver()` - above API 31 to avoid problems with deprecated API on Samsung devices - ([#167](https://github.com/androidx/media/issues/167)). - * Use the media notification controller as proxy to set available commands - and custom layout used to populate the notification and the platform - session. - * Convert media button events that are received by - `MediaSessionService.onStartCommand()` within Media3 instead of routing - them to the platform session and back to Media3. With this, the caller - controller is always the media notification controller and apps can - easily recognize calls coming from the notification in the same way on - all supported API levels. - * Fix bug where `MediaController.getCurrentPosition()` is not advancing - when connected to a legacy `MediaSessionCompat`. - * Add `MediaLibrarySession.getSubscribedControllers(mediaId)` for - convenience. - * Override `MediaLibrarySession.Callback.onSubscribe()` to assert the - availability of the parent ID for which the controller subscribes. If - successful, the subscription is accepted and `notifyChildrenChanged()` - is called immediately to inform the browser - ([#561](https://github.com/androidx/media/issues/561)). -* RTSP Extension: - * Fix a race condition that could lead to `IndexOutOfBoundsException` when - falling back to TCP, or playback hanging in some situations. - * Check state in RTSP setup when returning loading state of - `RtspMediaPeriod` - ([#577](https://github.com/androidx/media/issues/577)). - * Ignore custom Rtsp request methods in Options response public header - ([#613](https://github.com/androidx/media/issues/613)). -* Leanback extension: - * Fix bug where disabling a surface can cause an `ArithmeticException` in - Leanback code ([#617](https://github.com/androidx/media/issues/617)). - -### 1.2.0-alpha01 (2023-08-17) - -This release includes the following changes since the -[1.1.1 release](#111-2023-08-14)): +[1.1.1 release](#111-2023-08-14): * Common Library: * Add a `@Nullable Throwable` parameter to the methods in the `Log.Logger` @@ -144,7 +104,7 @@ This release includes the following changes since the * Fix Kotlin compatibility issue where nullable generic type parameters and nullable array element types are not detected as nullable. Examples are `TrackSelectorResult` and `SimpleDecoder` method parameters - ([6792](https://github.com/google/ExoPlayer/issues/6792)). + ([#6792](https://github.com/google/ExoPlayer/issues/6792)). * Change default UI and notification behavior in `Util.shouldShowPlayButton` to show a "play" button while playback is temporarily suppressed (e.g. due to transient audio focus loss). The @@ -152,6 +112,9 @@ This release includes the following changes since the `PlayerView.setShowPlayButtonIfPlaybackIsSuppressed(false)` or `MediaSession.Builder.setShowPlayButtonIfPlaybackIsSuppressed(false)` ([#11213](https://github.com/google/ExoPlayer/issues/11213)). + * Upgrade `androidx.annotation:annotation-experimental` to `1.3.1` to fix + https://issuetracker.google.com/251172715. + * Move `ExoPlayer.setAudioAttributes` to the `Player` interface. * ExoPlayer: * Fix seeking issues in AC4 streams caused by not identifying decode-only samples correctly @@ -169,7 +132,8 @@ This release includes the following changes since the `Player.replaceMediaItem(s)`. * Allow `MediaItem` updates for all `MediaSource` classes provided by the library via `Player.replaceMediaItem(s)` - (([#33](https://github.com/androidx/media/issues/33)),([#9978](https://github.com/google/ExoPlayer/issues/9978))). + ([#33](https://github.com/androidx/media/issues/33), + [#9978](https://github.com/google/ExoPlayer/issues/9978)). * Rename `MimeTypes.TEXT_EXOPLAYER_CUES` to `MimeTypes.APPLICATION_MEDIA3_CUES`. * Add `PngExtractor` that sends and reads a whole PNG file into the @@ -186,12 +150,34 @@ This release includes the following changes since the * Add additional fields to Common Media Client Data (CMCD) logging: buffer starvation (`bs`), deadline (`dl`), playback rate (`pr`) and startup (`su`) ([#8699](https://github.com/google/ExoPlayer/issues/8699)). + * Add luma and chroma bitdepth to `ColorInfo` + ([#491](https://github.com/androidx/media/pull/491)). + * Add additional fields to Common Media Client Data (CMCD) logging: next + object request (`nor`) and next range request (`nrr`) + ([#8699](https://github.com/google/ExoPlayer/issues/8699)). + * Add functionality to transmit Common Media Client Data (CMCD) data using + query parameters ([#553](https://github.com/androidx/media/issues/553)). + * Fix `ConcurrentModificationException` in `ExperimentalBandwidthMeter` + ([#612](https://github.com/androidx/media/issues/612)). + * Add `MediaPeriodId` parameter to + `CompositeMediaSource.getMediaTimeForChildMediaTime`. + * Support `ClippingMediaSource` (and other sources with period/window time + offsets) in `ConcatenatingMediaSource2` + ([#11226](https://github.com/google/ExoPlayer/issues/11226)). + * Change `BaseRenderer.onStreamChanged()` to also receive a + `MediaPeriodId` argument. * Transformer: * Parse EXIF rotation data for image inputs. * Remove `TransformationRequest.HdrMode` annotation type and its associated constants. Use `Composition.HdrMode` and its associated constants instead. * Simplify the `OverlaySettings` to fix rotation issues. + * Changed `frameRate` and `durationUs` parameters of + `SampleConsumer.queueInputBitmap` to `TimestampIterator`. +* Track Selection: + * Add `DefaultTrackSelector.Parameters.allowAudioNonSeamlessAdaptiveness` + to explicitly allow or disallow non-seamless adaptation. The default + stays at its current behavior of `true`. * Extractors: * MPEG-TS: Ensure the last frame is rendered by passing the last access unit of a stream to the sample queue @@ -203,11 +189,16 @@ This release includes the following changes since the inspected with `instanceof`. If you want runtime access to the implementation details of an `Extractor` you must first call `Extractor.getUnderlyingInstance`. + * Add `BmpExtractor`. + * Add `WebpExtractor`. + * Add `HeifExtractor`. + * Add + [QuickTime classic](https://developer.apple.com/standards/qtff-2001.pdf) + support to `Mp4Extractor`. * Audio: * Add support for 24/32-bit big-endian PCM in MP4 and Matroska, and parse PCM encoding for `lpcm` in MP4. * Add support for extracting Vorbis audio in MP4. -* Audio Offload: * Add `AudioSink.getFormatOffloadSupport(Format)` that retrieves level of offload support the sink can provide for the format through a `DefaultAudioOffloadSupportProvider`. It returns the new @@ -232,18 +223,91 @@ This release includes the following changes since the * Remove method `DefaultAudioSink.Builder.setOffloadMode`. * Remove intdef value `DefaultAudioSink.OffloadMode.OFFLOAD_MODE_ENABLED_GAPLESS_DISABLED`. + * Add support for Opus gapless metadata during offload playback. + * Allow renderer recovery by disabling offload if failed at first write + ([#627](https://github.com/androidx/media/issues/627)). + * Enable Offload Scheduling by default for audio-only offloaded playback. + * Delete `ExoPlayer.experimentalSetOffloadSchedulingEnabled` and + `AudioOffloadListener.onExperimentalOffloadSchedulingEnabledChanged`. + * Renamed `onExperimentalSleepingForOffloadChanged` as + `onSleepingForOffloadChanged` and `onExperimentalOffloadedPlayback` as + `onOffloadedPlayback`. + * Move audio offload mode related `TrackSelectionParameters` interfaces + and definitions to an inner `AudioOffloadPreferences` class. + * Add `onAudioTrackInitialized` and `onAudioTrackReleased` callbacks to + `AnalyticsListener`, `AudioRendererEventListener` and + `AudioSink.Listener`. + * Fix DTS Express audio buffer underflow issue + ([#650](https://github.com/androidx/media/pull/650)). + * Fix bug where the capabilities check for E-AC3-JOC throws an + `IllegalArgumentException` + ([#677](https://github.com/androidx/media/issues/677)). * Video: * Allow `MediaCodecVideoRenderer` to use a custom `VideoFrameProcessor.Factory`. * Fix bug where the first frame couldn't be rendered if the audio stream starts with negative timestamps ([#291](https://github.com/androidx/media/issues/291)). +* 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. * Effect: * Add `VideoFrameProcessor.queueInputBitmap(Bitmap, Iterator)` queuing bitmap input by timestamp. * Change `VideoFrameProcessor.registerInputStream()` to be non-blocking. Apps must implement `VideoFrameProcessor.Listener#onInputStreamRegistered()`. + * Changed `frameRate` and `durationUs` parameters of + `VideoFrameProcessor.queueInputBitmap` to `TimestampIterator`. +* IMA extension: + * Fix bug where a multi-period DASH live stream that is not the first item + in a playlist can throw an exception + ([#571](https://github.com/androidx/media/issues/571)). + * Release StreamManager before calling `AdsLoader.destroy()` + * Bump IMA SDK version to 3.31.0. +* Session: + * Set the notifications foreground service behavior to + `FOREGROUND_SERVICE_IMMEDIATE` in `DefaultMediaNotificationProvider` + ([#167](https://github.com/androidx/media/issues/167)). + * Use only + `android.media.session.MediaSession.setMediaButtonBroadcastReceiver()` + above API 31 to avoid problems with deprecated API on Samsung devices + ([#167](https://github.com/androidx/media/issues/167)). + * Use the media notification controller as proxy to set available commands + and custom layout used to populate the notification and the platform + session. + * Convert media button events that are received by + `MediaSessionService.onStartCommand()` within Media3 instead of routing + them to the platform session and back to Media3. With this, the caller + controller is always the media notification controller and apps can + easily recognize calls coming from the notification in the same way on + all supported API levels. + * Fix bug where `MediaController.getCurrentPosition()` is not advancing + when connected to a legacy `MediaSessionCompat`. + * Add `MediaLibrarySession.getSubscribedControllers(mediaId)` for + convenience. + * Override `MediaLibrarySession.Callback.onSubscribe()` to assert the + availability of the parent ID for which the controller subscribes. If + successful, the subscription is accepted and `notifyChildrenChanged()` + is called immediately to inform the browser + ([#561](https://github.com/androidx/media/issues/561)). + * 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)). + * Use `DataSourceBitmapLoader` by default instead of `SimpleBitmapLoader` + ([#271](https://github.com/androidx/media/issues/271), + [#327](https://github.com/androidx/media/issues/327)). + * Add `MediaSession.Callback.onMediaButtonEvent(Intent)` that allows apps + to override the default media button event handling. * UI: * Add a `Player.Listener` implementation for Wear OS devices that handles playback suppression due to @@ -258,9 +322,45 @@ This release includes the following changes since the add `dataSync` as `foregroundServiceType` in the manifest and add the `FOREGROUND_SERVICE_DATA_SYNC` permission ([#11239](https://github.com/google/ExoPlayer/issues/11239)). -* MIDI 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)). +* RTSP Extension: + * Fix a race condition that could lead to `IndexOutOfBoundsException` when + falling back to TCP, or playback hanging in some situations. + * Check state in RTSP setup when returning loading state of + `RtspMediaPeriod` + ([#577](https://github.com/androidx/media/issues/577)). + * Ignore custom Rtsp request methods in Options response public header + ([#613](https://github.com/androidx/media/issues/613)). + * 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.): * Release the MIDI decoder module, which provides support for playback of standard MIDI files using the Jsyn library to synthesize audio. + * 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. + * 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: + * Fix bug where disabling a surface can cause an `ArithmeticException` in + Leanback code ([#617](https://github.com/androidx/media/issues/617)). * Test Utilities: * Make `TestExoPlayerBuilder` and `FakeClock` compatible with Espresso UI tests and Compose UI tests. This fixes a bug where playback advances @@ -272,6 +372,25 @@ This release includes the following changes since the `TransformationRequest.Builder.experimental_setEnableHdrEditing(boolean)`. Use `Composition.Builder.setHdrMode(int)` and pass the `Composition` to `Transformer.start(Composition, String)` instead. + * Remove deprecated `DownloadNotificationHelper.buildProgressNotification` + method, use a non deprecated method that takes a `notMetRequirements` + parameter instead. + +### 1.2.0-rc01 (2023-11-01) + +Use the 1.2.0 [stable version](#120-2023-11-15). + +### 1.2.0-beta01 (2023-10-18) + +Use the 1.2.0 [stable version](#120-2023-11-15). + +### 1.2.0-alpha02 (2023-09-29) + +Use the 1.2.0 [stable version](#120-2023-11-15). + +### 1.2.0-alpha01 (2023-08-17) + +Use the 1.2.0 [stable version](#120-2023-11-15). ## 1.1 diff --git a/api.txt b/api.txt index ee652e26f9e..32a5ca8539a 100644 --- 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); 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); method public void addMediaItems(int, java.util.List); + method public void addMediaItems(java.util.List); 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); 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); method public void setMediaItems(java.util.List, boolean); method public void setMediaItems(java.util.List, 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); method public final void addMediaItems(int, java.util.List); + method public final void addMediaItems(java.util.List); 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); 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,8 +1621,8 @@ 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); method public final void setMediaItems(java.util.List, boolean); method public final void setMediaItems(java.util.List, int, long); @@ -1630,8 +1630,8 @@ package androidx.media3.session { 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 setRating(String, androidx.media3.common.Rating); method public final com.google.common.util.concurrent.ListenableFuture setRating(androidx.media3.common.Rating); + method public final com.google.common.util.concurrent.ListenableFuture 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 onSetRating(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo, String, androidx.media3.common.Rating); method public default com.google.common.util.concurrent.ListenableFuture onSetRating(androidx.media3.session.MediaSession, androidx.media3.session.MediaSession.ControllerInfo, androidx.media3.common.Rating); + method public default com.google.common.util.concurrent.ListenableFuture 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 index 57530f13dd4..ccf5153a188 100644 --- 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.1' + releaseVersionCode = 1_002_001_3_00 minSdkVersion = 16 // See https://developer.android.com/training/cars/media/automotive-os#automotive-module automotiveMinSdkVersion = 28 @@ -57,7 +57,7 @@ project.ext { androidxTestServicesStorageVersion = '1.4.2' androidxTestTruthVersion = '1.5.0' truthVersion = '1.1.3' - okhttpVersion = '4.11.0' + okhttpVersion = '4.12.0' modulePrefix = ':' if (gradle.ext.has('androidxMediaModulePrefix')) { modulePrefix += gradle.ext.androidxMediaModulePrefix 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 index abd03592266..b2977f68499 100644 --- 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 index 5a97794da84..d44a6522f18 100644 --- 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/build.gradle b/demos/main/build.gradle index c483532be94..850a24ac0aa 100644 --- a/demos/main/build.gradle +++ b/demos/main/build.gradle @@ -72,17 +72,6 @@ android { dependencies { compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion - // Demonstrate downgrading the annotation-experimental version to avoid - // transitively depending on the Kotlin standard library (which was - // introduced as a dependency in annotation-experimental:1.3.0). This demo - // app still depends on Kotlin via the IMA extension and UI modules, but - // this shows how an app can avoid the Kotlin dependency if they don't use - // these modules. - implementation('androidx.annotation:annotation-experimental') { - version { - strictly '1.2.0' - } - } implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion implementation 'androidx.multidex:multidex:' + androidxMultidexVersion implementation 'com.google.android.material:material:' + androidxMaterialVersion diff --git a/demos/main/src/main/assets/media.exolist.json b/demos/main/src/main/assets/media.exolist.json index bd5863b550d..17e3c5ef823 100644 --- a/demos/main/src/main/assets/media.exolist.json +++ b/demos/main/src/main/assets/media.exolist.json @@ -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", diff --git a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java index ad4b4c0fa7a..857efd4ddf0 100644 --- a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java +++ b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java @@ -93,11 +93,11 @@ public class PlayerActivity extends AppCompatActivity @Nullable private AdsLoader clientSideAdsLoader; - // TODO: Annotate this and serverSideAdsLoaderState below with @OptIn when it can be applied to - // fields (needs http://r.android.com/2004032 to be released into a version of - // androidx.annotation:annotation-experimental). - @Nullable private ImaServerSideAdInsertionMediaSource.AdsLoader serverSideAdsLoader; + @OptIn(markerClass = UnstableApi.class) + @Nullable + private ImaServerSideAdInsertionMediaSource.AdsLoader serverSideAdsLoader; + @OptIn(markerClass = UnstableApi.class) private ImaServerSideAdInsertionMediaSource.AdsLoader.@MonotonicNonNull State serverSideAdsLoaderState; diff --git a/demos/session/src/main/AndroidManifest.xml b/demos/session/src/main/AndroidManifest.xml index 6b31b9c9e7d..550b0698f04 100644 --- a/demos/session/src/main/AndroidManifest.xml +++ b/demos/session/src/main/AndroidManifest.xml @@ -61,6 +61,7 @@ + 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 index 7ea0682fe66..4788496f812 100644 --- 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, + 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 index f9c6873e804..97cf2b81104 100644 --- 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 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