Update Media Element to use Media3

src/CommunityToolkit.Maui.Camera/CommunityToolkit.Maui.Camera.csproj

@@ -50,23 +50,8 @@
  </ItemGroup>
 
  <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
- <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.3.1.1" />
- <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.3.1.1" />
-
- <!-- Xamarin.AndroidX.Camera 1.3.1.1 depends on Xamarin.AndroidX.Lifecycle.LiveData 2.7.0.1:
- https://www.nuget.org/packages/Xamarin.AndroidX.Camera.Core/#dependencies-body-tab 
- However, Dotnet MAUI still implicitly references Xamarin.AndroidX.Lifecycle.LiveData 2.6.1.3:
- https://github.com/dotnet/maui/blob/main/eng/AndroidX.targets
- This causes build error "Detected package downgrade":
- https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1605
- Workaround: add a package reference to the higher version of the package. Possibly can be removed when MAUI bumps the implicit reference version.
- -->
- <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.7.0.1" />
-
- <!--Adding the above package reference requires Workaround for https://github.com/xamarin/AndroidX/issues/800#issuecomment-1774639627 -->
- <!-- Tracking issue https://github.com/xamarin/AndroidX/issues/764 -->
- <PackageReference Include="Xamarin.AndroidX.Collection" Version="1.4.0.1" />
- <PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.0.1" />
+ <PackageReference Include="Xamarin.AndroidX.Camera.View" Version="1.3.4.1" />
+ <PackageReference Include="Xamarin.AndroidX.Camera.Camera2" Version="1.3.4.1" />
  </ItemGroup>
 
  <ItemGroup>

src/CommunityToolkit.Maui.MediaElement/CommunityToolkit.Maui.MediaElement.csproj

@@ -48,21 +48,38 @@
  </PropertyGroup>
 
  <ItemGroup>
- <None Include="..\..\build\nuget.png" PackagePath="icon.png" Pack="true"/>
- <None Include="ReadMe.txt" pack="true" PackagePath="."/>
+ <None Include="..\..\build\nuget.png" PackagePath="icon.png" Pack="true" />
+ <None Include="ReadMe.txt" pack="true" PackagePath="." />
  </ItemGroup>
 
  <ItemGroup>
- <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
- <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
+ <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+ <None Include="..\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes\bin\$(Configuration)\netstandard2.0\CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
  </ItemGroup>
 
  <ItemGroup Condition="$(TargetFramework.Contains('-android'))">
- <PackageReference Include="Xam.Plugins.Android.ExoPlayer" Version="[2.19.1,)"/>
- <PackageReference Include="Xam.Plugins.Android.ExoPlayer.Transformer" Version="[2.19.1,)"/>
- <PackageReference Include="Xam.Plugins.Android.ExoPlayer.MediaSession" Version="[2.19.1,)"/>
- </ItemGroup>
+ <PackageReference Include="Xamarin.AndroidX.Media3.ExoPlayer" Version="1.0.2" />
+ <PackageReference Include="Xamarin.AndroidX.Media3.UI" Version="1.0.2" />
+ <PackageReference Include="Xamarin.AndroidX.Media3.ExoPlayer.Rtsp" Version="1.0.2" />
+ <PackageReference Include="Xamarin.AndroidX.Media3.ExoPlayer.Hls" Version="1.0.2" />
+ <PackageReference Include="Xamarin.AndroidX.Media3.ExoPlayer.Dash" Version="1.0.2" />
+ <PackageReference Include="Xamarin.AndroidX.Media3.Session" Version="1.0.2" />
+
+ <!--Adding the above package reference requires Workaround for https://github.com/xamarin/AndroidX/issues/800#issuecomment-1774639627 -->
+ <!-- Tracking issue https://github.com/xamarin/AndroidX/issues/764 -->
 
+ <PackageReference Include="Xamarin.AndroidX.Lifecycle.Common" Version="2.8.3.1" />
+ <PackageReference Include="Xamarin.AndroidX.Collection" Version="1.4.2" />
+ <PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.2" />
+ <PackageReference Include="Xamarin.AndroidX.Collection.Jvm" Version="1.4.2" />
+ <PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" Version="2.8.3.1" />
+ <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core" Version="2.8.3.1" />
+ <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" Version="2.8.3.1" />
+ <PackageReference Include="Xamarin.AndroidX.Lifecycle.Process" Version="2.8.3.1" />
+ <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx" Version="2.8.3.1" />
+ <PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.9.0.4" />
+ </ItemGroup>
+
  <ItemGroup>
  <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiPackageVersion)"/>
  </ItemGroup>

src/CommunityToolkit.Maui.MediaElement/Services/MediaControlsService.android.cs

@@ -4,15 +4,13 @@
 using Android.App;
 using Android.Content;
 using Android.Content.PM;
-using Android.Graphics;
 using Android.Media;
 using Android.OS;
 using Android.Support.V4.Media.Session;
 using AndroidX.Core.App;
 using AndroidX.LocalBroadcastManager.Content;
 using CommunityToolkit.Maui.Core.Views;
 using Microsoft.Win32.SafeHandles;
-using AndroidStream = Android.Media.Stream;
 using Resource = Microsoft.Maui.Resource;
 
 namespace CommunityToolkit.Maui.Media.Services;
@@ -32,7 +30,6 @@ class MediaControlsService : Service
  PendingIntentFlags pendingIntentFlags;
  SafeHandle? safeHandle = new SafeFileHandle(IntPtr.Zero, true);
  MediaSessionCompat? mediaSession;
- AudioManager? audioManager;
  NotificationCompat.Builder? notification;
  NotificationCompat.Action? actionPlay;
  NotificationCompat.Action? actionPause;
@@ -46,23 +43,20 @@ class MediaControlsService : Service
  public override StartCommandResult OnStartCommand([NotNull] Intent? intent, StartCommandFlags flags, int startId)
  {
  ArgumentNullException.ThrowIfNull(intent);
-
  if (!string.IsNullOrEmpty(intent.Action) && receiveUpdates is not null)
  {
  BroadcastUpdate(ACTION_UPDATE_PLAYER, intent.Action);
  }
-
  StartForegroundService(intent).AsTask().ContinueWith(t =>
  {
  if (t.Exception is not null)
  {
  foreach (var exception in t.Exception.InnerExceptions)
  {
- System.Diagnostics.Trace.WriteLine($"[error] {exception}, {exception.Message}");
+ System.Diagnostics.Trace.TraceError($"[error] {exception}, {exception.Message}");
  }
  }
  }, TaskContinuationOptions.OnlyOnFaulted);
-
  return StartCommandResult.Sticky;
  }
 
@@ -92,8 +86,6 @@ ValueTask StartForegroundService(Intent mediaManagerIntent, CancellationToken ca
  LocalBroadcastManager.GetInstance(this).RegisterReceiver(receiveUpdates, new IntentFilter(ACTION_UPDATE_UI));
  }
 
- OnSetupAudioServices();
-
  pendingIntentFlags = Build.VERSION.SdkInt >= BuildVersionCodes.S
  ? PendingIntentFlags.UpdateCurrent | PendingIntentFlags.Immutable
  : PendingIntentFlags.UpdateCurrent;
@@ -112,9 +104,8 @@ async ValueTask InitializeNotification(MediaSessionCompat mediaSession, Intent m
 
  if (Build.VERSION.SdkInt >= BuildVersionCodes.S)
  {
- style.SetShowActionsInCompactView(0, 1, 2, 3);
+ style.SetShowActionsInCompactView(0,1,2);
  }
-
  if (Build.VERSION.SdkInt < BuildVersionCodes.Tiramisu
  && notification is null)
  {
@@ -124,7 +115,7 @@ async ValueTask InitializeNotification(MediaSessionCompat mediaSession, Intent m
  }
 
  notification ??= new NotificationCompat.Builder(Platform.AppContext, "1");
-
+ 
  notification.SetStyle(style);
  notification.SetSmallIcon(_Microsoft.Android.Resource.Designer.Resource.Drawable.exo_styled_controls_audiotrack);
  notification.SetAutoCancel(false);
@@ -170,60 +161,51 @@ void OnReceiveUpdatesPropertyChanged(object? sender, PropertyChangedEventArgs e)
  notification.Build();
  }
 
- void OnSetupAudioServices()
- {
- audioManager = GetSystemService(Context.AudioService) as AudioManager;
- ArgumentNullException.ThrowIfNull(audioManager);
- audioManager.RequestAudioFocus(null, AndroidStream.Music, AudioFocus.Gain);
- audioManager.SetParameters("Ducking=true");
- audioManager.SetStreamVolume(AndroidStream.Music, audioManager.GetStreamVolume(AndroidStream.Music), 0);
- }
-
- async Task OnSetContent(Intent mediaManagerIntent, CancellationToken cancellationToken)
- {
- var albumArtUri = mediaManagerIntent.GetStringExtra("albumArtUri") ?? string.Empty;
- var bitmap = await MediaManager.GetBitmapFromUrl(albumArtUri, cancellationToken).ConfigureAwait(false);
- var title = mediaManagerIntent.GetStringExtra("title") ?? string.Empty;
- var artist = mediaManagerIntent.GetStringExtra("artist") ?? string.Empty;
- notification?.SetContentTitle(title);
- notification?.SetContentText(artist);
- notification?.SetLargeIcon(bitmap);
- }
-
- void OnSetIntents()
- {
- var pause = new Intent(this, typeof(MediaControlsService));
- pause.SetAction("MediaAction.pause");
- var pPause = PendingIntent.GetService(this, 1, pause, pendingIntentFlags);
- actionPause ??= new NotificationCompat.Action.Builder(Resource.Drawable.exo_controls_pause, ACTION_PAUSE, pPause).Build();
-
- var play = new Intent(this, typeof(MediaControlsService));
- play.SetAction("MediaAction.play");
- var pPlay = PendingIntent.GetService(this, 1, play, pendingIntentFlags);
- actionPlay ??= new NotificationCompat.Action.Builder(Resource.Drawable.exo_controls_play, ACTION_PLAY, pPlay).Build();
-
- var previous = new Intent(this, typeof(MediaControlsService));
- previous.SetAction("MediaAction.rewind");
- var pPrevious = PendingIntent.GetService(this, 1, previous, pendingIntentFlags);
- actionPrevious ??= new NotificationCompat.Action.Builder(Resource.Drawable.exo_controls_rewind, ACTION_REWIND, pPrevious).Build();
-
- var next = new Intent(this, typeof(MediaControlsService));
- next.SetAction("MediaAction.fastForward");
- var pNext = PendingIntent.GetService(this, 1, next, pendingIntentFlags);
- actionNext ??= new NotificationCompat.Action.Builder(Resource.Drawable.exo_controls_fastforward, ACTION_FASTFORWARD, pNext).Build();
+ async Task OnSetContent(Intent mediaManagerIntent, CancellationToken cancellationToken)
+ {
+ var albumArtUri = mediaManagerIntent.GetStringExtra("albumArtUri") ?? string.Empty;
+ var bitmap = await MediaManager.GetBitmapFromUrl(albumArtUri, cancellationToken).ConfigureAwait(false);
+ var title = mediaManagerIntent.GetStringExtra("title") ?? string.Empty;
+ var artist = mediaManagerIntent.GetStringExtra("artist") ?? string.Empty;
+ notification?.SetContentTitle(title);
+ notification?.SetContentText(artist);
+ notification?.SetLargeIcon(bitmap);
+ }
 
- notification?.AddAction(actionPrevious);
- notification?.AddAction(actionPause);
- notification?.AddAction(actionNext);
- }
+ void OnSetIntents()
+ {
+ var pause = new Intent(this, typeof(MediaControlsService));
+ pause.SetAction("MediaAction.pause");
+ var pPause = PendingIntent.GetService(this, 1, pause, pendingIntentFlags);
+ actionPause ??= new NotificationCompat.Action.Builder(Resource.Drawable.exo_icon_pause, ACTION_PAUSE, pPause).Build();
+
+ var play = new Intent(this, typeof(MediaControlsService));
+ play.SetAction("MediaAction.play");
+ var pPlay = PendingIntent.GetService(this, 1, play, pendingIntentFlags);
+ actionPlay ??= new NotificationCompat.Action.Builder(Resource.Drawable.exo_icon_play, ACTION_PLAY, pPlay).Build();
+
+ var previous = new Intent(this, typeof(MediaControlsService));
+ previous.SetAction("MediaAction.rewind");
+ var pPrevious = PendingIntent.GetService(this, 1, previous, pendingIntentFlags);
+ actionPrevious ??= new NotificationCompat.Action.Builder(Resource.Drawable.exo_icon_rewind, ACTION_REWIND, pPrevious).Build();
+
+ var next = new Intent(this, typeof(MediaControlsService));
+ next.SetAction("MediaAction.fastForward");
+ var pNext = PendingIntent.GetService(this, 1, next, pendingIntentFlags);
+ actionNext ??= new NotificationCompat.Action.Builder(Resource.Drawable.exo_icon_fastforward, ACTION_FASTFORWARD, pNext).Build();
+
+ notification?.AddAction(actionPrevious);
+ notification?.AddAction(actionPause);
+ notification?.AddAction(actionNext);
+ }
 
  static void BroadcastUpdate(string receiver, string action)
  {
  if (Build.VERSION.SdkInt >= BuildVersionCodes.Tiramisu)
  {
  System.Diagnostics.Trace.WriteLine($"{LocalBroadcastManager.GetInstance} not supported on Android 13 and above.");
  return;
-  }
+ }
  var intent = new Intent(receiver);
  intent.PutExtra("ACTION", action);
  LocalBroadcastManager.GetInstance(Platform.AppContext).SendBroadcast(intent);
@@ -238,9 +220,6 @@ protected override void Dispose(bool disposing)
  safeHandle?.Dispose();
  safeHandle = null;
  }
- audioManager?.AbandonAudioFocus(null);
- audioManager?.SetParameters("Ducking=false");
- audioManager?.Dispose();
  mediaSession?.Release();
  mediaSession?.Dispose();
  mediaSession = null;
@@ -257,7 +236,6 @@ protected override void Dispose(bool disposing)
  base.Dispose(disposing);
  }
 }
-
 /// <summary>
 /// A <see cref="BroadcastReceiver"/> that listens for updates from the <see cref="MediaManager"/>. 
 /// </summary>

src/CommunityToolkit.Maui.MediaElement/Views/MauiMediaElement.android.cs

@@ -5,7 +5,7 @@
 using Android.Widget;
 using AndroidX.CoordinatorLayout.Widget;
 using AndroidX.Core.View;
-using Com.Google.Android.Exoplayer2.UI;
+using AndroidX.Media3.UI;
 using CommunityToolkit.Maui.Views;
 
 namespace CommunityToolkit.Maui.Core.Views;
@@ -15,7 +15,7 @@ namespace CommunityToolkit.Maui.Core.Views;
 /// </summary>
 public class MauiMediaElement : CoordinatorLayout
 {
- readonly StyledPlayerView playerView;
+ readonly PlayerView playerView;
  int defaultSystemUiVisibility;
  bool isSystemBarVisible;
  bool isFullScreen;
@@ -34,8 +34,8 @@ public MauiMediaElement(nint ptr, JniHandleOwnership jni) : base(Platform.AppCon
  /// Initializes a new instance of the <see cref="MauiMediaElement"/> class.
  /// </summary>
  /// <param name="context">The application's <see cref="Context"/>.</param>
- /// <param name="playerView">The <see cref="StyledPlayerView"/> that acts as the platform media player.</param>
- public MauiMediaElement(Context context, StyledPlayerView playerView) : base(context)
+ /// <param name="playerView">The <see cref="PlayerView"/> that acts as the platform media player.</param>
+ public MauiMediaElement(Context context, PlayerView playerView) : base(context)
  {
  this.playerView = playerView;
 
@@ -59,7 +59,7 @@ public override void OnDetachedFromWindow()
  {
  if (isFullScreen)
  {
- OnFullscreenButtonClick(this, new StyledPlayerView.FullscreenButtonClickEventArgs(!isFullScreen));
+ OnFullscreenButtonClick(this, new PlayerView.FullscreenButtonClickEventArgs(!isFullScreen));
  }
  base.OnDetachedFromWindow();
  }
@@ -102,7 +102,7 @@ protected override void Dispose(bool disposing)
  base.Dispose(disposing);
  }
 
- void OnFullscreenButtonClick(object? sender, StyledPlayerView.FullscreenButtonClickEventArgs e)
+ void OnFullscreenButtonClick(object? sender, PlayerView.FullscreenButtonClickEventArgs e)
  {
  // Ensure there is a player view
  if (playerView is null)
@@ -111,7 +111,7 @@ void OnFullscreenButtonClick(object? sender, StyledPlayerView.FullscreenButtonCl
  }
  var layout = CurrentPlatformContext.CurrentWindow.DecorView as ViewGroup;
 
- if (e.IsFullScreen)
+ if (e.P0)
  {
  isFullScreen = true;
  RemoveView(relativeLayout);