15023 Commits

Author SHA1 Message Date
Cedric T
3909db2a4e Add DTSUHDSpecificBox (udts) support to parseAudioSampleEntry(). 2023-03-14 16:12:45 +08:00
tonihei
bc3537260b
Merge pull request #11034 from google/release-v2-r2.18.4
r2.18.4
2023-03-03 10:01:45 +00:00
tonihei
86013bdc36 Update release notes for ExoPlayer 2.18.4
#minor-release

PiperOrigin-RevId: 513555559
(cherry picked from commit 4f68f891bca4d506ea552e1389060286474a6aae)
2023-03-02 17:58:16 +00:00
tonihei
c459b08b81 Fix lint-baseline.xml for latest UI translations
#minor-release

PiperOrigin-RevId: 513533248
(cherry picked from commit af6807d959ff7bb3166177b6d687d41bf937b650)
2023-03-02 17:58:16 +00:00
tonihei
05ac6ab15d Update Javadoc for 2.18.4
PiperOrigin-RevId: 513516267
(cherry picked from commit 658b5030e45435472d490fe7280a70c0196744d4)
2023-03-02 17:58:15 +00:00
tonihei
c641307110 Bump version numbers to Media3 1.0.0-rc02 and ExoPlayer 2.18.4
#minor-release

PiperOrigin-RevId: 513488487
(cherry picked from commit 3b16231e29e4f952e4f44a179a1e91022f7bad36)
2023-03-02 13:54:32 +00:00
tonihei
4298cfabc6 Update migration script to 1.0.0-rc02/2.18.4
PiperOrigin-RevId: 513482096
(cherry picked from commit b634005c5f69f6a5ba47f58534fd41e16e237c25)
2023-03-02 13:54:30 +00:00
christosts
d5ae16c0c9 Extend documentation for ForwardingPlayer
Add some additional information which methods to override
for available commands.

#minor-release

PiperOrigin-RevId: 513251805
(cherry picked from commit a64a9e67ca3bf34f29e525b1bdfbb73371a66ae7)
2023-03-02 09:57:58 +00:00
tonihei
d3ef80106e Merge pull request #255 from mayurk2:use_edts_offset_if_it_is_for_entire_file
PiperOrigin-RevId: 513213229
(cherry picked from commit d2ba290746221c8bd32e32d29050c78774c83f1f)
2023-03-02 09:57:58 +00:00
ibaker
a834d05387 Remove @see tags with <a> tags
These are not supported by Dackka

#minor-release

PiperOrigin-RevId: 513176533
(cherry picked from commit ef5a1ce9322352f084b992d370cad740edc43fa2)
2023-03-02 09:57:58 +00:00
christosts
bfc12ef59a Minor change in ForwardingPlayer javadoc
#minor-release

PiperOrigin-RevId: 512897269
(cherry picked from commit 48047cf9e8a75e30c3b464f2e89f9406c71b1271)
2023-03-02 09:57:58 +00:00
tonihei
c23010d3f6 Update translations
#minor-release

PiperOrigin-RevId: 512890813
(cherry picked from commit 13a86b38334bf8e34d79762edcf139e5ab731085)
2023-03-02 09:57:58 +00:00
tonihei
996d66052e Ensure getPlaybackHeadPosition isn't called if not needed
Once the value returned from AudioTimestampPoller advances, we
only need getPlaybackHeadPosition to sample sync params and
verify the returned timestamp. Both of these happen less often
and we can avoid calling getPlaybackHeadPosition if we don't
actually need it.

PiperOrigin-RevId: 512882170
(cherry picked from commit 4cf7d3c7acc7244bcbf2998f9fdb43c100ce51e1)
2023-03-02 09:57:58 +00:00
tonihei
3e7eeceb56 Fix some playback parameter signalling problems.
Playback parameter signalling can be quite complex because
 (a) the renderer clock often has a delay before it realizes
     that it doesn't support a previously set speed and
 (b) the speed set on media clock sometimes intentionally
     differs from the one surfaced to the user, e.g. during
     live speed adjustment or when overriding ad playback
     speed to 1.0f.

This change fixes two problems related to this signalling:
 1. When resetting the media clock speed at a period transition,
    we don't currently tell the renderers that this happened.
 2. When a delayed speed change update from the media clock is
    pending and the renderer for this media clock is disabled
    before the change can be handled, the pending update becomes
    stale but it still applied later and overrides any other valid
    speed set in the meantime.

Both edge cases are also covered by extended or new player tests.

Issue: google/ExoPlayer#10882

PiperOrigin-RevId: 512658918
(cherry picked from commit d363977156b49c1fe793bfc9709eb00595bfae6c)
2023-03-02 09:57:54 +00:00
tonihei
38639e5a5f Ensure output format is updated in sync with stream changes.
MediaCodecRenderer currently has two independent paths to trigger
events at stream changes:
 1. Detection of the last output buffer of the old stream to trigger
    onProcessedStreamChange and setting the new output stream offset.
 2. Detection of the first input buffer of the new stream to trigger
    onOutputFormatChanged.
Both events are identical for most media. However, there are two
problematic cases:
  A. (1) happens after (2). This may happen if the declared media
     duration is shorter than the actual last sample timestamp.
  B. (2) is too late and there are output samples between (1) and (2).
     This can happen if the new media outputs samples with a timestamp
     less than the first input timestamp.

This can be made more robust by:
 - Keeping a separate formatQueue for each stream to avoid case A.
 - Force outputting the first format after a stream change to
   avoid case B.

Issue: google/ExoPlayer#8594

#minor-release

PiperOrigin-RevId: 512586838
(cherry picked from commit a02c8d855c8eae8cb3132365548ecf7a0730815b)
2023-02-28 18:05:48 +00:00
tonihei
095a0b5e6e Add workaround for wrong PerformancePoints on some devices.
Some devices were reported to have wrong PerformancePoint sets
that cause 60 fps to be marked as unsupported even though they
are supported.

Issue: google/ExoPlayer#10898

#minor-release

PiperOrigin-RevId: 512580395
(cherry picked from commit 04f0cc949f0d524d5a8ab367a15716175bacf18f)
2023-02-28 18:05:47 +00:00
tonihei
f5c696729c Correctly update output info if previous stream has been fully rendered
The output info for a new stream is marked pending until the last
sample of the previous stream has been processed. However, this fails
if the previous stream has already been fully processed. We need to
detect this case explicitly to avoid signalling the output change one
sample too late.

#minor-release

PiperOrigin-RevId: 512572854
(cherry picked from commit 39935d7f1202a4e327b968815bf499cc7bcab4c4)
2023-02-28 18:05:47 +00:00
tonihei
5862fe4d8c Use more realistic time values for MediaCodecVideoRendererTest
This test became flaky after cbb6878f9f because some of the
unrealistic frame times ended up on the same release time.

Using realistic numbers avoids the flakiness.

PiperOrigin-RevId: 512566469
(cherry picked from commit 13700e0aec06b2a7f5ed0d710690b44dbb7146bc)
2023-02-28 18:05:47 +00:00
tonihei
29eeca3359 Do not specify export flags for protected system broadcasts.
Protected system broadcasts should not specify the export flag.
Marking them as NOT_EXPORTED breaks sticky broadcasts in some
cases.

Issue: google/ExoPlayer#10970

#minor-release

PiperOrigin-RevId: 512020154
(cherry picked from commit 34b9824201314b4fa6442deac643635f2fa9e541)
2023-02-28 18:05:47 +00:00
andrewlewis
342ae31a00 Add missing variant to package transformations
PiperOrigin-RevId: 512002735
(cherry picked from commit 1ef70cd6a02aabf302a7d3c37785e928d93973c3)
2023-02-28 18:05:41 +00:00
tonihei
629e1c515f Use ArrayDeque for pending output stream changes.
The current logic uses manual array operations to keep track of pending
changes. Modernize this code by using an ArrayDeque and a data class.
This also allows to extend the output stream information in the future.

This also fixes a bug where a position reset accidentally assigns a pending
stream offset instead of keeping the current one.

PiperOrigin-RevId: 511787571
(cherry picked from commit 4e0babdcd1c272c5470572e3b29dc15e42e9221a)
2023-02-28 18:04:42 +00:00
tonihei
d0c07691d3 Indicate that SCTE-35 metadata in not supported with HLS
Issue: google/ExoPlayer#10992

#minor-release

PiperOrigin-RevId: 510988140
(cherry picked from commit 57a638aa88a4b85ca9f39573bddfc9b45df11254)
2023-02-28 18:04:03 +00:00
christosts
5f91e45f3c Skip rendering multiple frames on the same vsync
When rendering frames at a rate higher than the screen refresh rate,
e.g. playing at 8x, the player is releasing multiple frames at the same
release time (nanos) which are then dropped by the platform. The output
buffers are available later and as a result MediaCodec cannot keep up
decoding fast enough.

This change skips releasing multiple video frames on the same vsync
period and proactivelly drops the frame. The frame is counted as skipped
rather than dropped to differentiate with frames dropped due to slow
decoding.

PiperOrigin-RevId: 510964976
(cherry picked from commit cbb6878f9fef20ea440c6ffda77dd4edc00ce1f2)
2023-02-28 18:04:03 +00:00
tonihei
0563c4327f Reduce number of calls to AudioTrack.getPlaybackHeadPosition
This call may cause performance overhead in some situations,
for example if the AudioTrack needs to query an offload DSP
for the current position. We don't need to check this multiple
times per doSomeWork iteration as the value is unlikely to
change in any meaningful way.

PiperOrigin-RevId: 510957116
(cherry picked from commit 829b49d724ed220e7d58397dfdf97752aac73696)
2023-02-28 18:04:03 +00:00
bachinger
61a38a1920 Map PLAYER_STATE_LOADING to STATE_BUFFERING
#minor-release
Issue: androidx/media#245
PiperOrigin-RevId: 510456793
(cherry picked from commit a231ff4fa91471c59d2ab62945603614b8c8a742)
2023-02-28 18:04:03 +00:00
Googler
52d5ff466c Add exception cause to thrown exception
PiperOrigin-RevId: 509473556
(cherry picked from commit 08cf6db305d4ae26bc74769660aa3e687d7120ad)
2023-02-28 18:04:03 +00:00
michaelkatz
89acf3cf08 Catch IllegalArgumentExceptions in RTSP Response parsing
In parsing Describe RTSP response messages, IllegalArgumentExceptions are thrown for invalid parameters and values. These exceptions were not caught and crashed the Playback thread. Now these exceptions will be caught and their errors forwarded to the proper error handling listeners.

#minor-release

Issue: google/ExoPlayer#10971
PiperOrigin-RevId: 509207881
(cherry picked from commit 711fa44d56678ebdb5c1c3a48f940fa71810c510)
2023-02-28 18:04:03 +00:00
bachinger
65f2e16708 Add ad event listeners in the Looper event of the ad manager callback
#minor-release

PiperOrigin-RevId: 509189206
(cherry picked from commit e98670e2f94a04d90f6ec7188f748eb1c31fb09f)
2023-02-28 18:04:03 +00:00
christosts
aeff51c507 AsynchronousMediaCodecAdapter: surface queueing errors sooner
The AsynchronousMediaCodecAdapter's queuing thread stores any exceptions
raised by MediaCodec and re-throws them on the next call to
queueInputBuffer()/queueSecureInputBuffer(). However, if MediaCodec
raises and error while queueing, it goes into a failed state and does
not announce available input buffers. If there is no input available
input buffer, the MediaCodecRenderer will never call
queueInputBuffer()/queueSecureInputBuffer(), hence playback is stalled.

This change surfaces the queueing error through the adapter's dequeueing
methods.

PiperOrigin-RevId: 508637346
(cherry picked from commit a5f4651d555de8c5e99405b002bcf536cae4567e)
2023-02-28 18:04:03 +00:00
ibaker
2794992243 Add null check to ExoPlayerImpl.isTunnelingEnabled
`TrackSelectorResult.rendererConfigurations` can contain null elements:
> A null entry indicates the corresponding renderer should be disabled.

This wasn't caught by the nullness checker because `ExoPlayerImpl` is
currently excluded from analysis.

#minor-release

Issue: google/ExoPlayer#10977
PiperOrigin-RevId: 508619169
(cherry picked from commit 5e3cd7a3c3f2cd590d77ccd318c5ba4824f414b8)
2023-02-28 18:04:03 +00:00
tonihei
58650b87d6 Document spatialization behavior constants.
PiperOrigin-RevId: 508602059
(cherry picked from commit 1c29131016c9d140ca40d7f1b9038eeffb343bf7)
2023-02-28 18:04:03 +00:00
christosts
3bd0896080 Merge pull request #10959 from balachandarlinks:handle-sql-exception-in-cached-content-index
PiperOrigin-RevId: 508323432
(cherry picked from commit 20a5e468f449e29ecb6f3bd55cc8526fff74acda)
2023-02-28 18:04:02 +00:00
microkatz
3dcdfe5d7c Merge pull request #248 from lemondoglol:update-segment-size
PiperOrigin-RevId: 507784608
(cherry picked from commit 08342ea9da96240c87e3e7c486eec0b0929138da)
2023-02-28 18:04:02 +00:00
tonihei
bc9f2be8ab Fix AudioTrackPositionTracker logic for playback speed adjustments
The AudioTrackPositionTracker needs to correct positions by
the speed set on the AudioTrack itself whenever it makes
estimations based on real-time (=the real-time playout
duration is not equal to the media duration played).

This happens for the main playback path already, but not for
the mode in which the position is estimated from the playback
head position and also not in the phase after the track has
been stopped. Both cases are not very noticeable during
normal playback, but become relevant when playing in offload
mode.

PiperOrigin-RevId: 507736408
(cherry picked from commit 4ede931c2a7ad11003194cb0ee638535ecab7f31)
2023-02-28 18:04:02 +00:00
christosts
8f1aeca0a1 Detect HEVC HDR10 codec profile more accurately
In MediaCodecUtil, use Format.colorInfo, besides the codec string,
to accurately map to a 10bit HEVC profile.

PiperOrigin-RevId: 507500071
(cherry picked from commit 80dbaca0e520c32a599a379feedb49e6bed3de30)
2023-02-28 18:04:02 +00:00
christosts
f72ca83383
Merge pull request #10995 from google/release-v2-r2.18.3
r2.18.3
2023-02-16 17:03:04 +00:00
christosts
68ca3996aa Update javadoc for ExoPlayer 2.18.3
#minor-release

PiperOrigin-RevId: 509867431
(cherry picked from commit 482871fed4fc84009f6d11af3ad4650bc65cd4bc)
2023-02-16 10:30:06 +00:00
christosts
57bd86125c Update javadoc for ExoPlayer 2.18.3
#minor-release

PiperOrigin-RevId: 509864205
(cherry picked from commit 19d4a588295894fb5d5777e0d12a87cd2c9fc5d5)
2023-02-16 10:30:06 +00:00
christosts
f5d442fddb Update javadoc for ExoPlayer 2.18.3
#minor-release

PiperOrigin-RevId: 509789955
(cherry picked from commit 4759e0075c4a4ac2fe8892147fed1ac341b48c0d)
2023-02-15 12:55:55 +00:00
christosts
7dbc2d4bec Version bump for ExoPlayer 2.18.3 & media3-1.0.0-rc01
#minor-release

PiperOrigin-RevId: 509501665
(cherry picked from commit b18dccde2a1984562ee42e9b058d4a23451b607d)
2023-02-14 18:54:59 +00:00
christosts
f731a46a49 Update release notes for ExoPlayer 2.18.3
#minor-release

PiperOrigin-RevId: 509246479
(cherry picked from commit 8ff024e4c0e3d2085b2c690daddd64b53ca448ad)
2023-02-14 18:54:59 +00:00
bachinger
7269d2a4c2 Publish ConcatenatingMediaSource2
Can be used to combine multiple media items into a single timeline window.

Issue: androidx/media#247
Issue: google/ExoPlayer#4868
PiperOrigin-RevId: 506283307
(cherry picked from commit eb8fffba15810b8206653d8ffaff233d823fbfc9)
2023-02-02 16:47:22 +00:00
christosts
76e87406bb Merge pull request #10793 from fraunhoferfokus:dash-thumbnail-support
PiperOrigin-RevId: 506261584
(cherry picked from commit 107e0c6e42c6fd080b1be19e5305597cf880a9dd)
2023-02-02 16:47:22 +00:00
ibaker
4dfa7ca249 Fix (another) LeanbackPlayerAdapter param name mismatch
I missed this when fixing `positionInMs` for Dackka in d2a3d8f6fa

This time I manually verified that all the `@Override` methods have
parameter names that match [the docs](https://developer.android.com/reference/androidx/leanback/media/PlayerAdapter).

#minor-release

PiperOrigin-RevId: 506017063
(cherry picked from commit 736f090cce540de78a968e62fd8c5aec413e8122)
2023-02-02 13:18:47 +00:00
tonihei
284bf97007 Fix timestamp comparison for seeks in fMP4
When seeking in fMP4, we try to extract as little samples as possible
by only starting at the preceding sync frame. This comparison should
use <= to allow sync frames at exactly the seek position.

Issue: google/ExoPlayer#10941

#minor-release

PiperOrigin-RevId: 505098172
(cherry picked from commit ac3017b5805cb98b4292e4bbe1f7181f47684b88)
2023-02-02 13:18:47 +00:00
michaelkatz
ace97facf2 Match MergingMediaPeriod track selection by period index in id
MergingMediaPeriod creates its track groups with ids concatenating position in its periods array and the underlying child track group id. The ids can be used in selectTracks for matching to periods list.

Issue: google/ExoPlayer#10930
PiperOrigin-RevId: 505074653
(cherry picked from commit ee055ef004686ddb3844666f9506a95c6e16a59f)
2023-02-02 13:18:46 +00:00
tonihei
b9bb3235c2 Tweak UI behavior when commands are missing.
For most missing commands, we already disable the corresponding
controls. This change extends this to more UI elements that are
disabled in case the corresponding action is unavailable.

#minor-release

PiperOrigin-RevId: 505057751
(cherry picked from commit 641c3b1b22cc67133151b7af9905473485b0f51c)
2023-02-02 13:18:46 +00:00
tonihei
5350d0666e Add missing command checks in UI module
The commands are partly checked already before enabling
features or calling player methods, but the checks were
still missing in many places.

#minor-release

PiperOrigin-RevId: 504589888
(cherry picked from commit 2d7ddccebb959051ae4a284e9c9380cc3582c411)
2023-01-26 14:28:06 +00:00
ibaker
3bb3c602ae Document two limitations with subtitle sideloading
#minor-release

PiperOrigin-RevId: 504517946
(cherry picked from commit f083ff264db8af76a1c9bb14bd72913b2fbb8fe2)
2023-01-26 14:28:06 +00:00
christosts
26c8c552c0 Suppress warnings in ImaUtil
ImaUtil calls VideoProgressUpdate.equals() which is annotated as hidden,
which causes lint errors with gradle.

#minor-release

PiperOrigin-RevId: 504306210
(cherry picked from commit f86948f01c2397b9f53ef598e311e2de9055118e)
2023-01-26 14:28:06 +00:00