Skip to content

Commit a63f55d

Browse files
moljacmoljac
authored
Merge pull request #1075 from dotnet/mu-20241112-issue-1036-androidx.media3.exoplayer
Manual updates 20241112 androidx.media3.exoplayer fixes
2 parents 1b07477 + 0c8feb6 commit a63f55d

15 files changed

+349
-32
lines changed

‎cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3726,7 +3726,7 @@
37263726
"artifactId": "work-multiprocess",
37273727
"groupId": "androidx.work",
37283728
"version": "2.10.0",
3729-
"nuGetId": "Xamarin.AndroidX.Work.Multiprocess",
3729+
"nuGetId": "Xamarin.AndroidX.Work.MultiProcess",
37303730
"nuGetVersion": "2.10.0.2"
37313731
}
37323732
},

‎docs/artifact-list-with-versions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@
291291
| 284|androidx.window:window-rxjava3 |1.3.0 |Xamarin.AndroidX.Window.WindowRxJava3 |1.3.0.4 |
292292
| 285|androidx.window.extensions.core:core |1.0.0 |Xamarin.AndroidX.Window.Extensions.Core.Core |1.0.0.12 |
293293
| 286|androidx.work:work-gcm |2.10.0 |Xamarin.AndroidX.Work.GCM |2.10.0.2 |
294-
| 287|androidx.work:work-multiprocess |2.10.0 |Xamarin.AndroidX.Work.Multiprocess |2.10.0.2 |
294+
| 287|androidx.work:work-multiprocess |2.10.0 |Xamarin.AndroidX.Work.MultiProcess |2.10.0.2 |
295295
| 288|androidx.work:work-runtime |2.10.0 |Xamarin.AndroidX.Work.Runtime |2.10.0.2 |
296296
| 289|androidx.work:work-runtime-ktx |2.10.0 |Xamarin.AndroidX.Work.Work.Runtime.Ktx |2.10.0.2 |
297297
| 290|androidx.work:work-rxjava2 |2.10.0 |Xamarin.AndroidX.Work.RxJava2 |2.10.0.2 |

‎docs/artifact-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@
291291
| 284|androidx.window:window-rxjava3 |Xamarin.AndroidX.Window.WindowRxJava3 |
292292
| 285|androidx.window.extensions.core:core |Xamarin.AndroidX.Window.Extensions.Core.Core |
293293
| 286|androidx.work:work-gcm |Xamarin.AndroidX.Work.GCM |
294-
| 287|androidx.work:work-multiprocess |Xamarin.AndroidX.Work.Multiprocess |
294+
| 287|androidx.work:work-multiprocess |Xamarin.AndroidX.Work.MultiProcess |
295295
| 288|androidx.work:work-runtime |Xamarin.AndroidX.Work.Runtime |
296296
| 289|androidx.work:work-runtime-ktx |Xamarin.AndroidX.Work.Work.Runtime.Ktx |
297297
| 290|androidx.work:work-rxjava2 |Xamarin.AndroidX.Work.RxJava2 |

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,25 @@
4141
true
4242
</attr>
4343

44+
45+
<attr
46+
path="/api/package[@name='androidx.media3.exoplayer.dash']/class[@name='DashMediaSource.Factory']/method[@name='createMediaSource' and count(parameter)=1 and parameter[1][@type='androidx.media3.common.MediaItem']]"
47+
name="managedReturn"
48+
>
49+
AndroidX.Media3.ExoPlayer.Source.IMediaSource
50+
</attr>
51+
<attr
52+
path="/api/package[@name='androidx.media3.exoplayer.dash']/class[@name='DashMediaSource.Factory']/method[@name='setDrmSessionManagerProvider' and count(parameter)=1 and parameter[1][@type='androidx.media3.exoplayer.drm.DrmSessionManagerProvider']]"
53+
name="managedReturn"
54+
>
55+
AndroidX.Media3.ExoPlayer.Source.IMediaSourceMediaSourceIFactory
56+
</attr>
57+
<attr
58+
path="/api/package[@name='androidx.media3.exoplayer.dash']/class[@name='DashMediaSource.Factory']/method[@name='setLoadErrorHandlingPolicy' and count(parameter)=1 and parameter[1][@type='androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy']]"
59+
name="managedReturn"
60+
>
61+
AndroidX.Media3.ExoPlayer.Source.IMediaSourceMediaSourceIFactory
62+
</attr>
63+
64+
4465
</metadata>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,24 @@
8888
true
8989
</attr>
9090

91+
<attr
92+
path="/api/package[@name='androidx.media3.exoplayer.hls']/class[@name='HlsMediaSource.Factory']/method[@name='createMediaSource' and count(parameter)=1 and parameter[1][@type='androidx.media3.common.MediaItem']]"
93+
name="managedReturn"
94+
>
95+
AndroidX.Media3.ExoPlayer.Source.IMediaSource
96+
</attr>
97+
<attr
98+
path="/api/package[@name='androidx.media3.exoplayer.hls']/class[@name='HlsMediaSource.Factory']/method[@name='setDrmSessionManagerProvider' and count(parameter)=1 and parameter[1][@type='androidx.media3.exoplayer.drm.DrmSessionManagerProvider']]"
99+
name="managedReturn"
100+
>
101+
AndroidX.Media3.ExoPlayer.Source.IMediaSourceMediaSourceIFactory
102+
</attr>
103+
<attr
104+
path="/api/package[@name='androidx.media3.exoplayer.hls']/class[@name='HlsMediaSource.Factory']/method[@name='setLoadErrorHandlingPolicy' and count(parameter)=1 and parameter[1][@type='androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy']]"
105+
name="managedReturn"
106+
>
107+
AndroidX.Media3.ExoPlayer.Source.IMediaSourceMediaSourceIFactory
108+
</attr>
109+
110+
91111
</metadata>

‎source/androidx.media3/media3-exoplayer-rtsp/Transforms/Metadata.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,24 @@
1212
true
1313
</attr>
1414

15+
16+
<attr
17+
path="/api/package[@name='androidx.media3.exoplayer.rtsp']/class[@name='RtspMediaSource.Factory']/method[@name='createMediaSource' and count(parameter)=1 and parameter[1][@type='androidx.media3.common.MediaItem']]"
18+
name="managedReturn"
19+
>
20+
AndroidX.Media3.ExoPlayer.Source.IMediaSource
21+
</attr>
22+
<attr
23+
path="/api/package[@name='androidx.media3.exoplayer.rtsp']/class[@name='RtspMediaSource.Factory']/method[@name='setDrmSessionManagerProvider' and count(parameter)=1 and parameter[1][@type='androidx.media3.exoplayer.drm.DrmSessionManagerProvider']]"
24+
name="managedReturn"
25+
>
26+
AndroidX.Media3.ExoPlayer.Source.IMediaSourceMediaSourceIFactory
27+
</attr>
28+
<attr
29+
path="/api/package[@name='androidx.media3.exoplayer.rtsp']/class[@name='RtspMediaSource.Factory']/method[@name='setLoadErrorHandlingPolicy' and count(parameter)=1 and parameter[1][@type='androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy']]"
30+
name="managedReturn"
31+
>
32+
AndroidX.Media3.ExoPlayer.Source.IMediaSourceMediaSourceIFactory
33+
</attr>
34+
1535
</metadata>

‎source/androidx.media3/media3-exoplayer-smoothstreaming/Transforms/Metadata.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,23 @@
7676
</attr>
7777

7878

79+
<attr
80+
path="/api/package[@name='androidx.media3.exoplayer.smoothstreaming']/class[@name='SsMediaSource.Factory']/method[@name='createMediaSource' and count(parameter)=1 and parameter[1][@type='androidx.media3.common.MediaItem']]"
81+
name="managedReturn"
82+
>
83+
AndroidX.Media3.ExoPlayer.Source.IMediaSource
84+
</attr>
85+
<attr
86+
path="/api/package[@name='androidx.media3.exoplayer.smoothstreaming']/class[@name='SsMediaSource.Factory']/method[@name='setDrmSessionManagerProvider' and count(parameter)=1 and parameter[1][@type='androidx.media3.exoplayer.drm.DrmSessionManagerProvider']]"
87+
name="managedReturn"
88+
>
89+
AndroidX.Media3.ExoPlayer.Source.IMediaSourceMediaSourceIFactory
90+
</attr>
91+
<attr
92+
path="/api/package[@name='androidx.media3.exoplayer.smoothstreaming']/class[@name='SsMediaSource.Factory']/method[@name='setLoadErrorHandlingPolicy' and count(parameter)=1 and parameter[1][@type='androidx.media3.exoplayer.upstream.LoadErrorHandlingPolicy']]"
93+
name="managedReturn"
94+
>
95+
AndroidX.Media3.ExoPlayer.Source.IMediaSourceMediaSourceIFactory
96+
</attr>
97+
7998
</metadata>

‎source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.Audio.MediaCodecAudioRenderer.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#nullable restore
2+
using System;
3+
using System.Collections.Generic;
4+
using Android.Runtime;
5+
using Java.Interop;
6+
7+
namespace AndroidX.Media3.ExoPlayer.Audio
8+
{
9+
public partial class MediaCodecAudioRenderer
10+
{
11+
12+
public override unsafe string? NameRendererCapabilities
13+
{
14+
get
15+
{
16+
return this.Name;
17+
}
18+
19+
}
20+
}
21+
}

‎source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.Image.ImageRenderer.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#nullable restore
2+
using System;
3+
using System.Collections.Generic;
4+
using Android.Runtime;
5+
using Java.Interop;
6+
7+
namespace AndroidX.Media3.ExoPlayer.Image
8+
{
9+
public partial class ImageRenderer
10+
{
11+
12+
public override unsafe string? NameRendererCapabilities
13+
{
14+
get
15+
{
16+
return this.Name;
17+
}
18+
19+
}
20+
}
21+
}

‎source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.Metadata.MetadataRenderer.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#nullable restore
2+
using System;
3+
using System.Collections.Generic;
4+
using Android.Runtime;
5+
using Java.Interop;
6+
7+
namespace AndroidX.Media3.ExoPlayer.Metadata
8+
{
9+
public partial class MetadataRenderer
10+
{
11+
12+
public override unsafe string? NameRendererCapabilities
13+
{
14+
get
15+
{
16+
return this.Name;
17+
}
18+
19+
}
20+
}
21+
}

0 commit comments

Comments
 (0)