Commit acc6f09
committed
Merge tag '1.5.1' into release-tivo-1.5.1-merge
Initial merge, one of our extractor tests is failing, this is due to
an alternate implementation for dealing with end of stream, see pull request:
androidx#3092
The resolved conflicts were:
```
settings.gradle
libraries/extractor/src/main/java/androidx/media3/extractor/ts/TsExtractor.java
libraries/extractor/src/main/java/androidx/media3/extractor/ts/PesReader.java
libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsMediaPeriod.java
libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/DefaultHlsExtractorFactory.java
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/util/SntpClient.java
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/drm/DefaultDrmSessionManagerProvider.java
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/MediaCodecAudioRenderer.java
demos/main/build.gradle
```
- settings.gradle -- we took ours, don't care about new modules added we don't use.
- Extractor -- they merged pull request androidx#419 from v-novaltd:vnova-104, we will modify this slightly to use our method as well
- DRM - picked up our change for `setLoadErrorHandlingPolicy()` add, conflicted with pending change for `exoMediaDrmProvider`
- SntpClient -- they added a method `setMaxElapsedTimeUntilUpdateMs()` same as our MAX_ELAPSED_MS_TILL_UPDATE, so we take all their change and will need to add call to the new method.
- DefaultHlsExtractorFactory -- our changes to add `exposeCea608WhenMissingDeclarations` flag to fmp4 too
- Renderers -- tunneling changes conflicted.
Also, test androidx.media3.exoplayer.hls.HlsMediaChunkTest needed to be fixed for the signature change from "Add hook for custom DRM encoded in HLS EXT-X-KEY"3,262 files changed
Lines changed: 481719 additions & 52444 deletions
File tree
- .github/ISSUE_TEMPLATE
- demos
- cast
- src/main
- java/androidx/media3/demo/cast
- compose
- src/main
- java/androidx/media3/demo/compose
- data
- res
- drawable
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- mipmap-xxxhdpi
- values-night
- values
- composition
- src/main
- java/androidx/media3/demo/composition
- res
- layout
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- mipmap-xxxhdpi
- values-night
- values
- gl
- src/main
- java/androidx/media3/demo/gl
- main
- src/main
- assets
- java/androidx/media3/demo/main
- res/values
- session_automotive
- src/main
- session_service
- src/main/java/androidx/media3/demo/session
- session
- src/main
- java/androidx/media3/demo/session
- res
- layout
- values-night
- values
- shortform
- src/main
- java/androidx/media3/demo/shortform
- viewpager
- res
- drawable
- layout
- mipmap-hdpi
- mipmap-mdpi
- mipmap-xhdpi
- mipmap-xxhdpi
- mipmap-xxxhdpi
- values
- surface
- src/main/java/androidx/media3/demo/surface
- transformer
- src/main
- java/androidx/media3/demo/transformer
- res
- layout
- values
- gradle/wrapper
- libraries
- cast/src
- main/java/androidx/media3/cast
- test/java/androidx/media3/cast
- common_ktx
- src
- main
- java/androidx/media3/common
- test
- java/androidx/media3/common
- common
- src
- main/java/androidx/media3/common
- audio
- text
- util
- test/java/androidx/media3/common
- audio
- text
- util
- container
- src
- androidTest
- main/java/androidx/media3/container
- test/java/androidx/media3/container
- datasource_cronet/src
- androidTest
- java/androidx/media3/datasource/cronet
- main/java/androidx/media3/datasource/cronet
- test/java/androidx/media3/datasource/cronet
- datasource_okhttp
- src
- main/java/androidx/media3/datasource/okhttp
- test/java/androidx/media3/datasource/okhttp
- datasource/src
- androidTest
- java/androidx/media3/datasource
- res/font
- main
- java/androidx/media3/datasource
- cache
- test/java/androidx/media3/datasource
- cache
- decoder_av1
- src
- main/jni
- test
- java/androidx/media3/decoder/av1
- decoder_ffmpeg
- src
- main
- java/androidx/media3/decoder/ffmpeg
- jni
- test/java/androidx/media3/decoder/ffmpeg
- decoder_flac
- src
- androidTest
- java/androidx/media3/decoder/flac
- main/jni
- include
- decoder_iamf
- src
- androidTest
- java/androidx/media3/decoder/iamf
- main
- java/androidx/media3/decoder/iamf
- jni
- test
- java/androidx/media3/decoder/iamf
- decoder_midi/src
- main/java/androidx/media3/decoder/midi
- test/java/androidx/media3/decoder/midi
- decoder_opus
- src
- androidTest
- java/androidx/media3/decoder/opus
- main/jni
- decoder_vp9
- src
- androidTest
- java/androidx/media3/decoder/vp9
- main/jni
- decoder/src/main/java/androidx/media3/decoder
- effect
- src
- androidTest/java/androidx/media3/effect
- main
- assets/shaders
- java/androidx/media3/effect
- test/java/androidx/media3/effect
- exoplayer_dash
- src
- main/java/androidx/media3/exoplayer/dash
- manifest
- offline
- test/java/androidx/media3/exoplayer/dash
- e2etest
- manifest
- offline
- exoplayer_hls
- src
- main/java/androidx/media3/exoplayer/hls
- offline
- playlist
- test/java/androidx/media3/exoplayer/hls
- e2etest
- offline
- playlist
- exoplayer_ima
- src
- androidTest
- main/java/androidx/media3/exoplayer/ima
- test/java/androidx/media3/exoplayer/ima
- exoplayer_rtsp
- src
- main/java/androidx/media3/exoplayer/rtsp
- reader
- test/java/androidx/media3/exoplayer/rtsp
- exoplayer_smoothstreaming
- src
- main/java/androidx/media3/exoplayer/smoothstreaming
- offline
- test/java/androidx/media3/exoplayer/smoothstreaming
- manifest
- exoplayer
- src
- androidTest
- java/androidx/media3/exoplayer
- audio
- main/java/androidx/media3/exoplayer
- analytics
- audio
- drm
- image
- mediacodec
- metadata
- offline
- scheduler
- source
- ads
- chunk
- mediaparser
- preload
- text
- trackselection
- upstream
- util
- video
- spherical
- test
- java/androidx/media3/exoplayer
- analytics
- audio
- drm
- e2etest
- image
- mediacodec
- offline
- source
- ads
- preload
- text
- trackselection
- upstream
- video
- extractor
- src
- androidTest
- java/androidx/media3/extractor/text
- main/java/androidx/media3/extractor
- amr
- avif
- avi
- flv
- jpeg
- metadata
- dvbsi
- flac
- icy
- id3
- mp4
- mkv
- mp3
- mp4
- ogg
- text
- cea
- pgs
- ssa
- subrip
- ttml
- tx3g
- webvtt
- ts
- wav
- test/java/androidx/media3/extractor
- amr
- avif
- avi
- metadata
- id3
- vorbis
- mkv
- mp3
- mp4
- text
- cea
- ttml
- webvtt
- ts
- wav
- muxer
- src
- androidTest/java/androidx/media3/muxer
- main/java/androidx/media3/muxer
- test/java/androidx/media3/muxer
- session
- src
- main
- aidl/androidx/media3/session
- java/androidx/media3/session
- legacy
- res
- drawable-anydpi-v21
- layout
- values-af
- values-am
- values-ar
- values-az
- values-b+sr+Latn
- values-be
- values-bg
- values-bn
- values-bs
- values-ca
- values-cs
- values-da
- values-de
- values-el
- values-en-rAU
- values-en-rGB
- values-en-rIN
- values-es-rUS
- values-es
- values-et
- values-eu
- values-fa
- values-fi
- values-fr-rCA
- values-fr
- values-gl
- values-gu
- values-hi
- values-hr
- values-hu
- values-hy
- values-in
- values-is
- values-it
- values-iw
- values-ja
- values-ka
- values-kk
- values-km
- values-kn
- values-ko
- values-ky
- values-lo
- values-lt
- values-lv
- values-mk
- values-ml
- values-mn
- values-mr
- values-ms
- values-my
- values-nb
- values-ne
- values-nl
- values-pa
- values-pl
- values-pt-rPT
- values-pt
- values-ro
- values-ru
- values-si
- values-sk
- values-sl
- values-sq
- values-sr
- values-sv
- values-sw
- values-ta
- values-te
- values-th
- values-tl
- values-tr
- values-uk
- values-ur
- values-uz
- values-v21
- values-v24
- values-vi
- values-zh-rCN
- values-zh-rHK
- values-zh-rTW
- values-zu
- values
- test
- java/androidx/media3/session
- test_data/src/test/assets
- audiosinkdumps
- mka
- mp4
- wav
- sample.wav
- extractordumps
- amr
- avif
- avi
- bmp
- flac
- heif
- jpeg
- mkv_subtitle_transcoding
- mkv
- mp3
- mp4
- ogg
- png
- subtitle_transcoding
- ts
- webp
- webvtt
- media
- amr
- avif
- bitmap
- CompositorTestTimestamps
- input_images
- sample_mp4_first_frame/electrical_colors
- transformer_sequence_effect_test
- dash
- cea608
- multi-period-with-offset
- standalone-webvtt
- thumbnails
- ttml-in-mp4
- hls
- cea608
- multi-segment
- standalone-webvtt
- ttml-in-mp4
- jpeg
- m3u8
- mp3
- mp4
- mpd
- png
- ts
- ttml
- wav
- webp
- webvtt
- muxerdumps
- playbackdumps
- dash
- flac
- hls
- image
- mp3
- mp4
- offloadRecovery
- ogg
- playlists
- subtitles
- ts
- webvtt
- test-generated-goldens
- ByteBufferGlEffectTest_input
- ByteBufferGlEffectTest_output
- ByteBufferGlEffectTest
- CompositorTestTimestamps
- ExoPlayerPlaybackTest
- exoplayerEffectsPreviewTest_ensuresAllFramesRendered
- exoplayerEffectsPreview_withTimestampWrapper_ensuresAllFramesRendered
- FrameDropTest
- GaussianBlurTest
- GaussianBlurWithFrameOverlaidTest
- LanczosResampleTest
- QueuingGlShaderProgramTest
- TimestampAdjustmentTest
- TransformerUltraHdrPixelTest
- hdr-goldens
- lut
- sample_mp4_first_frame
- electrical_colors
- linear_colors
- transformer_multi_sequence_composition_test
- transformer_sequence_effect_test
- transformerdumps
- amr/sample_nb.amr
- composition
- gap
- mkv/sample_with_srt.mkv
- mp3/test-cbr-info-header.mp3
- mp4
- bbb_176x144_128kbps_15fps_h263.3gp
- bbb_176x144_192kbps_15fps_mpeg4.mp4
- bbb_1ch_16kHz_q10_vorbis.ogg
- bbb_6ch_8kHz_opus.ogg
- bbb_mono_16kHz_23.05kbps_amrwb.3gp
- bbb_mono_8kHz_12.2kbps_amrnb.3gp
- h265_with_metadata_track.mp4
- iibbibb_editlist_videoonly.mp4
- long_edit_list_audioonly.mp4
- sample.mp4
- sample_18byte_nclx_colr.mp4
- sample_av1.mp4
- sample_no_bframes.mp4
- sample_sef_slow_motion.mp4
- sample_twos_pcm.mp4
- sample_with_increasing_timestamps_320w_240h.mp4
- sowt-with-video.mov
- sequence
- gap_200ms/gap_500ms
- gap_500ms/sample.wav/gap_200ms
- sample.wav_halfPitch
- sample.wav
- sowt-with-video.mov_halfPitch_removeVideo
- sowt-with-video.mov_removeVideo
- sample.wav
- gap_200ms/sample.wav
- gap_500ms
- gap_200ms
- sample.wav_halfPitch
- sowt-with-video.mov_halfPitch_removeVideo
- sowt-with-video.mov_removeVideo
- sowt-with-video.mov_halfPitch_removeVideo
- sample.wav_halfPitch
- sample.wav
- sowt-with-video.mov_removeVideo
- sowt-with-video.mov_halfPitch
- sowt-with-video.mov_silence_halfPitch
- sowt-with-video.mov_silence
- sowt-with-video.mov
- sowt-with-video.mov_removeVideo
- sample.wav_halfPitch
- sample.wav
- sowt-with-video.mov_halfPitch_removeVideo
- sowt-with-video.mov_silence_halfPitch
- sowt-with-video.mov_halfPitch
- sowt-with-video.mov_silence
- sowt-with-video.mov
- sowt-with-video.mov_silence
- sowt-with-video.mov_halfPitch
- sowt-with-video.mov_silence_halfPitch
- sowt-with-video.mov
- sowt-with-video.mov
- sowt-with-video.mov_halfPitch
- sowt-with-video.mov_silence_halfPitch
- sowt-with-video.mov_silence
- testspecificdumps/writeSample_dropSamplesBeforeFirstVideoSampleEnabled_dropsAudioSamplesTimedBeforeFirstVideoSample
- ts/sample_h264.ts
- wav
- sample.wav
- sample_ima_adpcm.wav
- sample_rf64.wav
- test_exoplayer_playback/src/androidTest
- java/androidx/media3/test/exoplayer/playback/gts
- test_session_common/src/main
- aidl/androidx/media3/test/session/common
- java/androidx/media3/test/session/common
- test_session_current
- src
- androidTest
- java/androidx/media3/session
- legacy
- main
- java/androidx/media3/session
- test_utils_robolectric/src
- main/java/androidx/media3/test/utils/robolectric
- test
- java/androidx/media3/test/utils/robolectric
- test_utils/src
- main/java/androidx/media3/test/utils
- truth
- test/java/androidx/media3/test/utils
- truth
- transformer
- src
- androidTest
- java/androidx/media3/transformer
- mh
- analysis
- performance
- res/layout
- main/java/androidx/media3/transformer
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | | - | |
22 | 20 | | |
23 | 21 | | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
24 | 30 | | |
25 | 31 | | |
26 | 32 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
| 55 | + | |
55 | 56 | | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
60 | 61 | | |
61 | | - | |
62 | | - | |
63 | | - | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
64 | 65 | | |
65 | | - | |
66 | | - | |
| 66 | + | |
| 67 | + | |
67 | 68 | | |
68 | | - | |
69 | | - | |
| 69 | + | |
| 70 | + | |
70 | 71 | | |
71 | | - | |
72 | | - | |
| 72 | + | |
| 73 | + | |
73 | 74 | | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
79 | 80 | | |
80 | | - | |
81 | | - | |
| 81 | + | |
| 82 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | 103 | | |
110 | 104 | | |
111 | 105 | | |
| |||
116 | 110 | | |
117 | 111 | | |
118 | 112 | | |
119 | | - | |
120 | 113 | | |
121 | 114 | | |
122 | 115 | | |
123 | 116 | | |
124 | 117 | | |
125 | 118 | | |
126 | | - | |
127 | | - | |
128 | | - | |
| 119 | + | |
129 | 120 | | |
130 | 121 | | |
131 | 122 | | |
132 | 123 | | |
133 | 124 | | |
134 | 125 | | |
135 | | - | |
| 126 | + | |
136 | 127 | | |
137 | 128 | | |
138 | 129 | | |
| |||
141 | 132 | | |
142 | 133 | | |
143 | 134 | | |
144 | | - | |
145 | | - | |
146 | | - | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
147 | 138 | | |
148 | 139 | | |
149 | 140 | | |
150 | 141 | | |
151 | 142 | | |
152 | | - | |
153 | | - | |
154 | | - | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
155 | 166 | | |
156 | 167 | | |
157 | 168 | | |
| |||
0 commit comments