Commit graph

2596 commits

Author SHA1 Message Date
tofunmi
276f2f1fe6 Add 'Keep every nth frame' frame dropping strategy.
#minor-release

PiperOrigin-RevId: 538804347
2023-06-09 13:55:39 +00:00
tianyifeng
2e2f19351f Add seekPrev and seekNext buttons on the default compact notification
This change is for Android 12 and below, where the buttons are derived from the actions added with the notification. From Android 13 (https://developer.android.com/about/versions/13/behavior-changes-13#playback-controls), the system derives media controls from `PlaybackState` actions.

When adding the actions onto the notification, the logic will iterate all the command buttons. The `COMMAND_KEY_CONPACT_VIEW_INDEX` extra will be checked for each button. If that extra is set for the three buttons on the compact view, then the customized buttons and their order will be used. Otherwise, the compact view will be "seekPrev" (if any), "play/pause" (if any), "seekNext" (if any) buttons (in such order).

Issue: androidx/media#410
PiperOrigin-RevId: 538797874
2023-06-09 13:54:13 +00:00
claincly
a7cff4e0e3 Fix calling extra registerInputStream and not handling EOS
PiperOrigin-RevId: 538796466
2023-06-09 13:52:44 +00:00
sheenachhabra
53c174f047 Add support for passing custom metadata via transformer
Changes included:
1. Enable MP4 extractor to read all types of metadata.
2. Allow passing String and Float metadata via Transformer.

Reference to QuickTime spec: https://developer.apple.com/library/archive/documentation/QuickTime/QTFF/Metadata/Metadata.html#//apple_ref/doc/uid/TP40000939-CH1-SW21

PiperOrigin-RevId: 538783982
2023-06-09 13:51:15 +00:00
michaelkatz
c86fff5393 Catch exceptions for creating AudioFormat with unsupported arguments
PiperOrigin-RevId: 538753539
2023-06-08 12:49:38 +00:00
sheenachhabra
2753fb0e3e Enable nullness checker for Muxer module androidTest library
PiperOrigin-RevId: 538742957
2023-06-08 12:48:03 +00:00
huangdarwin
0c924fcb40 Test: Add no-op effect test for GL tone mapping.
To ensure no regressions for the potentially confusing pipeline of:
* HDR electrical -> SDR linear EOTF+OOTF, and
* SDR linear -> SDR electrical OETF

PiperOrigin-RevId: 538741079
2023-06-08 12:46:34 +00:00
tofunmi
ce203ccfed DefaultVideoFrameProcessorMultipleTextureOutputPixelTest fixes & cleanup
PiperOrigin-RevId: 538495675
2023-06-08 12:45:07 +00:00
huangdarwin
9dad207603 Test: Move duplicated GL tone mapping logic into helper methods.
PiperOrigin-RevId: 538491957
2023-06-08 12:43:40 +00:00
kimvde
3ba8f6dd8f Remove unnecessary thread in AssetLoader tests
Also queue textures from a different thread in TextureAssetLoader, to
have a behaviour closer to reality.

PiperOrigin-RevId: 538473089
2023-06-08 12:41:30 +00:00
jbibik
e7f7e86f3e Fix 1 ErrorProneStyle finding
PiperOrigin-RevId: 538469993
2023-06-08 12:40:06 +00:00
tofunmi
c3b9328d74 Tests for disabled color transfers
#minor-release

PiperOrigin-RevId: 538466615
2023-06-08 12:38:36 +00:00
huangdarwin
adf53b4d50 Effect: Add multiple texture output test.
Confirms that multiple textures can be output, and that timestamps and pixels
are as expected.

PiperOrigin-RevId: 538459296
2023-06-08 12:37:00 +00:00
andrewlewis
828a05e0fa Log additional information on test runner timeout
PiperOrigin-RevId: 538437142
2023-06-08 12:35:36 +00:00
sheenachhabra
7e14811e25 Add support for passing creation time via InAppMuxer
PiperOrigin-RevId: 538175466
2023-06-06 18:12:51 +00:00
Tofunmi Adigun-Hameed
9ca6e5d90d Merge pull request #425 from vishnuchilakala:set_min_live_position
PiperOrigin-RevId: 538173603
2023-06-06 18:11:48 +00:00
tianyifeng
f4bf376e89 Defer outputting the metadata sample when TimestampAdjuster isn't initialized
The sample timestamp carried by the emsg box can have a significant delta when comparing to the earliest presentation timestamp of the segment. Using this timestamp to intialize the timestamp offset in TimestampAdjuster will cause the media sample to have a wrong adjusted timestamp. So we should defer adjusting the metadata sample timestamp until the TimestampAdjuster is initialized with a real media sample.

PiperOrigin-RevId: 538172841
2023-06-06 18:10:41 +00:00
claincly
08e7158be5 Add utility to create ScheduledExecutorService
PiperOrigin-RevId: 538129792
2023-06-06 18:09:26 +00:00
jbibik
d9764c18ad Allow playback of MediaItems with LocalConfiguration
When initiated by MediaController, it should be possible for `MediaSession` to pass `MediaItems` to the `Player` if they have `LocalConfiguration`. In such case, it is not required to override `MediaSession.Callback.onAddMediaItems`, because the new current default implementation will handle it.

However, in other cases, MediaItem.toBundle() will continue to strip the LocalConfiguration information.

Issue: androidx/media#282

#minor-release

PiperOrigin-RevId: 537993460
2023-06-06 18:08:17 +00:00
Googler
7956c80f73 Rollback of 2a6f893fba
*** Original commit ***

BEGIN_PUBLIC
Set video size to 0/0 when video render is disabled

In terms of MCVR with a `VideoRendererEventListener`, the video size is set to
0/0 right after `onVideoDisabled()` is called and is set to the actual size as
soon as the video size is known after 'onVideoEnabled()`.

For ExoPlayer and in terms of the `Player` interface, `Player.getVideoSize()`
returns a video size of 0/0 when `Player.getCurrentTracks()` does not support
`C.TRACK_TYPE_VIDEO`. This is ensured by the masking behavior

***

PiperOrigin-RevId: 537938947
2023-06-06 18:06:46 +00:00
Googler
83e9080b71 Override ParserException#getMessage
PiperOrigin-RevId: 537908595
2023-06-06 18:05:33 +00:00
michaelkatz
6b7b97ccfe Requiring offload disables any tracks that are non-compatible
With `AudioOffloadModePreference` `AUDIO_OFFLOAD_MODE_PREFERENCE_REQUIRED`, the `DefaultTrackSelector` will select a single audio track that it finds is offload compatible. If not any audio track is supported in offload, then no track will be selected.

PiperOrigin-RevId: 537877183
2023-06-06 18:03:02 +00:00
claincly
133943a635 Fix recreation of DefaultShaderProgram in FinalWrapper
`outputSurfaceInfoChanged` is not reset when `defaultShaderProgram` is null.
That is, on the first time `ensureConfigured()` is called with output size
changed, `outputSurfaceInfoChanged` is not set to false after creating the
`defaultShaderProgram`, and `defaultShaderProgram` will be created again on the
second time `ensureConfigured()` is called.

PiperOrigin-RevId: 537870404
2023-06-06 18:01:20 +00:00
Tofunmi Adigun-Hameed
c7a41a7b41 Merge pull request #426 from cedricxperi:dtsx-direct-playback-fix
PiperOrigin-RevId: 537835423
2023-06-06 17:58:57 +00:00
tofunmi
2af5752785 Revert AndroidTestUtil.canDecode to use EncoderUtil.findCodecForFormat
208eefc0fd introduced using `DefaultDecoderFactory.getDecoderInfo(format) != null` caused certain tests not to be skipped when they were expected to be, creating more mh failures.

PiperOrigin-RevId: 537820370
2023-06-06 17:57:47 +00:00
ibaker
3cb6fe9fcf Add Throwable parameter to all methods on Log.Logger interface
This is a breaking change, but the alternatives seem either equally
breaking or worse, since the only way to make this non-breaking is
to add the `Throwable` overloads as `default` methods. It's then
unclear how we would ever migrate to these being the 'only' methods
or whether we'd have to keep both forms forever (which results in
duplication in the `Logger` implementations).

The clean break here also makes it clear that the `message` parameter
of `Log.Logger.{d,i,w,w}()` no longer automatically includes any info
from the `Throwable` passed to the static `Log.{d,i,w,e}() methods.

----

This CL also cleans up the javadoc on the static `Log.{d,w,i,e}` methods
since they no longer necessarily call straight through to the
corresponding `android.util.Log` methods (and haven't since <unknown commit>
and Issue: google/ExoPlayer#10185).

PiperOrigin-RevId: 537817974
2023-06-06 17:56:36 +00:00
tonihei
e7c5b87e02 Formatting and Javadoc updates 2023-06-05 16:06:07 +01:00
Vishnu Chilakala
b417838209 Added setMinLiveStartPositionMs to DashMediaSource.Factory 2023-06-05 16:06:07 +01:00
sheenachhabra
997f2be5e5 Ignore ByteBuffer position when writing samples in Mp4Muxer
PiperOrigin-RevId: 537814319
2023-06-05 09:52:27 +00:00
andrewlewis
74478f2478 Tidy color info checking tests
ExoPlayer extractors (backing `MetadataRetriever`) now parse the color format
from the bitstream so using `MetadataRetriever` should be an equivalent but
more lightweight way to verify the color info.

Also remove try/catch blocks in test code calling into these methods, and add
skipping based on decoder capabilities in the cases where it was missing.

PiperOrigin-RevId: 537789483
2023-06-05 09:51:01 +00:00
ibaker
79b721e411 Define the SubtitleParser interface
We will migrate concrete implementations of `SubtitleDecoder` to implement
this instead.

PiperOrigin-RevId: 537298600
2023-06-05 09:49:26 +00:00
ibaker
7e6dae7b31 Remove exoplayer2-only javadoc machinery from media3
This introduces whitespace-only changes in exoplayer2 due to the way
copybara stripping works.

PiperOrigin-RevId: 537296933
2023-06-05 09:47:58 +00:00
kimvde
04d8edf19e Read Exif orientation data in DataSourceBitmapLoader
PiperOrigin-RevId: 537258424
2023-06-05 09:46:26 +00:00
Cedric T
b4ff9031c7 Split AudioOffloadSupport.DEFAULT_UNSUPPORTED check into 2 if statements. 2023-06-02 15:29:12 +00:00
Cedric T
8ab1a68939 Return offload unsupported for DTSX P2 and API < 34. 2023-06-02 15:29:12 +00:00
Cedric T
19676084e6 Fix DTS:X P2 offload playback. 2023-06-02 15:29:12 +00:00
ibaker
fa990714fe Remove exoplayer2-specific parts from media3-only files
PiperOrigin-RevId: 537038419
2023-06-02 09:19:32 +00:00
christosts
757247e2ae Release MIDI decoder module in open-source
PiperOrigin-RevId: 537034577
2023-06-02 09:18:09 +00:00
huangdarwin
c52130a212 Test: Add special effects for forcing transcode.
Previously, we would apply a general effect to signal wanting to transcode.

PiperOrigin-RevId: 537034455
2023-06-02 09:16:52 +00:00
Tofunmi Adigun-Hameed
a739f6062e Merge pull request #420 from changxiangzhong:fix/cp-missing
PiperOrigin-RevId: 537014587
2023-06-02 09:15:38 +00:00
claincly
f6dbe99c79 Use the designated UNSET value for aspect ratio
PiperOrigin-RevId: 536770380
2023-06-02 09:12:38 +00:00
huangdarwin
20f90cb1bf ExoPlayer: set videoFrameProcessorFactory in MCVR ctor.
Also, move to using a Supplier<?> to load a singleton value.

PiperOrigin-RevId: 536733480
2023-05-31 18:01:35 +00:00
kimvde
108000834b Add TransformationRequest toString method
PiperOrigin-RevId: 536727079
2023-05-31 18:00:12 +00:00
ibaker
0ddc024c69 Soften MediaCodecRenderer's assumptions about using framework DRM
#minor-release

PiperOrigin-RevId: 536724725
2023-05-31 17:58:49 +00:00
claincly
208eefc0fd Fix codec's MIME type is not used
In some cases the codec selected for decoding has a different MIME type than
the media. In thoses cases Transformer continued to use the media's MIME type
and that caused codec configuration failures.

Removed `EncoderUtil.findCodecForFormat()` as we stopped using the method it
uses for finding a codec. Plus, the method is only used in the test.

See also `MediaCodecUtil.getALternativeCodecMimeType()`.

PiperOrigin-RevId: 536683663
2023-05-31 17:57:40 +00:00
huangdarwin
e2821f10f5 Exoplayer: Suppress check to allow video to run ahead of Audio.
Otherwise, texture output errors out if video decoding decodes faster than audio,
hitting the end of the file, while audio is still in the middle of the file.

PiperOrigin-RevId: 536679568
2023-05-31 17:56:24 +00:00
Ian Baker
1b564c67f2 Switch from boxed Boolean to primitive boolean
Also add a parameter comment and reformat with `google-java-format`.
2023-05-31 18:16:03 +01:00
Chang Xiangzhong
c331ac64e7 Save state throwsWhenUsingWrongThread when copy() 2023-05-31 18:04:27 +01:00
tofunmi
49ea280bb8 Version bump to media3:1.1.0-beta01
#minor-release

PiperOrigin-RevId: 536464412
2023-05-30 18:48:06 +00:00
huangdarwin
1c172e0bed Effect: Remove extra wait on taskExecutor release()
This future.get() duplicates the wait done in
singleThreadExecutorService.awaitTermination(). If awaitTermination times out, this future.get() would also result in unnecessary blocking.

PiperOrigin-RevId: 536442153
2023-05-30 18:46:43 +00:00
huangdarwin
06908e1a86 Rollback of 438ae0ed6a
*** Original commit ***

ExoPlayer: Add setVideoFrameProcessorFactory().

This allows apps to use a custom VideoFrameProcessor implementation for video
playback. This may be useful, for example, when outputting to a texture.
***

PiperOrigin-RevId: 536391597
2023-05-30 14:26:39 +00:00
sheenachhabra
99d2cf6713 Add only supported MdtaMetadataEntry
PiperOrigin-RevId: 536351494
2023-05-30 14:24:06 +00:00
jbibik
25bf0c6738 Remove previously deprecated MediaItem.PlaybackProperties in favour of LocalConfiguration.
Deprecated field `MediaItem.playbackProperties` remains for backwards compatibility, but its type is changed from `MediaItem.PlaybackProperties` to `MediaItem.LocalConfiguration`. The private `MediaItem` constructor will now also take in a `LocalConfiguration` argument instead.

PiperOrigin-RevId: 535648420
2023-05-30 10:13:11 +00:00
tofunmi
16d36da88a Remove unneeded image mimetypes
not needed after 94d29f35fc is submitted

PiperOrigin-RevId: 535627522
2023-05-30 10:10:39 +00:00
tofunmi
94d29f35fc Image transcoding: Add support for bmp image format.
With this change we will now support loading bitmaps from all the formats documented [here](https://developer.android.com/guide/topics/media/media-formats#image-formats) except for gifs (because they are animated). Java doc is added to express this.

PiperOrigin-RevId: 535610152
2023-05-26 15:16:17 +00:00
kimvde
f4d1a6c453 Transmux video if rotation is only effect applied
PiperOrigin-RevId: 535554628
2023-05-26 15:14:52 +00:00
Tofunmi Adigun-Hameed
c3dd88d715 Merge pull request #335 from cedricxperi:dts-direct-passthrough-support
PiperOrigin-RevId: 535255453
2023-05-25 15:13:38 +00:00
tofunmi
a19e07c4d2 Move OnInputFrameProcessedListener into it's own file
PiperOrigin-RevId: 535183521
2023-05-25 15:09:36 +00:00
Tianyi Feng
730cfecd57 Make the API 34 check inline and refactor the comment 2023-05-25 09:58:07 +00:00
Tianyi Feng
f301214a1e Refactor the comment 2023-05-25 09:58:07 +00:00
Tianyi Feng
fb34983bb7 Format with google-java-format 2023-05-25 09:58:07 +00:00
Tianyi Feng
48509df714 Quick return the capabilities for API29 TV case 2023-05-25 09:58:07 +00:00
Tianyi Feng
ea32f11292 Refactor the methods and reword the comments 2023-05-25 09:58:07 +00:00
Tianyi Feng
9d147f2227 Adjust the comment lines 2023-05-25 09:58:07 +00:00
Tianyi Feng
f69718e5ad Fix the lint issues 2023-05-25 09:58:07 +00:00
Tianyi Feng
162f5e827a Add type argument when using ImmutableSet 2023-05-25 09:58:07 +00:00
Tianyi Feng
b9a53da121 Refactor AudioCapabilities.getCapabilities 2023-05-25 09:58:07 +00:00
Tianyi Feng
c61f8d317a Add C.ENCODING_DTS_UHD_P2 to C.Encoding 2023-05-25 09:58:07 +00:00
Tianyi Feng
d0cd2f5f21 Refactor AudioCapabilities.getCapabilities 2023-05-25 09:58:07 +00:00
Tianyi Feng
47b0726ea9 Format with google-java-format 2023-05-25 09:55:10 +00:00
Cedric T
424b5d8d0e Add issue link for AudioCapabilities 2023-05-25 09:55:10 +00:00
Cedric T
cb29e8fb3d Construct AudioCapabilities with HDMI reported MaxChannelCount. 2023-05-25 09:55:10 +00:00
Cedric T
905ad1ce33 Fixed bug in HDMI reporting logic. 2023-05-25 09:55:10 +00:00
Cedric T
6b4cf4d362 Swap HDMI case and non-HDMI case in AudioCapabilities. 2023-05-25 09:55:10 +00:00
Cedric T
773d3c52f1 Swap empty line in AudioCapabilities.java 2023-05-25 09:55:10 +00:00
Cedric T
53f35f46f5 Use ImmutableSet to store discovered encodings in AudioCapabilities.java 2023-05-25 09:55:10 +00:00
Cedric T
924723d6b3 Additional changes to AudioCapabilities.java and Util.java 2023-05-25 09:55:10 +00:00
Cedric T
b1ac7685bd Add distinct encodings check before returning AudioCapabilities. 2023-05-25 09:55:10 +00:00
Cedric T
753257e454 Refactor Audio Capabilities 2023-05-25 09:55:10 +00:00
Cedric T
abc46d4319 Rename some variables and change to use ImmutableList.Builder. 2023-05-25 09:55:10 +00:00
Cedric T
f47930e587 Refactor getDirectPlaybackSupportedEncodings() 2023-05-25 09:55:10 +00:00
Cedric T
c984387248 Re-word comments for new DTS Sync words in DtsUtil.java. 2023-05-25 09:55:10 +00:00
Cedric T
b069fb1283 Return Immutable List for getAllSurroundEncodingsMaybeSupported() 2023-05-25 09:55:09 +00:00
Cedric T
689451b0c6 Set AudioCapabilities.DEFAULT_MAX_CHANNEL_COUNT to 10 2023-05-25 09:55:09 +00:00
Cedric T
d01a93b94e Add getAllSurroundEncodingsMaybeSupported() 2023-05-25 09:55:09 +00:00
Cedric T
3b9d680914 Add comments for DTSUtil.java 2023-05-25 09:55:09 +00:00
Cedric T
c0e03f14a8 Remove skip channelCount check for ENCODING_DTS 2023-05-25 09:55:09 +00:00
Cedric T
6823a2916a Add C.ENCODING_DTS_UHD_P2 2023-05-25 09:55:09 +00:00
Cedric T
22b45b75f7 Use getMaxSupportedChannelCountForPassthrough to assign channel Count 2023-05-25 09:55:09 +00:00
Cedric T
b73d2cc736 Add direct passthrough support for DTS audio. 2023-05-25 09:55:09 +00:00
tonihei
418b2a5f1b Don't check offload support for formats without defined sample rate.
Otherwise the Builder of AudioFormat will throw because we pass in
an invalid value.

#minor-release

PiperOrigin-RevId: 535169406
2023-05-25 10:40:20 +01:00
tonihei
2c07468908 Implement Player.replaceMediaItem(s)
This change moves the default logic into the actual Player
implementations, but does not introduce any behavior changes compared
to addMediaItems+removeMediaItems except to make the updates "atomic"
in ExoPlayerImpl, SimpleBasePlayer and MediaController. It also
provides backwards compatbility for cases where Players don't support
the operation.

Issue: google/ExoPlayer#8046

#minor-release

PiperOrigin-RevId: 534945089
2023-05-25 10:00:02 +01:00
michaelkatz
85f83b1208 Use base Uri from the RTSP DESCRIBE response header for relative paths
Issue: google/ExoPlayer#11160

#minor-release

PiperOrigin-RevId: 534896789
2023-05-25 09:58:12 +01:00
huangdarwin
abf649cdfa Effects: Have VFP texture output disable surface output.
Also, document that texture output disables manual frame release.

In the past, texture output would lead to surface output methods throwing. Now,
they're simply no-ops instead.

PiperOrigin-RevId: 534894168
2023-05-25 09:57:16 +01:00
andrewlewis
b988cce62c Clarify color transfers for internal textures
PiperOrigin-RevId: 534869452
2023-05-25 09:56:03 +01:00
bachinger
6469fffd8f Keep aspect ratio of PlayerView when IDLE
When the video renderer is disabled, the video size is set to 0/0
and sent to listeners. The `PlayerView` potentially still has the last frame
displayed when the player is stopped or an error occurs. This may have the
effect that the frame is displayed distorted.

Not changing the aspect ratio when the video size arrives when the player is IDLE
avoids the problem. In the case when playback starts again and the renderes is
enabled, another video size is sent to the listener.

#minor-release

PiperOrigin-RevId: 534860889
2023-05-25 09:55:10 +01:00
andrewlewis
749c64c74f Tidy TextureManager javadoc
Fix `@param`s and clarify wording.

PiperOrigin-RevId: 534857204
2023-05-25 09:54:02 +01:00
jbibik
3cc4e44fe3 Make MediaItem.AdsConfiguration bundleable
PiperOrigin-RevId: 534848363
2023-05-25 09:53:10 +01:00
tonihei
acb567d5a7 Add clarifiying note to Player.replaceMediaItem
This helps to highlight that the replaced range doesn't need to have
the same size as before.

#minor-release

PiperOrigin-RevId: 534834917
2023-05-25 09:52:18 +01:00
sheenachhabra
a944ffecb9 Add support for adding capture FPS via transformer
PiperOrigin-RevId: 534814892
2023-05-24 16:11:27 +01:00