Skip to content

Commit ca6835b

Browse files
authored
Merge pull request #120 from androidx/release-1.0
r1.0.0 beta02
2 parents 2c72010 + 86e2361 commit ca6835b

File tree

67 files changed

+3698
-570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+3698
-570
lines changed

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ body:
1717
label: Media3 Version
1818
description: What version of Media3 are you using?
1919
options:
20+
- 1.0.0-beta02
2021
- 1.0.0-beta01
2122
- 1.0.0-alpha03
2223
- 1.0.0-alpha02

RELEASENOTES.md

Lines changed: 51 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,47 @@
11
Release notes
22

3-
### Unreleased changes
3+
### 1.0.0-beta02 (2022-07-21)
44

5+
This release corresponds to the
6+
[ExoPlayer 2.18.1 release](https://github.com/google/ExoPlayer/releases/tag/r2.18.1).
7+
8+
* Core library:
9+
* Ensure that changing the `ShuffleOrder` with `ExoPlayer.setShuffleOrder`
10+
results in a call to `Player.Listener#onTimelineChanged` with
11+
`reason=Player.TIMELINE_CHANGE_REASON_PLAYLIST_CHANGED`
12+
([#9889](https://github.com/google/ExoPlayer/issues/9889)).
13+
* For progressive media, only include selected tracks in buffered position
14+
([#10361](https://github.com/google/ExoPlayer/issues/10361)).
15+
* Allow custom logger for all ExoPlayer log output
16+
([#9752](https://github.com/google/ExoPlayer/issues/9752)).
17+
* Fix implementation of `setDataSourceFactory` in
18+
`DefaultMediaSourceFactory`, which was non-functional in some cases
19+
([#116](https://github.com/androidx/media/issues/116)).
520
* Extractors:
6-
* Add support for AVI
7-
([#2092](https://github.com/google/ExoPlayer/issues/2092)).
21+
* Fix parsing of H265 short term reference picture sets
22+
([#10316](https://github.com/google/ExoPlayer/issues/10316)).
23+
* Fix parsing of bitrates from `esds` boxes
24+
([#10381](https://github.com/google/ExoPlayer/issues/10381)).
25+
* DASH:
26+
* Parse ClearKey license URL from manifests
27+
([#10246](https://github.com/google/ExoPlayer/issues/10246)).
28+
* UI:
29+
* Ensure TalkBack announces the currently active speed option in the
30+
playback controls menu
31+
([#10298](https://github.com/google/ExoPlayer/issues/10298)).
832
* RTSP:
9-
* Add RTP reader for H263
10-
([#63](https://github.com/androidx/media/pull/63)).
33+
* Add VP8 fragmented packet handling
34+
([#110](https://github.com/androidx/media/pull/110)).
35+
* Leanback extension:
36+
* Listen to `playWhenReady` changes in `LeanbackAdapter`
37+
([10420](https://github.com/google/ExoPlayer/issues/10420)).
38+
* Cast:
39+
* Use the `MediaItem` that has been passed to the playlist methods as
40+
`Window.mediaItem` in `CastTimeline`
41+
([#25](https://github.com/androidx/media/issues/25),
42+
[#8212](https://github.com/google/ExoPlayer/issues/8212)).
43+
* Support `Player.getMetadata()` and `Listener.onMediaMetadataChanged()`
44+
with `CastPlayer` ([#25](https://github.com/androidx/media/issues/25)).
1145

1246
### 1.0.0-beta01 (2022-06-16)
1347

@@ -46,7 +80,9 @@ This release corresponds to the
4680
* Rename `TracksInfo` to `Tracks` and `TracksInfo.TrackGroupInfo` to
4781
`Tracks.Group`. `Player.getCurrentTracksInfo` and
4882
`Player.Listener.onTracksInfoChanged` have also been renamed to
49-
`Player.getCurrentTracks` and `Player.Listener.onTracksChanged`.
83+
`Player.getCurrentTracks` and `Player.Listener.onTracksChanged`. This
84+
includes 'un-deprecating' the `Player.Listener.onTracksChanged` method
85+
name, but with different parameter types.
5086
* Change `DefaultTrackSelector.buildUponParameters` and
5187
`DefaultTrackSelector.Parameters.buildUpon` to return
5288
`DefaultTrackSelector.Parameters.Builder` instead of the deprecated
@@ -100,6 +136,8 @@ This release corresponds to the
100136
* Remove `RawCcExtractor`, which was only used to handle a Google-internal
101137
subtitle format.
102138
* Extractors:
139+
* Add support for AVI
140+
([#2092](https://github.com/google/ExoPlayer/issues/2092)).
103141
* Matroska: Parse `DiscardPadding` for Opus tracks.
104142
* MP4: Parse bitrates from `esds` boxes.
105143
* Ogg: Allow duplicate Opus ID and comment headers
@@ -149,6 +187,8 @@ This release corresponds to the
149187
of `DefaultCompositeSequenceableLoaderFactory` can be passed explicitly
150188
if required.
151189
* RTSP:
190+
* Add RTP reader for H263
191+
([#63](https://github.com/androidx/media/pull/63)).
152192
* Add RTP reader for MPEG4
153193
([#35](https://github.com/androidx/media/pull/35)).
154194
* Add RTP reader for HEVC
@@ -211,10 +251,11 @@ This release corresponds to the
211251
AndroidStudio's gradle sync to fail
212252
([#9933](https://github.com/google/ExoPlayer/issues/9933)).
213253
* Remove deprecated symbols:
214-
* Remove `Player.Listener.onTracksChanged`. Use
215-
`Player.Listener.onTracksInfoChanged` instead.
254+
* Remove `Player.Listener.onTracksChanged(TrackGroupArray,
255+
TrackSelectionArray)`. Use `Player.Listener.onTracksChanged(Tracks)`
256+
instead.
216257
* Remove `Player.getCurrentTrackGroups` and
217-
`Player.getCurrentTrackSelections`. Use `Player.getCurrentTracksInfo`
258+
`Player.getCurrentTrackSelections`. Use `Player.getCurrentTracks`
218259
instead. You can also continue to use `ExoPlayer.getCurrentTrackGroups`
219260
and `ExoPlayer.getCurrentTrackSelections`, although these methods remain
220261
deprecated.
@@ -424,7 +465,7 @@ This release corresponds to the
424465
when creating `PendingIntent`s
425466
([#9528](https://github.com/google/ExoPlayer/issues/9528)).
426467
* Remove deprecated symbols:
427-
* Remove `Player.EventLister`. Use `Player.Listener` instead.
468+
* Remove `Player.EventListener`. Use `Player.Listener` instead.
428469
* Remove `MediaSourceFactory.setDrmSessionManager`,
429470
`MediaSourceFactory.setDrmHttpDataSourceFactory`, and
430471
`MediaSourceFactory.setDrmUserAgent`. Use

api.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ package androidx.media3.common {
807807
field public static final int TIMELINE_CHANGE_REASON_SOURCE_UPDATE = 1; // 0x1
808808
}
809809

810-
@IntDef({androidx.media3.common.Player.COMMAND_INVALID, androidx.media3.common.Player.COMMAND_PLAY_PAUSE, androidx.media3.common.Player.COMMAND_PREPARE, androidx.media3.common.Player.COMMAND_STOP, androidx.media3.common.Player.COMMAND_SEEK_TO_DEFAULT_POSITION, androidx.media3.common.Player.COMMAND_SEEK_IN_CURRENT_MEDIA_ITEM, androidx.media3.common.Player.COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM, androidx.media3.common.Player.COMMAND_SEEK_TO_PREVIOUS, androidx.media3.common.Player.COMMAND_SEEK_TO_NEXT_MEDIA_ITEM, androidx.media3.common.Player.COMMAND_SEEK_TO_NEXT, androidx.media3.common.Player.COMMAND_SEEK_TO_MEDIA_ITEM, androidx.media3.common.Player.COMMAND_SEEK_BACK, androidx.media3.common.Player.COMMAND_SEEK_FORWARD, androidx.media3.common.Player.COMMAND_SET_SPEED_AND_PITCH, androidx.media3.common.Player.COMMAND_SET_SHUFFLE_MODE, androidx.media3.common.Player.COMMAND_SET_REPEAT_MODE, androidx.media3.common.Player.COMMAND_GET_CURRENT_MEDIA_ITEM, androidx.media3.common.Player.COMMAND_GET_TIMELINE, androidx.media3.common.Player.COMMAND_GET_MEDIA_ITEMS_METADATA, androidx.media3.common.Player.COMMAND_SET_MEDIA_ITEMS_METADATA, androidx.media3.common.Player.COMMAND_CHANGE_MEDIA_ITEMS, androidx.media3.common.Player.COMMAND_GET_AUDIO_ATTRIBUTES, androidx.media3.common.Player.COMMAND_GET_VOLUME, androidx.media3.common.Player.COMMAND_GET_DEVICE_VOLUME, androidx.media3.common.Player.COMMAND_SET_VOLUME, androidx.media3.common.Player.COMMAND_SET_DEVICE_VOLUME, androidx.media3.common.Player.COMMAND_ADJUST_DEVICE_VOLUME, androidx.media3.common.Player.COMMAND_SET_VIDEO_SURFACE, androidx.media3.common.Player.COMMAND_GET_TEXT, androidx.media3.common.Player.COMMAND_SET_TRACK_SELECTION_PARAMETERS, androidx.media3.common.Player.COMMAND_GET_TRACKS, androidx.media3.common.Player.COMMAND_SET_MEDIA_ITEM}) @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.TYPE_USE}) public static @interface Player.Command {
810+
@IntDef({androidx.media3.common.Player.COMMAND_INVALID, androidx.media3.common.Player.COMMAND_PLAY_PAUSE, androidx.media3.common.Player.COMMAND_PREPARE, androidx.media3.common.Player.COMMAND_STOP, androidx.media3.common.Player.COMMAND_SEEK_TO_DEFAULT_POSITION, androidx.media3.common.Player.COMMAND_SEEK_IN_CURRENT_MEDIA_ITEM, androidx.media3.common.Player.COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM, androidx.media3.common.Player.COMMAND_SEEK_TO_PREVIOUS, androidx.media3.common.Player.COMMAND_SEEK_TO_NEXT_MEDIA_ITEM, androidx.media3.common.Player.COMMAND_SEEK_TO_NEXT, androidx.media3.common.Player.COMMAND_SEEK_TO_MEDIA_ITEM, androidx.media3.common.Player.COMMAND_SEEK_BACK, androidx.media3.common.Player.COMMAND_SEEK_FORWARD, androidx.media3.common.Player.COMMAND_SET_SPEED_AND_PITCH, androidx.media3.common.Player.COMMAND_SET_SHUFFLE_MODE, androidx.media3.common.Player.COMMAND_SET_REPEAT_MODE, androidx.media3.common.Player.COMMAND_GET_CURRENT_MEDIA_ITEM, androidx.media3.common.Player.COMMAND_GET_TIMELINE, androidx.media3.common.Player.COMMAND_GET_MEDIA_ITEMS_METADATA, androidx.media3.common.Player.COMMAND_SET_MEDIA_ITEMS_METADATA, androidx.media3.common.Player.COMMAND_SET_MEDIA_ITEM, androidx.media3.common.Player.COMMAND_CHANGE_MEDIA_ITEMS, androidx.media3.common.Player.COMMAND_GET_AUDIO_ATTRIBUTES, androidx.media3.common.Player.COMMAND_GET_VOLUME, androidx.media3.common.Player.COMMAND_GET_DEVICE_VOLUME, androidx.media3.common.Player.COMMAND_SET_VOLUME, androidx.media3.common.Player.COMMAND_SET_DEVICE_VOLUME, androidx.media3.common.Player.COMMAND_ADJUST_DEVICE_VOLUME, androidx.media3.common.Player.COMMAND_SET_VIDEO_SURFACE, androidx.media3.common.Player.COMMAND_GET_TEXT, androidx.media3.common.Player.COMMAND_SET_TRACK_SELECTION_PARAMETERS, androidx.media3.common.Player.COMMAND_GET_TRACKS}) @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.TYPE_USE}) public static @interface Player.Command {
811811
}
812812

813813
public static final class Player.Commands {

constants.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414
project.ext {
15-
releaseVersion = '1.0.0-beta01'
16-
releaseVersionCode = 1_000_000_1_01
15+
releaseVersion = '1.0.0-beta02'
16+
releaseVersionCode = 1_000_000_1_02
1717
minSdkVersion = 16
1818
appTargetSdkVersion = 29
1919
// Upgrading this requires [Internal ref: b/193254928] to be fixed, or some

demos/main/src/main/AndroidManifest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@
7878
<data android:scheme="file"/>
7979
<data android:scheme="ssai"/>
8080
</intent-filter>
81+
<intent-filter>
82+
<action android:name="androidx.media3.demo.main.action.VIEW"/>
83+
<category android:name="android.intent.category.DEFAULT"/>
84+
<data android:scheme="content"/>
85+
<data android:mimeType="*/*"/>
86+
</intent-filter>
8187
<intent-filter>
8288
<action android:name="androidx.media3.demo.main.action.VIEW_LIST"/>
8389
<category android:name="android.intent.category.DEFAULT"/>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import android.widget.ArrayAdapter
2727
import android.widget.ListView
2828
import android.widget.TextView
2929
import androidx.appcompat.app.AppCompatActivity
30+
import androidx.core.content.ContextCompat
3031
import androidx.media3.common.MediaItem
3132
import androidx.media3.session.LibraryResult
3233
import androidx.media3.session.MediaBrowser
@@ -164,7 +165,7 @@ class MainActivity : AppCompatActivity() {
164165
val root: MediaItem = result.value!!
165166
pushPathStack(root)
166167
},
167-
MoreExecutors.directExecutor()
168+
ContextCompat.getMainExecutor(this)
168169
)
169170
}
170171

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import android.widget.LinearLayout
2929
import android.widget.ListView
3030
import android.widget.TextView
3131
import androidx.appcompat.app.AppCompatActivity
32+
import androidx.core.content.ContextCompat
3233
import androidx.media3.common.MediaItem
3334
import androidx.media3.common.Player
3435
import androidx.media3.session.MediaBrowser
@@ -150,7 +151,7 @@ class PlayableFolderActivity : AppCompatActivity() {
150151
val result = mediaItemFuture.get()!!
151152
title.text = result.value!!.mediaMetadata.title
152153
},
153-
MoreExecutors.directExecutor()
154+
ContextCompat.getMainExecutor(this)
154155
)
155156
childrenFuture.addListener(
156157
{
@@ -161,7 +162,7 @@ class PlayableFolderActivity : AppCompatActivity() {
161162
subItemMediaList.addAll(children)
162163
mediaListAdapter.notifyDataSetChanged()
163164
},
164-
MoreExecutors.directExecutor()
165+
ContextCompat.getMainExecutor(this)
165166
)
166167
}
167168

demos/surface/src/main/AndroidManifest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
<data android:scheme="asset"/>
4444
<data android:scheme="file"/>
4545
</intent-filter>
46+
<intent-filter>
47+
<action android:name="androidx.media3.demo.surface.action.VIEW"/>
48+
<category android:name="android.intent.category.DEFAULT"/>
49+
<data android:scheme="content"/>
50+
<data android:mimeType="*/*"/>
51+
</intent-filter>
4652
</activity>
4753

4854
</application>

demos/transformer/src/main/AndroidManifest.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
<data android:scheme="asset"/>
5050
<data android:scheme="file"/>
5151
</intent-filter>
52+
<intent-filter>
53+
<action android:name="androidx.media3.demo.transformer.action.VIEW"/>
54+
<category android:name="android.intent.category.DEFAULT"/>
55+
<data android:scheme="content"/>
56+
<data android:mimeType="*/*"/>
57+
</intent-filter>
5258
</activity>
5359
<activity android:name=".TransformerActivity"
5460
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"

0 commit comments

Comments
 (0)