This repository was archived by the owner on Aug 14, 2025. It is now read-only.
Merged dev-v2 into upstream #1
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Otherwise, Player clients would not be able to benefit from PlaybackException subclasses, like ExoPlaybackException. PiperOrigin-RevId: 378873767
PiperOrigin-RevId: 378886637
PiperOrigin-RevId: 378889901
…PlaybackSupported PiperOrigin-RevId: 378895355
PiperOrigin-RevId: 378899373
PiperOrigin-RevId: 379264658
Add MediaItem.EMPTY. PiperOrigin-RevId: 379273172
PiperOrigin-RevId: 379282201
LSC: go/checker-lsc
Tested:
TAP train for global presubmit queue
http://test/OCL:379220771:BASE:379219228:1623675799153:ea986c7c
PiperOrigin-RevId: 379284240
PiperOrigin-RevId: 379440699
PiperOrigin-RevId: 379469182
PiperOrigin-RevId: 379497408
The Widevine H264 samples in the demo app now log this from the EventLogger: ``` [X] Track:0, id=1, mimeType=video/avc, bitrate=772315, codecs=avc1.42c01e, drm=[widevine,cenc], res=320x142, fps=24.0, supported=YES ``` And the VP9 ones log: ``` [X] Track:0, id=1, mimeType=video/x-vnd.on2.vp9, bitrate=588256, codecs=vp9, drm=[widevine], res=320x142, fps=23.809525, supported=YES ``` #minor-release PiperOrigin-RevId: 379498332
Note that this removes a workaround for malformed content, in which the track_ID is set incorrectly. It's unclear there was sufficient reason to implement that workaround, and so it's preferable to remove it, rather than implementing the concept of unrecognized tracks, which would be needed to keep it and to also fix this issue. Issue: google#9056 #minor-release PiperOrigin-RevId: 379506261
PiperOrigin-RevId: 379506322
Issue: google#9004 #minor-release PiperOrigin-RevId: 379516815
More information: go/checker-3130-lsc
Tested:
Some test failures are present, but the CL author has decided to mail the change anyway
PiperOrigin-RevId: 379622938
More information: go/checker-3130-lsc
Tested:
TAP for global presubmit queue passed after automated deflaking of failures: http://mondo/deflaker/run/ff80a4f9-d5d7-47ac-9560-63372e1ff624 http://mondo/deflaker/run/ca3ce61f-2af8-4fa7-b6e4-c98b5c4d950c
http://test/OCL:379405669:BASE:379421861:1623763190392:bd2d256a
PiperOrigin-RevId: 379623080
PiperOrigin-RevId: 379732136
This enables actions that are not advertised by the MediaSession to be dispatched either way. PiperOrigin-RevId: 379765015
#minor-release PiperOrigin-RevId: 379913814
Issue: google#8960 #minor-release PiperOrigin-RevId: 379922704
PiperOrigin-RevId: 379935363
In preparation for the onPlayerError callback to take a PlaybackException. PiperOrigin-RevId: 379939108
PiperOrigin-RevId: 379962022
PiperOrigin-RevId: 380000589
PiperOrigin-RevId: 380009757
In prepare_withSupportedTrack_sendsPlayRequest(), the DESCRIBE includes two tracks, one AAC and one MP4A-LATM. The test is run until a PLAY is sent, and asserts on only one SETUP is sent (for AAC). In prepare_noSupportedTrack_throwsPreparationError(), the DESCRIBE includes one track: one MP4A-LATM. This format is not supported at the moment, so the player will throw out an error, on which we assert. PiperOrigin-RevId: 380131458
If google3 is the source-of-truth for this third_party code (or if this is legacy code that is no longer synced with an external source), just LGTM this CL and Rosie will submit it. If not, you should patch the upstream source of these files, since we will be disabling support for /-as-division in google3 before support is formally removed from the language.
See go/lsc-slash-as-division-deprecation.
Tested:
TAP found no affected targets. No targets were built or tested.
http://test/OCL:380056637:BASE:380052721:1623976139468:f2fd2cbd
PiperOrigin-RevId: 380140762
This is the package that CacheDataSource and CacheDataSourceTest(2) are in. PiperOrigin-RevId: 380156879
Issue: google#9037 #minor-release PiperOrigin-RevId: 385630065
PiperOrigin-RevId: 385736588
#minor-release Issue: google#1611 PiperOrigin-RevId: 385741535
This field is to be associated with the artworkData. PiperOrigin-RevId: 385757480
PiperOrigin-RevId: 385758742
PiperOrigin-RevId: 385763366
This URL no longer resolves. #minor-release Issue: google#9205 PiperOrigin-RevId: 385772688
PiperOrigin-RevId: 385781004
PiperOrigin-RevId: 385783671
In some DataSources, it is not easy to assign an error code at the throw site. For example, CronetDataSource.readInternal() throws SocketTimeoutException on L1033, and is caught at L754 as IOException and is thrown. We need the logic to assign error code for the actual type of the error cause. While we can certainly do in individual DataSources, IMO there's value in making this logic generic at a higher level (like what is in this CL). The catch and translation logic is borrowed from EPII:L646. PiperOrigin-RevId: 385789629
FileDataSourceException subclasses DataSourceException and can be handled in the same fashion. PiperOrigin-RevId: 385983103
PiperOrigin-RevId: 385995740
#minor-release PiperOrigin-RevId: 385996618
This also deletes several files that should have been deleted as part of the 2.14.0 release - both javadoc for classes that were removed in that release and all the *-frame.html files that no longer seem to be produced by the javadoc compiler. Also a jquery file (jquery-1.10.2.js) that's no longer produced by the compiler. #minor-release PiperOrigin-RevId: 385997294
PiperOrigin-RevId: 385736588
This URL no longer resolves. #minor-release Issue: google#9205 PiperOrigin-RevId: 385772688
PiperOrigin-RevId: 385995740
PiperOrigin-RevId: 385996618
This also deletes several files that should have been deleted as part of the 2.14.0 release - both javadoc for classes that were removed in that release and all the *-frame.html files that no longer seem to be produced by the javadoc compiler. Also a jquery file (jquery-1.10.2.js) that's no longer produced by the compiler. #minor-release PiperOrigin-RevId: 385997294
#minor-release PiperOrigin-RevId: 386048024
#minor-release PiperOrigin-RevId: 386048024
PiperOrigin-RevId: 386177945
PiperOrigin-RevId: 386185285
PiperOrigin-RevId: 386194496
PiperOrigin-RevId: 386194874
PiperOrigin-RevId: 386206960
PiperOrigin-RevId: 386207381
# Conflicts: # demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java # library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java # library/core/src/main/java/com/google/android/exoplayer2/source/MediaSourceFactory.java # library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaSource.java # library/core/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java # library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java # library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
15 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi Toni,
This change takes your work on auto-detecting stream types, 4a8c860, and merges it into the latest dev-v2.
I thought you might find this useful.
Notes:
setDataSourceFactory()method is currenlty a no-op.PlaybackActivity, I've removed calls toDefaultMediaSourceFactory().setAdsLoaderProvider() andsetAdViewProvider(). I wasn't sure how to hook these up withDefaultMediaSource.Factory`.DefaultMediaSource.onLoadError()had some breaking changes. I've made the required changes but I don't fully comprehend what's going on in that method. It works but I can't guarantee it's correct.