From 51e48a3d7780cc998b465d1e7da059e777d84f5e Mon Sep 17 00:00:00 2001 From: Jesse Date: Thu, 5 Sep 2024 10:34:14 +0200 Subject: [PATCH 1/7] Do not run legacy bindings for Media3 --- Directory.Build.props | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 64fd3a936..e2a8f1252 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,9 @@ + + + false + false + https://github.com/xamarin/AndroidX.git git @@ -12,10 +17,6 @@ true - - false - false - false From af2884ee6b25dd801c0e59e6c8118b0f44ccf873 Mon Sep 17 00:00:00 2001 From: Jesse Date: Thu, 5 Sep 2024 10:34:41 +0200 Subject: [PATCH 2/7] Do not remove MediaSourceFactory --- .../androidx.media3/media3-exoplayer/Transforms/Metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml b/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml index ef9437840..9c3d5ee33 100644 --- a/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml @@ -18,9 +18,6 @@ - Date: Thu, 5 Sep 2024 10:39:09 +0200 Subject: [PATCH 3/7] Fix up IHttpDataSource Factories --- .../media3-datasource-cronet/Transforms/Metadata.xml | 2 +- .../media3-datasource-okhttp/Transforms/Metadata.xml | 2 +- .../androidx.media3/media3-datasource/Transforms/Metadata.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/androidx.media3/media3-datasource-cronet/Transforms/Metadata.xml b/source/androidx.media3/media3-datasource-cronet/Transforms/Metadata.xml index 69592b8f9..dfe882041 100644 --- a/source/androidx.media3/media3-datasource-cronet/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-datasource-cronet/Transforms/Metadata.xml @@ -16,7 +16,7 @@ path="/api/package[@name='androidx.media3.datasource.cronet']/class[@name='CronetDataSource.Factory']/method[@name='setDefaultRequestProperties' and count(parameter)=1 and parameter[1][@type='java.util.Map<java.lang.String, java.lang.String>']]" name="managedReturn" > - AndroidX.Media3.DataSource.IHttpDataSourceFactory + AndroidX.Media3.DataSource.IHttpDataSource.IFactory - AndroidX.Media3.DataSource.IHttpDataSourceFactory + AndroidX.Media3.DataSource.IHttpDataSource.IFactory \ No newline at end of file diff --git a/source/androidx.media3/media3-datasource/Transforms/Metadata.xml b/source/androidx.media3/media3-datasource/Transforms/Metadata.xml index 8f9b6a462..b9664a46f 100644 --- a/source/androidx.media3/media3-datasource/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-datasource/Transforms/Metadata.xml @@ -27,7 +27,7 @@ path="/api/package[@name='androidx.media3.datasource']/class[@name='DefaultHttpDataSource.Factory']/method[@name='setDefaultRequestProperties' and count(parameter)=1 and parameter[1][@type='java.util.Map<java.lang.String, java.lang.String>']]" name="managedReturn" > - AndroidX.Media3.DataSource.IHttpDataSourceFactory + AndroidX.Media3.DataSource.IHttpDataSource.IFactory Date: Thu, 5 Sep 2024 11:21:10 +0200 Subject: [PATCH 4/7] Fix up DRM --- .../media3-exoplayer/Transforms/Metadata.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml b/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml index 9c3d5ee33..0d4ab42cc 100644 --- a/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml @@ -277,6 +277,18 @@ true + + + + + + Date: Thu, 5 Sep 2024 11:21:35 +0200 Subject: [PATCH 5/7] Fix up MediaSource Factories --- .../Transforms/Metadata.xml | 19 +++++++++++ .../Transforms/Metadata.xml | 19 +++++++++++ .../Transforms/Metadata.xml | 19 +++++++++++ .../Transforms/Metadata.xml | 19 ++++++++++- .../media3-exoplayer/Transforms/Metadata.xml | 33 +++++++++++++++++++ 5 files changed, 108 insertions(+), 1 deletion(-) diff --git a/source/androidx.media3/media3-exoplayer-dash/Transforms/Metadata.xml b/source/androidx.media3/media3-exoplayer-dash/Transforms/Metadata.xml index 4d0b717d7..f7a77a1e1 100644 --- a/source/androidx.media3/media3-exoplayer-dash/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-exoplayer-dash/Transforms/Metadata.xml @@ -41,4 +41,23 @@ true + + AndroidX.Media3.ExoPlayer.Source.IMediaSource + + + AndroidX.Media3.ExoPlayer.Source.IMediaSource.IFactory + + + AndroidX.Media3.ExoPlayer.Source.IMediaSource.IFactory + + \ No newline at end of file diff --git a/source/androidx.media3/media3-exoplayer-hls/Transforms/Metadata.xml b/source/androidx.media3/media3-exoplayer-hls/Transforms/Metadata.xml index d82555e45..f36799e6f 100644 --- a/source/androidx.media3/media3-exoplayer-hls/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-exoplayer-hls/Transforms/Metadata.xml @@ -88,4 +88,23 @@ true + + AndroidX.Media3.ExoPlayer.Source.IMediaSource + + + AndroidX.Media3.ExoPlayer.Source.IMediaSource.IFactory + + + AndroidX.Media3.ExoPlayer.Source.IMediaSource.IFactory + + \ No newline at end of file diff --git a/source/androidx.media3/media3-exoplayer-rtsp/Transforms/Metadata.xml b/source/androidx.media3/media3-exoplayer-rtsp/Transforms/Metadata.xml index 54d571eb5..47d5ec2ea 100644 --- a/source/androidx.media3/media3-exoplayer-rtsp/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-exoplayer-rtsp/Transforms/Metadata.xml @@ -12,4 +12,23 @@ true + + AndroidX.Media3.ExoPlayer.Source.IMediaSource + + + AndroidX.Media3.ExoPlayer.Source.IMediaSource.IFactory + + + AndroidX.Media3.ExoPlayer.Source.IMediaSource.IFactory + + \ No newline at end of file diff --git a/source/androidx.media3/media3-exoplayer-smoothstreaming/Transforms/Metadata.xml b/source/androidx.media3/media3-exoplayer-smoothstreaming/Transforms/Metadata.xml index d309c6cfe..1f3887975 100644 --- a/source/androidx.media3/media3-exoplayer-smoothstreaming/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-exoplayer-smoothstreaming/Transforms/Metadata.xml @@ -75,5 +75,22 @@ true - + + AndroidX.Media3.ExoPlayer.Source.IMediaSource + + + AndroidX.Media3.ExoPlayer.Source.IMediaSource.IFactory + + + AndroidX.Media3.ExoPlayer.Source.IMediaSource.IFactory + \ No newline at end of file diff --git a/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml b/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml index 0d4ab42cc..3d00cbf27 100644 --- a/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml @@ -290,6 +290,39 @@ + + AndroidX.Media3.ExoPlayer.Source.IMediaSource.IFactory + + + + AndroidX.Media3.ExoPlayer.Source.IMediaSource.IFactory + + + + AndroidX.Media3.ExoPlayer.Source.IMediaSource + + + AndroidX.Media3.ExoPlayer.Source.IMediaSource.IFactory + + + AndroidX.Media3.ExoPlayer.Source.IMediaSource.IFactory + + Date: Thu, 5 Sep 2024 11:33:24 +0200 Subject: [PATCH 6/7] =?UTF-8?q?=EF=BB=BFRemove=20these=20for=20now=20as=20?= =?UTF-8?q?I=20cant=20figure=20these=20out?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../media3-effect/Transforms/Metadata.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/source/androidx.media3/media3-effect/Transforms/Metadata.xml b/source/androidx.media3/media3-effect/Transforms/Metadata.xml index c1f2ef06d..0e1db772d 100644 --- a/source/androidx.media3/media3-effect/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-effect/Transforms/Metadata.xml @@ -138,7 +138,6 @@ AndroidX.Media3.Common.IVideoFrameProcessor - - + + + \ No newline at end of file From 8b22bfb788af6505cc1d3354f1fdb1c7a29b99a9 Mon Sep 17 00:00:00 2001 From: Jesse Date: Thu, 5 Sep 2024 12:26:21 +0200 Subject: [PATCH 7/7] =?UTF-8?q?=EF=BB=BFFix=20up=20non=20deprecated=20medi?= =?UTF-8?q?a=20sources?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../media3-exoplayer/Transforms/Metadata.xml | 55 +++++++++++++++---- 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml b/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml index 3d00cbf27..3af40bad9 100644 --- a/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml +++ b/source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml @@ -173,16 +173,6 @@ - - - - AndroidX.Media3.ExoPlayer.Source.IMediaSource.IFactory + + + Java.Lang.Object + + + Java.Lang.Object + true + + true + + true + + + + true + + + true + + true + + + false + \ No newline at end of file