Added a MediaPlayer visual (audio/video)

AelyoSoftWorks · AelyoSoftWorks · commit a0a38be055ac · 2025-09-22T13:25:11.000+02:00
diff --git a/WiceAot.Samples.Gallery/Pages/AboutPage.cs b/WiceAot.Samples.Gallery/Pages/AboutPage.cs
@@ -34,7 +34,7 @@ public AboutPage()
 #if NETFRAMEWORK
         tb.Text = "Wice for .NET Framework v" + asm.GetInformationalVersion() + " based on DirectN v" + typeof(ComObject).Assembly.GetInformationalVersion() + Environment.NewLine
 #else
-        tb.Text = "Wice for .NET Native AOT v" + asm.GetInformationalVersion() + " based on DirectN AOT v" + typeof(ComObject).Assembly.GetInformationalVersion() + Environment.NewLine
+        tb.Text = $"Wice {RuntimeInformation.ProcessArchitecture} for .NET Native AOT v{asm.GetInformationalVersion()} based on DirectN AOT v{typeof(ComObject).Assembly.GetInformationalVersion()}" + Environment.NewLine
 #endif
         + RuntimeInformation.FrameworkDescription + " - " + DiagnosticsInformation.GetBitness() + Environment.NewLine
             + asm.GetCopyright() + Environment.NewLine
@@ -92,6 +92,7 @@ public AboutPage()
             tlb.MinButton!.IsVisible = false;
             dlg.Content.Children.Add(tlb);
 
+            //TextBox.FontSizeProperty.SetValue(_pg, 12f);
             _pg.GroupByCategory = true;
             _pg.LiveSync = true;
             _pg.MaxWidth = DesiredSize.width * 2 / 3;
diff --git a/WiceAot.Samples.Gallery/Pages/MediaPage.cs b/WiceAot.Samples.Gallery/Pages/MediaPage.cs
@@ -22,6 +22,7 @@ protected override IEnumerable<SampleList> SampleLists
             yield return new PdfViewSampleList();
 #if !NETFRAMEWORK
             yield return new WebViewSampleList();
+            yield return new MediaPlayerSampleList();
 #endif
         }
     }
diff --git a/WiceAot.Samples.Gallery/Resources/Big_Buck_Bunny_360_10s_1MB.mp4 b/WiceAot.Samples.Gallery/Resources/Big_Buck_Bunny_360_10s_1MB.mp4
diff --git a/WiceAot.Samples.Gallery/Resources/samples.xml b/WiceAot.Samples.Gallery/Resources/samples.xml
@@ -1203,6 +1203,16 @@ gma warning restore IDE0017 // Simplify object initialization
 
     // load from .NET embedded resource
     img.Source = Application.CurrentResourceManager.GetWicBitmapSource(Assembly.GetExecutingAssembly(), "Samples.Gallery.Resources.rainier.jpg")!;
+}</sample>
+  <sample namespace="Samples.Media.MediaPlayer.MediaPlayerSample">void Layout(Visual parent)
+{
+    var player = new MediaPlayer();
+    parent.Children.Add(player);
+    player.Width = parent.Window!.DipsToPixels(900);
+    player.Height = parent.Window!.DipsToPixels(500);
+    player.Margin = parent.Window!.DipsToPixels(10);
+    var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(typeof(Program).Namespace + ".Resources.Big_Buck_Bunny_360_10s_1MB.mp4")!;
+    player.Source = MediaSource.CreateFromStream(stream.AsRandomAccessStream(), "video/mp4");
 }</sample>
   <sample namespace="Samples.Media.PdfView.PdfViewSample">void Layout(Visual parent)
 {
diff --git a/WiceAot.Samples.Gallery/Samples/Media/MediaPlayer/MediaPlayerSample.cs b/WiceAot.Samples.Gallery/Samples/Media/MediaPlayer/MediaPlayerSample.cs
@@ -0,0 +1,18 @@
+﻿namespace Wice.Samples.Gallery.Samples.Media.MediaPlayer;
+
+public class MediaPlayerSample : Sample
+{
+    public override string Description => "A Media Player (WinRT) based visual that hosts video content.";
+
+    public override void Layout(Visual parent)
+    {
+        var player = new Wice.MediaPlayer();
+        parent.Children.Add(player);
+        Dock.SetDockType(player, DockType.Top); // remove from display
+        player.Width = parent.Window!.DipsToPixels(900);
+        player.Height = parent.Window!.DipsToPixels(500);
+        player.Margin = parent.Window!.DipsToPixels(10);
+        var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(typeof(Program).Namespace + ".Resources.Big_Buck_Bunny_360_10s_1MB.mp4")!;
+        player.Source = MediaSource.CreateFromStream(stream.AsRandomAccessStream(), "video/mp4");
+    }
+}
diff --git a/WiceAot.Samples.Gallery/Samples/Media/MediaPlayerSampleList.cs b/WiceAot.Samples.Gallery/Samples/Media/MediaPlayerSampleList.cs
@@ -0,0 +1,18 @@
+﻿using Wice.Samples.Gallery.Samples.Media.MediaPlayer;
+
+namespace Wice.Samples.Gallery.Samples.Media;
+
+public class MediaPlayerSampleList : SampleList
+{
+    public override string IconText => MDL2GlyphResource.Video;
+    public override string Description => "You can use a MediaPlayer visual to playback video or audio content.";
+    public override string SubTitle => "A visual that supports displaying audio or video content.";
+
+    protected override IEnumerable<Sample> Types
+    {
+        get
+        {
+            yield return new MediaPlayerSample();
+        }
+    }
+}
diff --git a/WiceAot.Samples.Gallery/WiceAot.Samples.Gallery.csproj b/WiceAot.Samples.Gallery/WiceAot.Samples.Gallery.csproj
@@ -25,6 +25,7 @@
 
 	<ItemGroup>
 		<None Remove="Resources\aelyo_flat.png" />
+		<None Remove="Resources\Big_Buck_Bunny_360_10s_1MB.mp4" />
 		<None Remove="Resources\lorem-cn.txt" />
 		<None Remove="Resources\rainier.jpg" />
 		<None Remove="Resources\sample.pdf" />
@@ -43,6 +44,7 @@
 
 	<ItemGroup>
 		<EmbeddedResource Include="Resources\aelyo_flat.png" />
+		<EmbeddedResource Include="Resources\Big_Buck_Bunny_360_10s_1MB.mp4" />
 		<EmbeddedResource Include="Resources\lorem-cn.txt" />
 		<EmbeddedResource Include="Resources\rainier.jpg" />
 		<EmbeddedResource Include="Resources\sample.pdf">
@@ -84,6 +86,7 @@
 		<Using Include="Wice.Samples.Gallery.Pages" />
 		<Using Include="Wice.Samples.Gallery.Samples" />
 		<Using Include="Wice.Samples.Gallery.Utilities" />
+		<Using Include="Windows.Media.Core" />
 		<Using Include="Windows.UI.Composition" />
 		<Using Include="Windows.Graphics.DirectX" />
 
diff --git a/WiceAot/External/DirectN.Extensions.deps.json b/WiceAot/External/DirectN.Extensions.deps.json
@@ -6,39 +6,39 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v9.0": {
-      "DirectN.Extensions/1.3.2": {
+      "DirectN.Extensions/1.4.1": {
         "dependencies": {
-          "DirectNAot": "1.3.2",
+          "DirectNAot": "1.4.1",
           "Microsoft.DotNet.ILCompiler": "9.0.9",
           "Microsoft.NET.ILLink.Tasks": "9.0.9",
-          "DirectN": "1.3.2.1"
+          "DirectN": "1.4.1.0"
         },
         "runtime": {
           "DirectN.Extensions.dll": {}
         }
       },
       "Microsoft.DotNet.ILCompiler/9.0.9": {},
       "Microsoft.NET.ILLink.Tasks/9.0.9": {},
-      "DirectNAot/1.3.2": {
+      "DirectNAot/1.4.1": {
         "runtime": {
           "DirectN.dll": {
-            "assemblyVersion": "1.3.2.1",
-            "fileVersion": "1.3.2.1"
+            "assemblyVersion": "1.4.1.0",
+            "fileVersion": "1.4.1.0"
           }
         }
       },
-      "DirectN/1.3.2.1": {
+      "DirectN/1.4.1.0": {
         "runtime": {
           "DirectN.dll": {
-            "assemblyVersion": "1.3.2.1",
-            "fileVersion": "1.3.2.1"
+            "assemblyVersion": "1.4.1.0",
+            "fileVersion": "1.4.1.0"
           }
         }
       }
     }
   },
   "libraries": {
-    "DirectN.Extensions/1.3.2": {
+    "DirectN.Extensions/1.4.1": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
@@ -57,12 +57,12 @@
       "path": "microsoft.net.illink.tasks/9.0.9",
       "hashPath": "microsoft.net.illink.tasks.9.0.9.nupkg.sha512"
     },
-    "DirectNAot/1.3.2": {
+    "DirectNAot/1.4.1": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "DirectN/1.3.2.1": {
+    "DirectN/1.4.1.0": {
       "type": "reference",
       "serviceable": false,
       "sha512": ""
diff --git a/WiceAot/External/DirectN.Extensions.dll b/WiceAot/External/DirectN.Extensions.dll
diff --git a/WiceAot/External/DirectN.deps.json b/WiceAot/External/DirectN.deps.json
@@ -6,7 +6,7 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v9.0": {
-      "DirectN/1.3.2": {
+      "DirectN/1.4.1": {
         "dependencies": {
           "Microsoft.DotNet.ILCompiler": "9.0.9",
           "Microsoft.NET.ILLink.Tasks": "9.0.9"
@@ -20,7 +20,7 @@
     }
   },
   "libraries": {
-    "DirectN/1.3.2": {
+    "DirectN/1.4.1": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
diff --git a/WiceAot/External/DirectN.dll b/WiceAot/External/DirectN.dll
diff --git a/WiceAot/MediaPlayer.cs b/WiceAot/MediaPlayer.cs
@@ -0,0 +1,122 @@
+﻿namespace Wice;
+
+public partial class MediaPlayer : Visual, IDisposable
+{
+    /// <summary>
+    /// Identifies the dependency property for the source URI of the media content.
+    /// </summary>
+    public static VisualProperty SourceUriProperty { get; } = VisualProperty.Add<string>(typeof(MediaPlayer), nameof(SourceUri), VisualPropertyInvalidateModes.Render, convert: ValidateNonNullString, changed: OnSourceUriChanged);
+
+    /// <summary>
+    /// Gets the visual property representing the playback source of the media content.
+    /// </summary>
+    public static VisualProperty SourceProperty { get; } = VisualProperty.Add<IMediaPlaybackSource?>(typeof(MediaPlayer), nameof(Source), VisualPropertyInvalidateModes.Render, changed: OnSourceChanged);
+
+    private static void OnSourceUriChanged(BaseObject obj, object? newValue, object? oldValue) => ((MediaPlayer)obj).OnSourceUriChanged();
+    private static void OnSourceChanged(BaseObject obj, object? newValue, object? oldValue) => ((MediaPlayer)obj).OnSourceChanged();
+
+    private Windows.Media.Playback.MediaPlayer? _player = new() { AutoPlay = true, IsLoopingEnabled = true };
+    private MediaPlayerSurface? _surface;
+
+    /// <summary>
+    /// Gets or sets the URI of the source from which the layout is loaded.
+    /// </summary>
+    [Category(CategoryLayout)]
+    public virtual string SourceUri { get => (string?)GetPropertyValue(SourceUriProperty) ?? string.Empty; set => SetPropertyValue(SourceUriProperty, value); }
+
+    /// <summary>
+    /// Gets or sets the media playback source for the current media player.
+    /// </summary>
+    [Category(CategoryLayout)]
+    public virtual IMediaPlaybackSource? Source { get => (IMediaPlaybackSource?)GetPropertyValue(SourceProperty); set => SetPropertyValue(SourceProperty, value); }
+
+    /// <summary>
+    /// Gets the underlying <see cref="Windows.Media.Playback.MediaPlayer"/> instance used for media playback.
+    /// </summary>
+    [Browsable(false)]
+    public Windows.Media.Playback.MediaPlayer? Player => _player;
+
+    /// <summary>
+    /// Called when <see cref="SourceUri"/> changes.
+    /// </summary>
+    protected virtual void OnSourceUriChanged()
+    {
+        if (!Uri.TryCreate(SourceUri, UriKind.Absolute, out var uri))
+            return;
+
+        var source = MediaSource.CreateFromUri(uri);
+        CheckDisposed().Source = source;
+    }
+
+    /// <summary>
+    /// Called when <see cref="Source"/> changes.
+    /// </summary>
+    protected virtual void OnSourceChanged()
+    {
+        CheckDisposed().Source = Source;
+    }
+
+    /// <inheritdoc />
+    protected override void Render()
+    {
+        base.Render();
+        if (CompositionVisual is SpriteVisual spriteVisual && _player != null)
+        {
+            spriteVisual.Brush?.Dispose();
+            _surface?.Dispose();
+            var size = ArrangedRect.Size;
+            _player.SetSurfaceSize(new Size(size.width, size.height));
+            _surface = _player.GetSurface(Compositor);
+            var brush = Compositor!.CreateSurfaceBrush(_surface.CompositionSurface);
+            spriteVisual.Brush = brush;
+        }
+    }
+
+    /// <summary>
+    /// Releases the resources used by the current instance of the class.
+    /// </summary>
+    public void Dispose() { Dispose(disposing: true); GC.SuppressFinalize(this); }
+
+    /// <summary>
+    /// Core dispose pattern implementation.
+    /// </summary>
+    /// <param name="disposing">True if called from <see cref="Dispose()"/>; false if from finalizer.</param>
+    protected virtual void Dispose(bool disposing)
+    {
+        Interlocked.Exchange(ref _surface, null)?.Dispose();
+        Interlocked.Exchange(ref _player, null)?.Dispose();
+    }
+
+    private Windows.Media.Playback.MediaPlayer CheckDisposed()
+    {
+        var player = _player;
+        ObjectDisposedException.ThrowIf(player == null, "MediaPlayer has been disposed and cannot be used anymore.");
+        return player;
+    }
+
+    public static IReadOnlyList<string> VideoFileExtensions => _videoFileExtensions.Value;
+    private static readonly Lazy<List<string>> _videoFileExtensions = new(() => GetMediaFileExtensions("video"));
+
+    public static IReadOnlyList<string> AudioFileExtensions => _audioFileExtensions.Value;
+    private static readonly Lazy<List<string>> _audioFileExtensions = new(() => GetMediaFileExtensions("audio"));
+
+    private static List<string> GetMediaFileExtensions(string type)
+    {
+        var list = new List<string>();
+        foreach (var ext in Registry.ClassesRoot.GetSubKeyNames())
+        {
+            if (!ext.StartsWith('.'))
+                continue;
+
+            using var key = Registry.ClassesRoot.OpenSubKey(ext);
+            var contentType = key?.GetValue("Content Type") as string;
+            if (!string.IsNullOrWhiteSpace(contentType) && contentType.StartsWith(type + "/", StringComparison.OrdinalIgnoreCase))
+            {
+                list.Add(ext);
+            }
+        }
+
+        list.Sort(StringComparer.OrdinalIgnoreCase);
+        return list;
+    }
+}
diff --git a/WiceAot/Properties/AssemblyVersionInfo.cs b/WiceAot/Properties/AssemblyVersionInfo.cs
@@ -1,3 +1,3 @@
-﻿[assembly: AssemblyVersion("2.3.0.3")]
-[assembly: AssemblyFileVersion("2.3.0.3")]
-[assembly: AssemblyInformationalVersion("2.3.0.3")]
+﻿[assembly: AssemblyVersion("2.4.0.0")]
+[assembly: AssemblyFileVersion("2.4.0.0")]
+[assembly: AssemblyInformationalVersion("2.4.0.0")]
diff --git a/WiceAot/WiceAot.csproj b/WiceAot/WiceAot.csproj
@@ -52,6 +52,8 @@
 		<Using Include="Windows.Graphics" />
 		<Using Include="Windows.Graphics.DirectX" />
 		<Using Include="Windows.Graphics.Effects" />
+		<Using Include="Windows.Media.Core" />
+		<Using Include="Windows.Media.Playback" />
 		<Using Include="Windows.UI" />
 		<Using Include="Windows.UI.Composition" />
 		<Using Include="Windows.UI.Composition.Core" />

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ protected override IEnumerable<SampleList> SampleLists`
`22`	`22`	`yield return new PdfViewSampleList();`
`23`	`23`	`#if !NETFRAMEWORK`
`24`	`24`	`yield return new WebViewSampleList();`
	`25`	`+ yield return new MediaPlayerSampleList();`
`25`	`26`	`#endif`
`26`	`27`	`}`
`27`	`28`	`}`