Skip to content

Commit b7411e6

Browse files
Copilotsheiksyedm
andcommitted
Fix Media3 1.8.0 duplicate method compilation errors in DASH and HLS packages
Co-authored-by: sheiksyedm <[email protected]>
1 parent ad9b182 commit b7411e6

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

source/androidx.media3/media3-exoplayer-dash/Transforms/Metadata.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,12 @@
6161
AndroidX.Media3.ExoPlayer.Source.IMediaSourceMediaSourceIFactory
6262
</attr>
6363

64+
<!-- Remove duplicate methods in DashDownloader.Factory -->
65+
<remove-node path="/api/package[@name='androidx.media3.exoplayer.dash.offline']/class[@name='DashDownloader.Factory']/method[@name='create' and count(parameter)=1 and parameter[1][@type='androidx.media3.common.MediaItem']]" />
66+
<remove-node path="/api/package[@name='androidx.media3.exoplayer.dash.offline']/class[@name='DashDownloader.Factory']/method[@name='setDurationUs' and count(parameter)=1 and parameter[1][@type='long']]" />
67+
<remove-node path="/api/package[@name='androidx.media3.exoplayer.dash.offline']/class[@name='DashDownloader.Factory']/method[@name='setExecutor' and count(parameter)=1 and parameter[1][@type='java.util.concurrent.Executor']]" />
68+
<remove-node path="/api/package[@name='androidx.media3.exoplayer.dash.offline']/class[@name='DashDownloader.Factory']/method[@name='setMaxMergedSegmentStartTimeDiffMs' and count(parameter)=1 and parameter[1][@type='long']]" />
69+
<remove-node path="/api/package[@name='androidx.media3.exoplayer.dash.offline']/class[@name='DashDownloader.Factory']/method[@name='setStartPositionUs' and count(parameter)=1 and parameter[1][@type='long']]" />
70+
6471

6572
</metadata>

source/androidx.media3/media3-exoplayer-hls/Transforms/Metadata.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,11 @@
133133
AndroidX.Media3.ExoPlayer.Source.IMediaSourceMediaSourceIFactory
134134
</attr>
135135

136+
<!-- Remove duplicate methods in HlsDownloader.Factory -->
137+
<remove-node path="/api/package[@name='androidx.media3.exoplayer.hls.offline']/class[@name='HlsDownloader.Factory']/method[@name='create' and count(parameter)=1 and parameter[1][@type='androidx.media3.common.MediaItem']]" />
138+
<remove-node path="/api/package[@name='androidx.media3.exoplayer.hls.offline']/class[@name='HlsDownloader.Factory']/method[@name='setDurationUs' and count(parameter)=1 and parameter[1][@type='long']]" />
139+
<remove-node path="/api/package[@name='androidx.media3.exoplayer.hls.offline']/class[@name='HlsDownloader.Factory']/method[@name='setExecutor' and count(parameter)=1 and parameter[1][@type='java.util.concurrent.Executor']]" />
140+
<remove-node path="/api/package[@name='androidx.media3.exoplayer.hls.offline']/class[@name='HlsDownloader.Factory']/method[@name='setMaxMergedSegmentStartTimeDiffMs' and count(parameter)=1 and parameter[1][@type='long']]" />
141+
<remove-node path="/api/package[@name='androidx.media3.exoplayer.hls.offline']/class[@name='HlsDownloader.Factory']/method[@name='setStartPositionUs' and count(parameter)=1 and parameter[1][@type='long']]" />
142+
136143
</metadata>

0 commit comments

Comments
 (0)