Tested and succeeded playing issue #531

Addressing #526
Upgrading to dot net 5.0

Author: mariodivece

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+
+[*.cs]
+indent_style = space
+indent_size = 4
+
+# CA2000: Dispose objects before losing scope
+dotnet_diagnostic.CA2000.severity = suggestion

README.md

@@ -15,7 +15,7 @@
 - If you would like to support this project, you can show your appreciation via [PayPal.Me](https://www.paypal.me/mariodivece/50usd)
 - Current Status: (2019-12-28) - Release 4.2.330 is now available, (see the <a href="https://github.com/unosquare/ffmediaelement/releases">Releases</a>)
 - NuGet Package available here: https://www.nuget.org/packages/FFME.Windows/
-- FFmpeg Version: 4.2.1 <a href="https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-4.2.1-win32-shared.zip">32-bit</a> or <a href="https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2.1-win64-shared.zip">64-bit</a>
+- FFmpeg Version: <a href="https://ffmpeg.org/download.html">4.3.1</a> -- Make sure you download one built as a SHARED library and for your right architecture (typically x64)
 - BREAKING CHANGE: Starting realease 4.1.320 the `Source` dependency property has been downgraded to a notification property. Please use the asynchronous `Open` and `Close` methods instead.
 
 *Please note the current NuGet realease might require a different version of the FFmpeg binaries than the ones of the current state of the source code.*
@@ -25,7 +25,7 @@
 Here is a quick guide on how to get started.
 1. Open Visual Studio (v2019 preview recommended), and create a new WPF Application. Target Framework must be 4.6.1 or above, or .Net Core 3.0 or above.
 2. Install the NuGet Package from your Package Manager Console: `PM> Install-Package FFME.Windows`
-3. You need FFmpeg **shared** binaries (64 or 32 bit, depending on your app's target architecture). Build your own or download a compatible build from [Zeranoe FFmpeg Builds site](https://ffmpeg.zeranoe.com/builds/).
+3. You need FFmpeg **shared** binaries (64 or 32 bit, depending on your app's target architecture). Build your own or download a compatible build from [FFmpeg Windows Downloads](https://ffmpeg.org/download.html).
 4. Your FFmpeg build should have a `bin` folder with 3 exe files and some dll files. Copy all those files to a folder such as `c:\ffmpeg`
 5. Within you application's startup code (`Main` method), set `Unosquare.FFME.Library.FFmpegDirectory = @"c:\ffmpeg";`.
 6. Use the FFME `MediaElement` control as any other WPF control.
@@ -96,7 +96,7 @@ A high-level diagram is provided as additional reference below.
 *Please note that I am unable to distribute FFmpeg's binaries because I don't know if I am allowed to do so. Follow the instructions below to compile, run and test FFME.*
 
 1. Clone this repository and make sure you have <a href="https://dotnet.microsoft.com/download/dotnet-core/3.1">.Net Core 3.1 or above</a> installed.
-2. Download the FFmpeg **shared** binaries for your target architecture: <a href="https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-4.2.1-win32-shared.zip">32-bit</a> or <a href="https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2.1-win64-shared.zip">64-bit</a>.
+2. Download the FFmpeg **shared** binaries for your target architecture: <a href="https://ffmpeg.org/download.html">FFmpeg Windows Downloads</a>.
 3. Extract the contents of the <code>zip</code> file you just downloaded and go to the <code>bin</code> folder that got extracted. You should see 3 <code>exe</code> files and multiple <code>dll</code> files. Select and copy all of them.
 4. Now paste all files from the prior step onto a well-known folder. Take note of the full path. (I used `c:\ffmpeg\`)
 5. Open the solution and set the <code>Unosquare.FFME.Windows.Sample</code> project as the startup project. You can do this by right clicking on the project and selecting <code>Set as startup project</code>. Please note that you will need Visual Studio 2019 with dotnet Core 3.0 SDK for your target architecture installed.
@@ -139,7 +139,6 @@ The source code for this project contains a very capable media player (`FFME.Win
 *In no particular order*
 
 - To the <a href="http://ffmpeg.org/">FFmpeg team</a> for making the Swiss Army Knife of media. I encourage you to donate to them.
-- To Kyle Schwarz for creating and making <a href="http://ffmpeg.zeranoe.com/builds/">Zeranoe FFmpeg builds available to everyone</a>.
 - To the <a href="https://github.com/naudio/NAudio">NAudio</a> team for making the best audio library out there for .NET -- one day I will contribute some improvements I have noticed they need.
 - To Ruslan Balanukhin for his FFmpeg interop bindings generator tool: <a href="https://github.com/Ruslan-B/FFmpeg.AutoGen">FFmpeg.AutoGen</a>.
 - To Martin Bohme for his <a href="http://dranger.com/ffmpeg/">tutorial</a> on creating a video player with FFmpeg.

Support/nugetdoc.md

@@ -1,7 +1,7 @@
 Here is a quick guide on how to get started.
 1. Open Visual Studio (v2019 recommended), and create a new WPF Application. Target Framework must be .Net Core 3+ or .Net Framework 4.6.1+.
 2. Install the NuGet Package from your Package Manager Console: `PM> Install-Package FFME.Windows`
-3. You need FFmpeg **shared** binaries (64 or 32 bit, depending on your app's target architecture). Build your own or download a compatible build from [Zeranoe FFmpeg Builds site](https://ffmpeg.zeranoe.com/builds/).
+3. You need FFmpeg **shared** binaries (64 or 32 bit, depending on your app's target architecture). Build your own or download a compatible build from [FFmpeg Windows Downloads](https://ffmpeg.org/download.html).
 4. Your FFmpeg build should have a `bin` folder with 3 exe files and some dll files. Copy all those files to a folder such as `c:\ffmpeg`
 5. Within you application's startup code (`Main` method), set `Unosquare.FFME.Library.FFmpegDirectory = @"c:\ffmpeg";`.
 6. Use the FFME `MediaElement` control as any other WPF control.

Support/readme.txt

@@ -3,7 +3,7 @@ How to use FFME
 In order to use the FFME MediaElement control, you will need to setup a folder with FFmpeg binaries and point to it from your application code.
 Here are the steps:
 
-1. You can build your own FFmpeg shared binaries or download a compatible build from the wonderful Zeranoe FFmpeg Builds site: (https://ffmpeg.zeranoe.com/).
+1. You can build your own FFmpeg **shared** binaries or download a compatible build from the FFmpeg Windows Downloads page: (https://ffmpeg.org/download.html).
 2. Your FFmpeg build (see the bin folder) should have 3 exe files and a number of dll files and must match your app's architecture (32-bit or 64-bit). Copy all of them to a folder such as (c:\ffmpeg)
 3. Within you application's startup code (Main method), set Unosquare.FFME.Library.FFmpegDirectory = @"path to ffmpeg binaries from the previous step";.
 4. Use the FFME MediaElement control as any other WPF control!

Unosquare.FFME.MediaElement/MediaElement.cs

@@ -29,7 +29,7 @@ public partial class MediaElement : ILoggingHandler, ILoggingSource, INotifyProp
         /// <returns>The awaitable command.</returns>
         public ConfiguredTaskAwaitable<bool> ChangeMedia() => Task.Run(async () =>
         {
-            try { return await MediaCore.ChangeMedia(); }
+            try { return await MediaCore.ChangeMedia().ConfigureAwait(false); }
             catch (Exception ex) { PostMediaFailedEvent(ex); }
             return false;
         }).ConfigureAwait(true);
@@ -40,7 +40,7 @@ public ConfiguredTaskAwaitable<bool> ChangeMedia() => Task.Run(async () =>
         /// <returns>The awaitable command.</returns>
         public ConfiguredTaskAwaitable<bool> Play() => Task.Run(async () =>
         {
-            try { return await MediaCore.Play(); }
+            try { return await MediaCore.Play().ConfigureAwait(false); }
             catch (Exception ex) { PostMediaFailedEvent(ex); }
             return false;
         }).ConfigureAwait(true);
@@ -51,7 +51,7 @@ public ConfiguredTaskAwaitable<bool> Play() => Task.Run(async () =>
         /// <returns>The awaitable command.</returns>
         public ConfiguredTaskAwaitable<bool> Pause() => Task.Run(async () =>
         {
-            try { return await MediaCore.Pause(); }
+            try { return await MediaCore.Pause().ConfigureAwait(false); }
             catch (Exception ex) { PostMediaFailedEvent(ex); }
             return false;
         }).ConfigureAwait(true);
@@ -62,7 +62,7 @@ public ConfiguredTaskAwaitable<bool> Pause() => Task.Run(async () =>
         /// <returns>The awaitable command.</returns>
         public ConfiguredTaskAwaitable<bool> Stop() => Task.Run(async () =>
         {
-            try { return await MediaCore.Stop(); }
+            try { return await MediaCore.Stop().ConfigureAwait(false); }
             catch (Exception ex) { PostMediaFailedEvent(ex); }
             return false;
         }).ConfigureAwait(true);
@@ -75,7 +75,7 @@ public ConfiguredTaskAwaitable<bool> Stop() => Task.Run(async () =>
         /// <returns>The awaitable command.</returns>
         public ConfiguredTaskAwaitable<bool> Seek(TimeSpan target) => Task.Run(async () =>
         {
-            try { return await MediaCore.Seek(target); }
+            try { return await MediaCore.Seek(target).ConfigureAwait(false); }
             catch (Exception ex) { PostMediaFailedEvent(ex); }
             return false;
         }).ConfigureAwait(true);
@@ -86,7 +86,7 @@ public ConfiguredTaskAwaitable<bool> Seek(TimeSpan target) => Task.Run(async ()
         /// <returns>The awaitable command.</returns>
         public ConfiguredTaskAwaitable<bool> StepForward() => Task.Run(async () =>
         {
-            try { return await MediaCore.StepForward(); }
+            try { return await MediaCore.StepForward().ConfigureAwait(false); }
             catch (Exception ex) { PostMediaFailedEvent(ex); }
             return false;
         }).ConfigureAwait(true);
@@ -97,7 +97,7 @@ public ConfiguredTaskAwaitable<bool> StepForward() => Task.Run(async () =>
         /// <returns>The awaitable command.</returns>
         public ConfiguredTaskAwaitable<bool> StepBackward() => Task.Run(async () =>
         {
-            try { return await MediaCore.StepBackward(); }
+            try { return await MediaCore.StepBackward().ConfigureAwait(false); }
             catch (Exception ex) { PostMediaFailedEvent(ex); }
             return false;
         }).ConfigureAwait(true);
@@ -111,7 +111,7 @@ public ConfiguredTaskAwaitable<bool> StepBackward() => Task.Run(async () =>
         /// <returns>The awaitable task.</returns>
         public ConfiguredTaskAwaitable<bool> Open(Uri uri) => Task.Run(async () =>
         {
-            try { return await MediaCore.Open(uri); }
+            try { return await MediaCore.Open(uri).ConfigureAwait(false); }
             catch (Exception ex) { PostMediaFailedEvent(ex); }
 
             return false;
@@ -124,7 +124,7 @@ public ConfiguredTaskAwaitable<bool> Open(Uri uri) => Task.Run(async () =>
         /// <returns>The awaitable task.</returns>
         public ConfiguredTaskAwaitable<bool> Open(IMediaInputStream stream) => Task.Run(async () =>
         {
-            try { return await MediaCore.Open(stream); }
+            try { return await MediaCore.Open(stream).ConfigureAwait(false); }
             catch (Exception ex) { PostMediaFailedEvent(ex); }
 
             return false;
@@ -136,7 +136,7 @@ public ConfiguredTaskAwaitable<bool> Open(IMediaInputStream stream) => Task.Run(
         /// <returns>The awaitable command.</returns>
         public ConfiguredTaskAwaitable<bool> Close() => Task.Run(async () =>
         {
-            try { return await MediaCore.Close(); }
+            try { return await MediaCore.Close().ConfigureAwait(false); }
             catch (Exception ex) { PostMediaFailedEvent(ex); }
 
             return false;

Unosquare.FFME.MediaElement/Platform/MediaConnector.cs

@@ -47,16 +47,16 @@ public void OnMediaEnded(MediaEngine sender)
 
                 if (behavior == MediaPlaybackState.Close)
                 {
-                    await sender.Close();
+                    await sender.Close().ConfigureAwait(true);
                 }
                 else if (behavior == MediaPlaybackState.Play)
                 {
-                    await sender.Stop();
-                    await sender.Play();
+                    await sender.Stop().ConfigureAwait(true);
+                    await sender.Play().ConfigureAwait(true);
                 }
                 else if (behavior == MediaPlaybackState.Stop)
                 {
-                    await sender.Stop();
+                    await sender.Stop().ConfigureAwait(true);
                 }
             });
         }
@@ -88,14 +88,14 @@ public void OnMediaOpened(MediaEngine sender, MediaInfo mediaInfo)
                     // Start playback if we don't support pausing
                     if (sender.State.CanPause == false)
                     {
-                        await sender.Play();
+                        await sender.Play().ConfigureAwait(true);
                         return;
                     }
 
                     if (Parent.LoadedBehavior == MediaPlaybackState.Play)
-                        await sender.Play();
+                        await sender.Play().ConfigureAwait(true);
                     else if (Parent.LoadedBehavior == MediaPlaybackState.Pause)
-                        await sender.Pause();
+                        await sender.Pause().ConfigureAwait(true);
                 }
                 finally
                 {

Unosquare.FFME.Windows.Sample/.editorconfig

@@ -20,8 +20,7 @@ public partial class App
         public App()
         {
             // Change the default location of the ffmpeg binaries (same directory as application)
-            // You can get the 32-bit binaries here: https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-4.2.1-win32-shared.zip
-            // You can get the 64-bit binaries here: https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2.1-win64-shared.zip
+            // You can get the 64-bit binaries here: https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-full-shared.7z
             Library.FFmpegDirectory = @"c:\ffmpeg" + (Environment.Is64BitProcess ? @"\x64" : string.Empty);
 
             // You can pick which FFmpeg binaries are loaded. See issue #28
@@ -34,7 +33,7 @@ public App()
             // dispatcher threads to render video frames. This is an experimental feature
             // and might become deprecated in the future as no real performance enhancements
             // have been detected.
-            Library.EnableWpfMultiThreadedVideo = !Debugger.IsAttached; // test with true and false
+            Library.EnableWpfMultiThreadedVideo = false; // !Debugger.IsAttached; // test with true and false
         }
 
         /// <summary>
@@ -101,7 +100,7 @@ await dispatcher.BeginInvoke(new Action(() =>
                                 $"Unable to Load FFmpeg Libraries from path:\r\n    {Library.FFmpegDirectory}" +
                                 $"\r\nMake sure the above folder contains FFmpeg shared binaries (dll files) for the " +
                                 $"applicantion's architecture ({(Environment.Is64BitProcess ? "64-bit" : "32-bit")})" +
-                                $"\r\nTIP: You can download builds from https://ffmpeg.zeranoe.com/builds/" +
+                                $"\r\nTIP: You can download builds from https://ffmpeg.org/download.html" +
                                 $"\r\n{ex.GetType().Name}: {ex.Message}\r\n\r\nApplication will exit.",
                                 "FFmpeg Error",
                                 MessageBoxButton.OK,

Unosquare.FFME.Windows.Sample/App.xaml.cs

@@ -12,7 +12,7 @@
     /// </summary>
     public class CustomPlaylistEntryCollection : PlaylistEntryCollection<CustomPlaylistEntry>
     {
-        private readonly object SyncRoot = new object();
+        private readonly object SyncRoot = new();
         private readonly PlaylistViewModel ViewModel;
 
         /// <summary>
@@ -66,6 +66,8 @@ public CustomPlaylistEntry FindEntryByMediaSource(Uri mediaSource)
         /// <param name="info">The media information.</param>
         public void AddOrUpdateEntry(Uri mediaSource, MediaInfo info)
         {
+            if (info == null) throw new ArgumentNullException(nameof(info));
+
             lock (SyncRoot)
             {
                 var entry = FindEntryByMediaSource(mediaSource);
@@ -115,7 +117,7 @@ public void AddOrUpdateEntry(Uri mediaSource, MediaInfo info)
                     foreach (var c in metaKey)
                     {
                         if (char.IsWhiteSpace(c))
-                            sb.Append("-");
+                            sb.Append('-');
                         else
                             sb.Append(c);
                     }
@@ -134,6 +136,8 @@ public void AddOrUpdateEntry(Uri mediaSource, MediaInfo info)
         /// <param name="bitmap">The bitmap.</param>
         public void AddOrUpdateEntryThumbnail(Uri mediaSource, BitmapDataBuffer bitmap)
         {
+            if (bitmap == null) throw new ArgumentNullException(nameof(bitmap));
+
             lock (SyncRoot)
             {
                 var entry = FindEntryByMediaSource(mediaSource);

Unosquare.FFME.Windows.Sample/Foundation/CustomPlaylistEntryCollection.cs

@@ -76,11 +76,13 @@ public static void EnableDisplayTimeout()
         }
 
         /// <summary>
-        /// Captures the specified window state.
+        /// Captures the specified window object.
         /// </summary>
-        /// <param name="w">The w.</param>
+        /// <param name="w">The window state object.</param>
         public void Capture(Window w)
         {
+            if (w == null) throw new ArgumentNullException(nameof(w));
+
             WindowState = w.WindowState;
             Top = w.Top;
             Left = w.Left;
@@ -95,6 +97,8 @@ public void Capture(Window w)
         /// <param name="w">The w.</param>
         public void Apply(Window w)
         {
+            if (w == null) throw new ArgumentNullException(nameof(w));
+
             w.WindowState = WindowState;
             w.Top = Top;
             w.Left = Left;