Skip to content

Commit af45e18

Browse files
jpobstjpobst
committed
AndroidX Media3 metadata.
1 parent 718dd86 commit af45e18

File tree

26 files changed

+1745
-3
lines changed

26 files changed

+1745
-3
lines changed

‎Directory.Build.props

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<RepositoryCommit>$(BUILD_SOURCEVERSION)</RepositoryCommit>
77

88
<!-- Default TFM's we build for -->
9-
<_DefaultTargetFrameworks>MonoAndroid12.0;net6.0-android;net7.0-android</_DefaultTargetFrameworks>
9+
<_DefaultTargetFrameworks>net7.0-android</_DefaultTargetFrameworks>
1010

1111
<!-- Use an updated 'generator' -->
1212
<!-- It's ok to use "Windows" here because we only use managed code from this package -->
@@ -207,14 +207,21 @@
207207
<AndroidNamespaceReplacement Include='protolayout' Replacement='ProtoLayout' />
208208
<AndroidNamespaceReplacement Include='quicksettings' Replacement='QuickSettings' />
209209
<AndroidNamespaceReplacement Include='contentcapture' Replacement='ContentCapture' />
210+
<AndroidNamespaceReplacement Include='datasource' Replacement='DataSource' />
211+
<AndroidNamespaceReplacement Include='cronet' Replacement='CroNet' />
210212
<AndroidNamespaceReplacement Include='resolutionselector' Replacement='ResolutionSelector' />
211213
<AndroidNamespaceReplacement Include='streamsharing' Replacement='StreamSharing' />
212214
<AndroidNamespaceReplacement Include='domerrors' Replacement='DomErrors' />
213215
<AndroidNamespaceReplacement Include='publickeycredential' Replacement='PublicKeyCredential' />
214216
<AndroidNamespaceReplacement Include='playservices' Replacement='PlayServices' />
215217
<AndroidNamespaceReplacement Include='webauthn' Replacement='WebAuthn' />
216218
<AndroidNamespaceReplacement Include='reflectionguard' Replacement='ReflectionGuard' />
217-
<AndroidNamespaceReplacement Include='Pulltorefresh' Replacement='PullToRefresh' />
218-
219+
<AndroidNamespaceReplacement Include='Pulltorefresh' Replacement='PullToRefresh' />
220+
<AndroidNamespaceReplacement Include='Mediacodec' Replacement='MediaCodec' />
221+
<AndroidNamespaceReplacement Include='Smoothstreaming' Replacement='SmoothStreaming' />
222+
<AndroidNamespaceReplacement Include='Mediaparser' Replacement='MediaParser' />
223+
<AndroidNamespaceReplacement Include='Workmanager' Replacement='WorkManager' />
224+
<AndroidNamespaceReplacement Include='Interactivemedia' Replacement='InteractiveMedia' />
225+
<AndroidNamespaceReplacement Include='Antmedia' Replacement='AntMedia' />
219226
</ItemGroup>
220227
</Project>

‎config.json

Lines changed: 267 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,6 +1245,174 @@
12451245
"nugetId": "Xamarin.AndroidX.Media2.Widget",
12461246
"dependencyOnly": false
12471247
},
1248+
{
1249+
"groupId": "androidx.media3",
1250+
"artifactId": "media3-cast",
1251+
"version": "1.0.2",
1252+
"nugetVersion": "1.0.2",
1253+
"nugetId": "Xamarin.AndroidX.Media3.Cast",
1254+
"dependencyOnly": false
1255+
},
1256+
{
1257+
"groupId": "androidx.media3",
1258+
"artifactId": "media3-common",
1259+
"version": "1.0.2",
1260+
"nugetVersion": "1.0.2",
1261+
"nugetId": "Xamarin.AndroidX.Media3.Common",
1262+
"dependencyOnly": false
1263+
},
1264+
{
1265+
"groupId": "androidx.media3",
1266+
"artifactId": "media3-database",
1267+
"version": "1.0.2",
1268+
"nugetVersion": "1.0.2",
1269+
"nugetId": "Xamarin.AndroidX.Media3.Database",
1270+
"dependencyOnly": false
1271+
},
1272+
{
1273+
"groupId": "androidx.media3",
1274+
"artifactId": "media3-datasource",
1275+
"version": "1.0.2",
1276+
"nugetVersion": "1.0.2",
1277+
"nugetId": "Xamarin.AndroidX.Media3.DataSource",
1278+
"dependencyOnly": false
1279+
},
1280+
{
1281+
"groupId": "androidx.media3",
1282+
"artifactId": "media3-datasource-cronet",
1283+
"version": "1.0.2",
1284+
"nugetVersion": "1.0.2",
1285+
"nugetId": "Xamarin.AndroidX.Media3.DataSource.CroNet",
1286+
"dependencyOnly": false
1287+
},
1288+
{
1289+
"groupId": "androidx.media3",
1290+
"artifactId": "media3-datasource-okhttp",
1291+
"version": "1.0.2",
1292+
"nugetVersion": "1.0.2",
1293+
"nugetId": "Xamarin.AndroidX.Media3.DataSource.OkHttp",
1294+
"dependencyOnly": false
1295+
},
1296+
{
1297+
"groupId": "androidx.media3",
1298+
"artifactId": "media3-datasource-rtmp",
1299+
"version": "1.0.2",
1300+
"nugetVersion": "1.0.2",
1301+
"nugetId": "Xamarin.AndroidX.Media3.DataSource.Rtmp",
1302+
"dependencyOnly": false
1303+
},
1304+
{
1305+
"groupId": "androidx.media3",
1306+
"artifactId": "media3-decoder",
1307+
"version": "1.0.2",
1308+
"nugetVersion": "1.0.2",
1309+
"nugetId": "Xamarin.AndroidX.Media3.Decoder",
1310+
"dependencyOnly": false
1311+
},
1312+
{
1313+
"groupId": "androidx.media3",
1314+
"artifactId": "media3-effect",
1315+
"version": "1.0.2",
1316+
"nugetVersion": "1.0.2",
1317+
"nugetId": "Xamarin.AndroidX.Media3.Effect",
1318+
"dependencyOnly": false
1319+
},
1320+
{
1321+
"groupId": "androidx.media3",
1322+
"artifactId": "media3-exoplayer",
1323+
"version": "1.0.2",
1324+
"nugetVersion": "1.0.2",
1325+
"nugetId": "Xamarin.AndroidX.Media3.ExoPlayer",
1326+
"dependencyOnly": false
1327+
},
1328+
{
1329+
"groupId": "androidx.media3",
1330+
"artifactId": "media3-exoplayer-dash",
1331+
"version": "1.0.2",
1332+
"nugetVersion": "1.0.2",
1333+
"nugetId": "Xamarin.AndroidX.Media3.ExoPlayer.Dash",
1334+
"dependencyOnly": false
1335+
},
1336+
{
1337+
"groupId": "androidx.media3",
1338+
"artifactId": "media3-exoplayer-hls",
1339+
"version": "1.0.2",
1340+
"nugetVersion": "1.0.2",
1341+
"nugetId": "Xamarin.AndroidX.Media3.ExoPlayer.Hls",
1342+
"dependencyOnly": false
1343+
},
1344+
{
1345+
"groupId": "androidx.media3",
1346+
"artifactId": "media3-exoplayer-ima",
1347+
"version": "1.0.2",
1348+
"nugetVersion": "1.0.2",
1349+
"nugetId": "Xamarin.AndroidX.Media3.ExoPlayer.Ima",
1350+
"dependencyOnly": false
1351+
},
1352+
{
1353+
"groupId": "androidx.media3",
1354+
"artifactId": "media3-exoplayer-rtsp",
1355+
"version": "1.0.2",
1356+
"nugetVersion": "1.0.2",
1357+
"nugetId": "Xamarin.AndroidX.Media3.ExoPlayer.Rtsp",
1358+
"dependencyOnly": false
1359+
},
1360+
{
1361+
"groupId": "androidx.media3",
1362+
"artifactId": "media3-exoplayer-smoothstreaming",
1363+
"version": "1.0.2",
1364+
"nugetVersion": "1.0.2",
1365+
"nugetId": "Xamarin.AndroidX.Media3.ExoPlayer.SmoothStreaming",
1366+
"dependencyOnly": false
1367+
},
1368+
{
1369+
"groupId": "androidx.media3",
1370+
"artifactId": "media3-exoplayer-workmanager",
1371+
"version": "1.0.2",
1372+
"nugetVersion": "1.0.2",
1373+
"nugetId": "Xamarin.AndroidX.Media3.ExoPlayer.WorkManager",
1374+
"dependencyOnly": false
1375+
},
1376+
{
1377+
"groupId": "androidx.media3",
1378+
"artifactId": "media3-extractor",
1379+
"version": "1.0.2",
1380+
"nugetVersion": "1.0.2",
1381+
"nugetId": "Xamarin.AndroidX.Media3.Extractor",
1382+
"dependencyOnly": false
1383+
},
1384+
{
1385+
"groupId": "androidx.media3",
1386+
"artifactId": "media3-session",
1387+
"version": "1.0.2",
1388+
"nugetVersion": "1.0.2",
1389+
"nugetId": "Xamarin.AndroidX.Media3.Session",
1390+
"dependencyOnly": false
1391+
},
1392+
{
1393+
"groupId": "androidx.media3",
1394+
"artifactId": "media3-transformer",
1395+
"version": "1.0.2",
1396+
"nugetVersion": "1.0.2",
1397+
"nugetId": "Xamarin.AndroidX.Media3.Transformer",
1398+
"dependencyOnly": false
1399+
},
1400+
{
1401+
"groupId": "androidx.media3",
1402+
"artifactId": "media3-ui",
1403+
"version": "1.0.2",
1404+
"nugetVersion": "1.0.2",
1405+
"nugetId": "Xamarin.AndroidX.Media3.Ui",
1406+
"dependencyOnly": false
1407+
},
1408+
{
1409+
"groupId": "androidx.media3",
1410+
"artifactId": "media3-ui-leanback",
1411+
"version": "1.0.2",
1412+
"nugetVersion": "1.0.2",
1413+
"nugetId": "Xamarin.AndroidX.Media3.Ui.Leanback",
1414+
"dependencyOnly": false
1415+
},
12481416
{
12491417
"groupId": "androidx.mediarouter",
12501418
"artifactId": "mediarouter",
@@ -2096,6 +2264,14 @@
20962264
"dependencyOnly": false,
20972265
"frozen": true
20982266
},
2267+
{
2268+
"groupId": "com.google.ads.interactivemedia.v3",
2269+
"artifactId": "interactivemedia",
2270+
"version": "3.29.0",
2271+
"nugetVersion": "3.29.0",
2272+
"nugetId": "Xamarin.Google.Ads.InteractiveMedia.V3",
2273+
"dependencyOnly": false
2274+
},
20992275
{
21002276
"groupId": "com.google.assistant.appactions",
21012277
"artifactId": "suggestions",
@@ -2266,6 +2442,15 @@
22662442
"dependencyOnly": false,
22672443
"templateSet": "rxjava"
22682444
},
2445+
{
2446+
"groupId": "io.antmedia",
2447+
"artifactId": "rtmp-client",
2448+
"version": "3.2.0",
2449+
"nugetVersion": "3.2.0",
2450+
"nugetId": "Xamarin.Android.AntMedia.RtmpClient",
2451+
"dependencyOnly": false,
2452+
"templateSet": "antmedia-rtpm-client"
2453+
},
22692454
{
22702455
"groupId": "org.checkerframework",
22712456
"artifactId": "checker-compat-qual",
@@ -2456,6 +2641,22 @@
24562641
"nugetId": "Xamarin.AndroidX.Wear.Tiles.Proto",
24572642
"dependencyOnly": true
24582643
},
2644+
{
2645+
"groupId": "com.google.android.gms",
2646+
"artifactId": "play-services-ads-identifier",
2647+
"version": "18.0.1",
2648+
"nugetVersion": "118.0.1.3",
2649+
"nugetId": "Xamarin.GooglePlayServices.Ads.Identifier",
2650+
"dependencyOnly": true
2651+
},
2652+
{
2653+
"groupId": "com.google.android.gms",
2654+
"artifactId": "play-services-ads-identifier",
2655+
"version": "18.0.1",
2656+
"nugetVersion": "118.0.1.3",
2657+
"nugetId": "Xamarin.GooglePlayServices.Ads.Identifier",
2658+
"dependencyOnly": true
2659+
},
24592660
{
24602661
"groupId": "com.google.android.gms",
24612662
"artifactId": "play-services-appindex",
@@ -2464,6 +2665,14 @@
24642665
"nugetId": "Xamarin.GooglePlayServices.AppIndex",
24652666
"dependencyOnly": true
24662667
},
2668+
{
2669+
"groupId": "com.google.android.gms",
2670+
"artifactId": "play-services-appset",
2671+
"version": "16.0.2",
2672+
"nugetVersion": "16.0.2.3",
2673+
"nugetId": "Xamarin.GooglePlayServices.AppSet",
2674+
"dependencyOnly": true
2675+
},
24672676
{
24682677
"groupId": "com.google.android.gms",
24692678
"artifactId": "play-services-auth",
@@ -2472,6 +2681,14 @@
24722681
"nugetId": "Xamarin.GooglePlayServices.Auth",
24732682
"dependencyOnly": true
24742683
},
2684+
{
2685+
"groupId": "com.google.android.gms",
2686+
"artifactId": "play-services-base",
2687+
"version": "18.1.0",
2688+
"nugetVersion": "118.1.0.1",
2689+
"nugetId": "Xamarin.GooglePlayServices.Base",
2690+
"dependencyOnly": true
2691+
},
24752692
{
24762693
"groupId": "com.google.android.gms",
24772694
"artifactId": "play-services-basement",
@@ -2480,6 +2697,22 @@
24802697
"nugetId": "Xamarin.GooglePlayServices.Basement",
24812698
"dependencyOnly": true
24822699
},
2700+
{
2701+
"groupId": "com.google.android.gms",
2702+
"artifactId": "play-services-cast-framework",
2703+
"version": "21.2.0",
2704+
"nugetVersion": "121.2.0.1",
2705+
"nugetId": "Xamarin.GooglePlayServices.Cast.Framework",
2706+
"dependencyOnly": true
2707+
},
2708+
{
2709+
"groupId": "com.google.android.gms",
2710+
"artifactId": "play-services-cronet",
2711+
"version": "18.0.1",
2712+
"nugetVersion": "118.0.1.5",
2713+
"nugetId": "Xamarin.GooglePlayServices.CroNet",
2714+
"dependencyOnly": true
2715+
},
24832716
{
24842717
"groupId": "com.google.android.gms",
24852718
"artifactId": "play-services-fido",
@@ -2528,6 +2761,22 @@
25282761
"nugetId": "Xamarin.Google.ErrorProne.Annotations",
25292762
"dependencyOnly": true
25302763
},
2764+
{
2765+
"groupId": "com.squareup.okhttp3",
2766+
"artifactId": "okhttp",
2767+
"version": "4.11.0",
2768+
"nugetVersion": "4.11.0.2",
2769+
"nugetId": "Square.OkHttp3",
2770+
"dependencyOnly": true
2771+
},
2772+
{
2773+
"groupId": "com.google.android.libraries.identity.googleid",
2774+
"artifactId": "googleid",
2775+
"version": "1.1.0",
2776+
"nugetVersion": "1.1.0",
2777+
"nugetId": "Xamarin.GoogleAndroid.Libraries.Identity.GoogleId",
2778+
"dependencyOnly": true
2779+
},
25312780
{
25322781
"groupId": "com.xamarin.androidx",
25332782
"artifactId": "migration",
@@ -2805,6 +3054,24 @@
28053054
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.slnf"
28063055
}
28073056
]
3057+
},
3058+
{
3059+
"name": "antmedia-rtpm-client",
3060+
"mavenRepositoryType": "MavenCentral",
3061+
"templates": [
3062+
{
3063+
"templateFile": "templates/antmedia-rtpm-client/Project.cshtml",
3064+
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.csproj"
3065+
},
3066+
{
3067+
"templateFile": "templates/antmedia-rtpm-client/NuGetReadMe.cshtml",
3068+
"outputFileRule": "generated/{groupid}.{artifactid}/readme.md"
3069+
},
3070+
{
3071+
"templateFile": "source/AndroidXSolutionFilter.cshtml",
3072+
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.slnf"
3073+
}
3074+
]
28083075
}
28093076
]
28103077
}

‎source/Metadata.common.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
<metadata>
22
<remove-node path="/api/package/*[contains(@name, 'IcsImpl') or contains(@name, 'JellyBeanImpl') or contains(@name, 'JellyBeanMr2Impl') or contains(@name, 'Api16') or contains(@name, 'Api17') or contains(@name, 'Api18') or contains(@name, 'Api19') or contains(@name, 'Api20') or contains(@name, 'Api21') or contains(@name, 'Api22') or contains(@name, 'Api23') or contains(@name, 'Api24') or contains(@name, 'Api25') or contains(@name, 'Api26') or contains(@name, 'Api27') or contains(@name, 'Api28') or contains(@name, 'Api29') or contains(@name, 'Api30') or contains(@name, 'Honeycomb') or contains(@name, 'IceCreamSandwich') or contains(@name, 'Jellybean') or contains(@name, 'KitKat') or contains(@name, 'Lollipop') or contains(@name, 'Marshmallow') or contains(@name, 'Nougat') or contains(@name, 'Oreo') or contains(@name, 'ImplJB') or contains(@name, 'ImplICS') or contains(@name, 'ImplIcs') or contains(@name, 'ImplHC') or contains(@name, 'HcMr1') or contains(@name, 'HcMr2') or contains(@name, 'HcMr3') or contains(@name, 'JbMr2') or contains(@name, 'JbMr2') or contains(@name, 'JbMr1') or contains(@name, 'ICSMr1') or contains(@name, 'ICSMr2') or contains(@name, 'ImplV11') or contains(@name, 'ImplV21')]" />
3+
4+
<!-- Newly bound packages shouldn't create old static interface method alternatives -->
5+
<attr path="/api/package[starts-with(@name, 'androidx.media3')]/interface" name="no-alternatives">true</attr>
36
</metadata>

‎source/androidx.media3/media3-cast/Transforms/Metadata.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<metadata>
2+
<attr
3+
path="/api/package[@name='androidx.media3.cast']/class[@name='CastPlayer']/method[@name='addMediaItems' and count(parameter)=2 and parameter[1][@type='int'] and parameter[2][@type='java.util.List&lt;androidx.media3.common.MediaItem&gt;']]"
4+
name="managedOverride"
5+
>
6+
override
7+
</attr>
8+
<attr
9+
path="/api/package[@name='androidx.media3.cast']/class[@name='CastPlayer']/method[@name='setMediaItems' and count(parameter)=3 and parameter[1][@type='java.util.List&lt;androidx.media3.common.MediaItem&gt;'] and parameter[2][@type='int'] and parameter[3][@type='long']]"
10+
name="managedOverride"
11+
>
12+
override
13+
</attr>
14+
<attr
15+
path="/api/package[@name='androidx.media3.cast']/class[@name='CastPlayer']/method[@name='setMediaItems' and count(parameter)=2 and parameter[1][@type='java.util.List&lt;androidx.media3.common.MediaItem&gt;'] and parameter[2][@type='boolean']]"
16+
name="managedOverride"
17+
>
18+
override
19+
</attr>
20+
</metadata>

0 commit comments

Comments
 (0)