- Code clean up

Author: antonioseric

FFMpeg.Xamarin/FFMpeg.Xamarin.csproj

@@ -15,7 +15,7 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,6 +45,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="FFMpegLibrary.cs" />
+    <Compile Include="FFMpegSource.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

FFMpeg.Xamarin/FFMpegLibrary.cs

@@ -15,10 +15,8 @@ namespace FFMpeg.Xamarin
 {
     public class FFMpegLibrary
     {
-
         public string CDNHost { get; set; } = "raw.githubusercontent.com";
-
-
+        
         public static FFMpegLibrary Instance = new FFMpegLibrary();
 
         private bool _initialized = false;
@@ -30,16 +28,13 @@ public class FFMpegLibrary
         /// </summary>
         /// <param name="context"></param>
         /// <returns></returns>
-        public async Task Init(
-            Context context, 
-            string cdn = null, 
-            string downloadTitle = null, 
-            string downloadMessage = null)
+        public async Task Init(Context context, string cdn = null, string downloadTitle = null, string downloadMessage = null)
         {
             if (_initialized)
                 return;
 
-            if (cdn != null) {
+            if (cdn != null)
+            {
                 CDNHost = cdn;
             }
 
@@ -48,7 +43,7 @@ public async Task Init(
 
             ffmpegFile = new Java.IO.File(filesDir + "/ffmpeg");
 
-            FFMPEGSource source = FFMPEGSource.Get();
+            FFMpegSource source = FFMpegSource.Get();
 
             await Task.Run(() =>
             {
@@ -65,7 +60,8 @@ await Task.Run(() =>
                             return;
                         }
                     }
-                    catch(Exception ex) {
+                    catch (Exception ex)
+                    {
                         System.Diagnostics.Debug.WriteLine($" Error validating file {ex}");
                     }
 
@@ -86,7 +82,8 @@ await Task.Run(() =>
                 return;
             }
 
-            if (ffmpegFile.Exists()) {
+            if (ffmpegFile.Exists())
+            {
                 ffmpegFile.Delete();
             }
 
@@ -97,53 +94,44 @@ await Task.Run(() =>
             dlg.Indeterminate = false;
             dlg.SetProgressStyle(ProgressDialogStyle.Horizontal);
             dlg.SetCancelable(false);
-            dlg.CancelEvent += (s, e) => {
-                
+            dlg.CancelEvent += (s, e) =>
+            {
+
             };
 
             dlg.SetCanceledOnTouchOutside(false);
             dlg.Show();
 
-
             using (var c = new System.Net.Http.HttpClient())
             {
                 using (var fout = System.IO.File.OpenWrite(ffmpegFile.AbsolutePath))
                 {
-
                     string url = source.Url;
                     var g = new System.Net.Http.HttpRequestMessage(System.Net.Http.HttpMethod.Get, url);
-                    
-                    var h = await c.SendAsync(g, System.Net.Http.HttpCompletionOption.ResponseHeadersRead);
-
 
-
-
-
-                    
+                    var h = await c.SendAsync(g, System.Net.Http.HttpCompletionOption.ResponseHeadersRead);
 
                     var buffer = new byte[51200];
 
-
                     var s = await h.Content.ReadAsStreamAsync();
                     long total = h.Content.Headers.ContentLength.GetValueOrDefault();
 
                     IEnumerable<string> sl;
                     if (h.Headers.TryGetValues("Content-Length", out sl))
                     {
-                        if (total == 0 && sl.Any()) {
+                        if (total == 0 && sl.Any())
+                        {
                             long.TryParse(sl.FirstOrDefault(), out total);
                         }
                     }
 
-
                     int count = 0;
-
                     int progress = 0;
 
                     dlg.Max = (int)total;
 
-
-                    while ((count = await s.ReadAsync(buffer, 0, buffer.Length)) > 0) {
+                    while ((count = await s.ReadAsync(buffer, 0, buffer.Length)) > 0)
+                    {
 
                         await fout.WriteAsync(buffer, 0, count);
 
@@ -155,10 +143,6 @@ await Task.Run(() =>
                     }
 
                     dlg.Hide();
-
-
-                    
-                    
                 }
             }
 
@@ -180,22 +164,18 @@ await Task.Run(() =>
         /// <param name="cmd"></param>
         /// <param name="logger"></param>
         /// <returns></returns>
-        public static async Task<int> Run(Context context, string cmd, Action<string> logger = null) {
-
+        public static async Task<int> Run(Context context, string cmd, Action<string> logger = null)
+        {
             try
             {
                 TaskCompletionSource<int> source = new TaskCompletionSource<int>();
 
-
-
                 await Instance.Init(context);
 
                 await Task.Run(() =>
                 {
                     try
                     {
-
-
                         int n = _Run(context, cmd, logger);
                         source.SetResult(n);
                     }
@@ -208,8 +188,8 @@ await Task.Run(() =>
 
                 return await source.Task;
             }
-            catch (Exception ex) {
-
+            catch (Exception ex)
+            {
                 System.Diagnostics.Debug.WriteLine(ex);
 
                 throw ex;
@@ -218,16 +198,10 @@ await Task.Run(() =>
 
         public static string EndOfFFMPEGLine = "final ratefactor:";
 
-        private static int _Run(
-            Context context,
-            string cmd,
-            Action<string> logger = null)
+        private static int _Run(Context context, string cmd, Action<string> logger = null)
         {
-
             TaskCompletionSource<int> task = new TaskCompletionSource<int>();
 
-
-
             System.Diagnostics.Debug.WriteLine($"ffmpeg initialized");
 
             //var process = Java.Lang.Runtime.GetRuntime().Exec( Instance.ffmpegFile.CanonicalPath + " " + cmd );
@@ -248,8 +222,6 @@ private static int _Run(
 
             process.Start();
 
-            
-
 
             Task.Run(() =>
             {
@@ -270,7 +242,8 @@ private static int _Run(
                             if (line.StartsWith(EndOfFFMPEGLine))
                             {
 
-                                Task.Run(async () => {
+                                Task.Run(async () =>
+                                {
                                     await Task.Delay(TimeSpan.FromMinutes(1));
                                     finished = true;
                                 });
@@ -283,78 +256,22 @@ private static int _Run(
 
                     }
                 }
-                catch (Exception ex) {
+                catch (Exception ex)
+                {
                     System.Diagnostics.Debug.WriteLine(ex);
                 }
             });
 
             while (!finished)
             {
                 process.WaitForExit(10000);
-                if (process.HasExited) {
+                if (process.HasExited)
+                {
                     break;
                 }
             }
 
             return process.ExitCode;
-
-
-        }
-
-
-    }
-
-
-    public class FFMPEGSource {
-
-
-        public static FFMPEGSource Get() {
-
-            string osArchitecture = Java.Lang.JavaSystem.GetProperty("os.arch");
-
-            foreach (var source in Sources) {
-                if (source.IsArch(osArchitecture))
-                    return source;
-            }
-
-            throw new NotImplementedException();
         }
-
-
-
-        
-
-
-        public FFMPEGSource(string arch, Func<string,bool> isArch, string hash)
-        {
-            this.Arch = arch;
-            this.IsArch = isArch;
-            this.Hash = hash;
-        }
-
-        public static string FFMPEGVersion { get;  } = "3.0.1";
-
-        public static FFMPEGSource[] Sources = new FFMPEGSource[] {
-            new FFMPEGSource("arm", x=> !x.EndsWith("86"), "4nzzxDKxIYlvyK8tFH7/iNMHTdU="),
-            new FFMPEGSource("x86", x=> x.EndsWith("86"), "DdTbrTBf8Zeh6p5hWL0ggdIp5w4=")
-        };
-
-        public string Arch { get;  }
-
-        public string Hash { get; }
-
-
-        //https://cdn.rawgit.com/neurospeech/xamarin-android-ffmpeg/master/binary/3.0.1/arm/ffmpeg
-        //https://raw.githubusercontent.com/neurospeech/xamarin-android-ffmpeg/master/binary/3.0.1/arm/ffmpeg
-        public string Url => $"https://{FFMpegLibrary.Instance.CDNHost}/neurospeech/xamarin-android-ffmpeg/v1.0.7/binary/{FFMPEGVersion}/{Arch}/ffmpeg";
-
-        public Func<string, bool> IsArch { get;  }
-
-        public bool IsHashMatch(byte[] data) {
-            var sha = System.Security.Cryptography.SHA1.Create();
-            string h = Convert.ToBase64String(sha.ComputeHash(data));
-            return h == Hash;
-        }
-
     }
 }

FFMpeg.Xamarin/FFMpegSource.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Runtime;
+using Android.Views;
+using Android.Widget;
+
+namespace FFMpeg.Xamarin
+{
+    public class FFMpegSource
+    {
+        public FFMpegSource(string arch, Func<string, bool> isArch, string hash)
+        {
+            this.Arch = arch;
+            this.IsArch = isArch;
+            this.Hash = hash;
+        }
+
+        public static string FFMPEGVersion { get; } = "3.0.1";
+
+        public static FFMpegSource[] Sources = new FFMpegSource[] {
+            new FFMpegSource("arm", x=> !x.EndsWith("86"), "4nzzxDKxIYlvyK8tFH7/iNMHTdU="),
+            new FFMpegSource("x86", x=> x.EndsWith("86"), "DdTbrTBf8Zeh6p5hWL0ggdIp5w4=")
+        };
+
+        public string Arch { get; }
+
+        public string Hash { get; }
+
+
+        //https://cdn.rawgit.com/neurospeech/xamarin-android-ffmpeg/master/binary/3.0.1/arm/ffmpeg
+        //https://raw.githubusercontent.com/neurospeech/xamarin-android-ffmpeg/master/binary/3.0.1/arm/ffmpeg
+        public string Url => $"https://{FFMpegLibrary.Instance.CDNHost}/neurospeech/xamarin-android-ffmpeg/v1.0.7/binary/{FFMPEGVersion}/{Arch}/ffmpeg";
+
+        public Func<string, bool> IsArch { get; }
+
+        public static FFMpegSource Get()
+        {
+            string osArchitecture = Java.Lang.JavaSystem.GetProperty("os.arch");
+
+            foreach (var source in Sources)
+            {
+                if (source.IsArch(osArchitecture))
+                    return source;
+            }
+
+            throw new NotImplementedException();
+        }
+
+        public bool IsHashMatch(byte[] data)
+        {
+            var sha = System.Security.Cryptography.SHA1.Create();
+            string h = Convert.ToBase64String(sha.ComputeHash(data));
+            return h == Hash;
+        }
+    }
+}