Skip to content

Commit 08ee35f

Browse files
moljacmoljac
authored
Merge pull request #779 from xamarin/mu-20230329-androidx.media.players
Manual updates 20230329 androidx.media.players
2 parents a53e460 + f6d69ed commit 08ee35f

File tree

45 files changed

+2492
-322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2492
-322
lines changed

‎Directory.Build.props

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
1313
<AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>
14-
14+
1515
<!-- Opt out of C#8 features to maintain compatibility with legacy -->
1616
<AndroidBoundInterfacesContainConstants>false</AndroidBoundInterfacesContainConstants>
1717
<AndroidBoundInterfacesContainTypes>false</AndroidBoundInterfacesContainTypes>
@@ -42,7 +42,7 @@
4242
<!-- Exclude TF-specific transform files by default -->
4343
<DefaultTransformExcludes>**/*.MonoAndroid*.0.xml;**/*.net*.0-android.xml</DefaultTransformExcludes>
4444
</PropertyGroup>
45-
45+
4646
<!-- Folders that .targets files need to go into -->
4747
<ItemGroup>
4848
<AndroidXNuGetTargetFolders Include="build\net8.0-android34.0" />
@@ -198,18 +198,27 @@
198198
<AndroidNamespaceReplacement Include='protolayout' Replacement='ProtoLayout' />
199199
<AndroidNamespaceReplacement Include='quicksettings' Replacement='QuickSettings' />
200200
<AndroidNamespaceReplacement Include='contentcapture' Replacement='ContentCapture' />
201+
<AndroidNamespaceReplacement Include='datasource' Replacement='DataSource' />
202+
<AndroidNamespaceReplacement Include='cronet' Replacement='CroNet' />
201203
<AndroidNamespaceReplacement Include='resolutionselector' Replacement='ResolutionSelector' />
202204
<AndroidNamespaceReplacement Include='streamsharing' Replacement='StreamSharing' />
203-
<AndroidNamespaceReplacement Include='domerrors' Replacement='DomErrors' />
204-
<AndroidNamespaceReplacement Include='publickeycredential' Replacement='PublicKeyCredential' />
205-
<AndroidNamespaceReplacement Include='playservices' Replacement='PlayServices' />
206-
<AndroidNamespaceReplacement Include='webauthn' Replacement='WebAuthn' />
207-
<AndroidNamespaceReplacement Include='reflectionguard' Replacement='ReflectionGuard' />
208-
<AndroidNamespaceReplacement Include='Pulltorefresh' Replacement='PullToRefresh' />
209-
<AndroidNamespaceReplacement Include='OkIO' Replacement='OkIO' />
210-
<AndroidNamespaceReplacement Include='Atomicfu' Replacement='AtomicFU' />
211-
<AndroidNamespaceReplacement Include='Emojipicker' Replacement='EmojiPicker' />
212-
205+
<AndroidNamespaceReplacement Include='domerrors' Replacement='DomErrors' />
206+
<AndroidNamespaceReplacement Include='publickeycredential' Replacement='PublicKeyCredential' />
207+
<AndroidNamespaceReplacement Include='playservices' Replacement='PlayServices' />
208+
<AndroidNamespaceReplacement Include='webauthn' Replacement='WebAuthn' />
209+
<AndroidNamespaceReplacement Include='reflectionguard' Replacement='ReflectionGuard' />
210+
<AndroidNamespaceReplacement Include='Pulltorefresh' Replacement='PullToRefresh' />
211+
<AndroidNamespaceReplacement Include='Mediacodec' Replacement='MediaCodec' />
212+
<AndroidNamespaceReplacement Include='Smoothstreaming' Replacement='SmoothStreaming' />
213+
<AndroidNamespaceReplacement Include='Trackselection' Replacement='TrackSelection' />
214+
<AndroidNamespaceReplacement Include='Mediaparser' Replacement='MediaParser' />
215+
<AndroidNamespaceReplacement Include='Workmanager' Replacement='WorkManager' />
216+
<AndroidNamespaceReplacement Include='Interactivemedia' Replacement='InteractiveMedia' />
217+
<AndroidNamespaceReplacement Include='Antmedia' Replacement='AntMedia' />
218+
<AndroidNamespaceReplacement Include='RTMP' Replacement='Rtmp' />
219+
<AndroidNamespaceReplacement Include='OkIO' Replacement='OkIO' />
220+
<AndroidNamespaceReplacement Include='Atomicfu' Replacement='AtomicFU' />
221+
<AndroidNamespaceReplacement Include='Emojipicker' Replacement='EmojiPicker' />
213222
<AndroidNamespaceReplacement Include='privacysandbox' Replacement='PrivacySandbox' />
214223
<AndroidNamespaceReplacement Include='adservices' Replacement='AdServices' />
215224
<AndroidNamespaceReplacement Include='adid' Replacement='AdId' />
@@ -218,4 +227,5 @@
218227
<AndroidNamespaceReplacement Include='customaudience' Replacement='CustomAudience' />
219228
<AndroidNamespaceReplacement Include='mediaextensions' Replacement='MediaExtensions' />
220229
</ItemGroup>
230+
221231
</Project>

‎cgmanifest.json

Lines changed: 259 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2159,6 +2159,253 @@
21592159
},
21602160
"license": "The Apache Software License, Version 2.0"
21612161
},
2162+
{
2163+
"component": {
2164+
"type": "maven",
2165+
"maven": {
2166+
"artifactId": "media3-cast",
2167+
"groupId": "androidx.media3",
2168+
"version": "1.0.2",
2169+
"nuGetId": "Xamarin.AndroidX.Media3.Cast",
2170+
"nuGetVersion": "1.0.2"
2171+
}
2172+
},
2173+
"license": "The Apache Software License, Version 2.0"
2174+
},
2175+
{
2176+
"component": {
2177+
"type": "maven",
2178+
"maven": {
2179+
"artifactId": "media3-common",
2180+
"groupId": "androidx.media3",
2181+
"version": "1.0.2",
2182+
"nuGetId": "Xamarin.AndroidX.Media3.Common",
2183+
"nuGetVersion": "1.0.2"
2184+
}
2185+
},
2186+
"license": "The Apache Software License, Version 2.0"
2187+
},
2188+
{
2189+
"component": {
2190+
"type": "maven",
2191+
"maven": {
2192+
"artifactId": "media3-database",
2193+
"groupId": "androidx.media3",
2194+
"version": "1.0.2",
2195+
"nuGetId": "Xamarin.AndroidX.Media3.Database",
2196+
"nuGetVersion": "1.0.2"
2197+
}
2198+
},
2199+
"license": "The Apache Software License, Version 2.0"
2200+
},
2201+
{
2202+
"component": {
2203+
"type": "maven",
2204+
"maven": {
2205+
"artifactId": "media3-datasource",
2206+
"groupId": "androidx.media3",
2207+
"version": "1.0.2",
2208+
"nuGetId": "Xamarin.AndroidX.Media3.DataSource",
2209+
"nuGetVersion": "1.0.2"
2210+
}
2211+
},
2212+
"license": "The Apache Software License, Version 2.0"
2213+
},
2214+
{
2215+
"component": {
2216+
"type": "maven",
2217+
"maven": {
2218+
"artifactId": "media3-datasource-cronet",
2219+
"groupId": "androidx.media3",
2220+
"version": "1.0.2",
2221+
"nuGetId": "Xamarin.AndroidX.Media3.DataSource.CroNet",
2222+
"nuGetVersion": "1.0.2"
2223+
}
2224+
},
2225+
"license": "The Apache Software License, Version 2.0"
2226+
},
2227+
{
2228+
"component": {
2229+
"type": "maven",
2230+
"maven": {
2231+
"artifactId": "media3-datasource-rtmp",
2232+
"groupId": "androidx.media3",
2233+
"version": "1.0.2",
2234+
"nuGetId": "Xamarin.AndroidX.Media3.DataSource.Rtmp",
2235+
"nuGetVersion": "1.0.2"
2236+
}
2237+
},
2238+
"license": "The Apache Software License, Version 2.0"
2239+
},
2240+
{
2241+
"component": {
2242+
"type": "maven",
2243+
"maven": {
2244+
"artifactId": "media3-decoder",
2245+
"groupId": "androidx.media3",
2246+
"version": "1.0.2",
2247+
"nuGetId": "Xamarin.AndroidX.Media3.Decoder",
2248+
"nuGetVersion": "1.0.2"
2249+
}
2250+
},
2251+
"license": "The Apache Software License, Version 2.0"
2252+
},
2253+
{
2254+
"component": {
2255+
"type": "maven",
2256+
"maven": {
2257+
"artifactId": "media3-effect",
2258+
"groupId": "androidx.media3",
2259+
"version": "1.0.2",
2260+
"nuGetId": "Xamarin.AndroidX.Media3.Effect",
2261+
"nuGetVersion": "1.0.2"
2262+
}
2263+
},
2264+
"license": "The Apache Software License, Version 2.0"
2265+
},
2266+
{
2267+
"component": {
2268+
"type": "maven",
2269+
"maven": {
2270+
"artifactId": "media3-exoplayer",
2271+
"groupId": "androidx.media3",
2272+
"version": "1.0.2",
2273+
"nuGetId": "Xamarin.AndroidX.Media3.ExoPlayer",
2274+
"nuGetVersion": "1.0.2"
2275+
}
2276+
},
2277+
"license": "The Apache Software License, Version 2.0"
2278+
},
2279+
{
2280+
"component": {
2281+
"type": "maven",
2282+
"maven": {
2283+
"artifactId": "media3-exoplayer-dash",
2284+
"groupId": "androidx.media3",
2285+
"version": "1.0.2",
2286+
"nuGetId": "Xamarin.AndroidX.Media3.ExoPlayer.Dash",
2287+
"nuGetVersion": "1.0.2"
2288+
}
2289+
},
2290+
"license": "The Apache Software License, Version 2.0"
2291+
},
2292+
{
2293+
"component": {
2294+
"type": "maven",
2295+
"maven": {
2296+
"artifactId": "media3-exoplayer-hls",
2297+
"groupId": "androidx.media3",
2298+
"version": "1.0.2",
2299+
"nuGetId": "Xamarin.AndroidX.Media3.ExoPlayer.Hls",
2300+
"nuGetVersion": "1.0.2"
2301+
}
2302+
},
2303+
"license": "The Apache Software License, Version 2.0"
2304+
},
2305+
{
2306+
"component": {
2307+
"type": "maven",
2308+
"maven": {
2309+
"artifactId": "media3-exoplayer-rtsp",
2310+
"groupId": "androidx.media3",
2311+
"version": "1.0.2",
2312+
"nuGetId": "Xamarin.AndroidX.Media3.ExoPlayer.Rtsp",
2313+
"nuGetVersion": "1.0.2"
2314+
}
2315+
},
2316+
"license": "The Apache Software License, Version 2.0"
2317+
},
2318+
{
2319+
"component": {
2320+
"type": "maven",
2321+
"maven": {
2322+
"artifactId": "media3-exoplayer-smoothstreaming",
2323+
"groupId": "androidx.media3",
2324+
"version": "1.0.2",
2325+
"nuGetId": "Xamarin.AndroidX.Media3.ExoPlayer.SmoothStreaming",
2326+
"nuGetVersion": "1.0.2"
2327+
}
2328+
},
2329+
"license": "The Apache Software License, Version 2.0"
2330+
},
2331+
{
2332+
"component": {
2333+
"type": "maven",
2334+
"maven": {
2335+
"artifactId": "media3-exoplayer-workmanager",
2336+
"groupId": "androidx.media3",
2337+
"version": "1.0.2",
2338+
"nuGetId": "Xamarin.AndroidX.Media3.ExoPlayer.WorkManager",
2339+
"nuGetVersion": "1.0.2"
2340+
}
2341+
},
2342+
"license": "The Apache Software License, Version 2.0"
2343+
},
2344+
{
2345+
"component": {
2346+
"type": "maven",
2347+
"maven": {
2348+
"artifactId": "media3-extractor",
2349+
"groupId": "androidx.media3",
2350+
"version": "1.0.2",
2351+
"nuGetId": "Xamarin.AndroidX.Media3.Extractor",
2352+
"nuGetVersion": "1.0.2"
2353+
}
2354+
},
2355+
"license": "The Apache Software License, Version 2.0"
2356+
},
2357+
{
2358+
"component": {
2359+
"type": "maven",
2360+
"maven": {
2361+
"artifactId": "media3-session",
2362+
"groupId": "androidx.media3",
2363+
"version": "1.0.2",
2364+
"nuGetId": "Xamarin.AndroidX.Media3.Session",
2365+
"nuGetVersion": "1.0.2"
2366+
}
2367+
},
2368+
"license": "The Apache Software License, Version 2.0"
2369+
},
2370+
{
2371+
"component": {
2372+
"type": "maven",
2373+
"maven": {
2374+
"artifactId": "media3-transformer",
2375+
"groupId": "androidx.media3",
2376+
"version": "1.0.2",
2377+
"nuGetId": "Xamarin.AndroidX.Media3.Transformer",
2378+
"nuGetVersion": "1.0.2"
2379+
}
2380+
},
2381+
"license": "The Apache Software License, Version 2.0"
2382+
},
2383+
{
2384+
"component": {
2385+
"type": "maven",
2386+
"maven": {
2387+
"artifactId": "media3-ui",
2388+
"groupId": "androidx.media3",
2389+
"version": "1.0.2",
2390+
"nuGetId": "Xamarin.AndroidX.Media3.Ui",
2391+
"nuGetVersion": "1.0.2"
2392+
}
2393+
},
2394+
"license": "The Apache Software License, Version 2.0"
2395+
},
2396+
{
2397+
"component": {
2398+
"type": "maven",
2399+
"maven": {
2400+
"artifactId": "media3-ui-leanback",
2401+
"groupId": "androidx.media3",
2402+
"version": "1.0.2",
2403+
"nuGetId": "Xamarin.AndroidX.Media3.Ui.Leanback",
2404+
"nuGetVersion": "1.0.2"
2405+
}
2406+
},
2407+
"license": "The Apache Software License, Version 2.0"
2408+
},
21622409
{
21632410
"component": {
21642411
"type": "maven",
@@ -3793,6 +4040,18 @@
37934040
},
37944041
"license": "The Apache Software License, Version 2.0"
37954042
},
4043+
{
4044+
"component": {
4045+
"type": "maven",
4046+
"maven": {
4047+
"artifactId": "rtmp-client",
4048+
"groupId": "io.antmedia",
4049+
"version": "3.2.0",
4050+
"nuGetId": "Xamarin.Android.AntMedia.RtmpClient",
4051+
"nuGetVersion": "3.2.0"
4052+
}
4053+
}
4054+
},
37964055
{
37974056
"component": {
37984057
"type": "maven",

0 commit comments

Comments
 (0)