Merge pull request #17 from tanersener/development-flutter

merge flutter v4.5.1 apps to main
arthenica · Jan 2, 2022 · 0b0a3fa · 0b0a3fa
2 parents c83060e + de892e4
commit 0b0a3fa
Show file tree

Hide file tree

Showing 53 changed files with 651 additions and 364 deletions.
diff --git a/README.md b/README.md
@@ -21,6 +21,8 @@ Test applications are tagged with `ffmpeg-kit` release they depend on.
 
 |  Platform | FFmpegKit Version |                                        Tag                                         |
 | :----: |:-----------------:|:----------------------------------------------------------------------------------:|
+| Flutter |       4.5.1       |     [4.5.1](https://github.com/tanersener/ffmpeg-kit-test/tree/flutter.v4.5.1)     |
+| Flutter |     4.5.1-LTS     | [4.5.1-LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/flutter.v4.5.1.lts) |
 | React Native |       4.5.1       |  [4.5.1](https://github.com/tanersener/ffmpeg-kit-test/tree/react.native.v4.5.1)   |
 | Android |       4.5.1       |     [4.5.1](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.5.1)     |
 | Android |     4.5.1.LTS     | [4.5.1.LTS](https://github.com/tanersener/ffmpeg-kit-test/tree/android.v4.5.1.lts) |

diff --git a/flutter/test-app-local-dependency/ios/Podfile.lock b/flutter/test-app-local-dependency/ios/Podfile.lock
@@ -1,10 +1,10 @@
 PODS:
-  - ffmpeg-kit-ios-https (4.5)
-  - ffmpeg_kit_flutter (4.5.0):
-    - ffmpeg_kit_flutter/https (= 4.5.0)
+  - ffmpeg-kit-ios-https (4.5.1)
+  - ffmpeg_kit_flutter (4.5.1):
+    - ffmpeg_kit_flutter/https (= 4.5.1)
     - Flutter
-  - ffmpeg_kit_flutter/https (4.5.0):
-    - ffmpeg-kit-ios-https (= 4.5)
+  - ffmpeg_kit_flutter/https (4.5.1):
+    - ffmpeg-kit-ios-https (= 4.5.1)
     - Flutter
   - Flutter (1.0.0)
   - fluttertoast (0.0.2):
@@ -41,8 +41,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/video_player/ios"
 
 SPEC CHECKSUMS:
-  ffmpeg-kit-ios-https: f7f34d0e0000a01dbc678f615588330ef1e23cc6
-  ffmpeg_kit_flutter: a2f609d248cd61728aac6213af8a69449d482cf8
+  ffmpeg-kit-ios-https: cec24d405b511e4f274980d8a9c751d384f89558
+  ffmpeg_kit_flutter: e2f0bd6b75e361faeee3b34c70650d3ec6ec35d0
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
   fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58
   path_provider: d1e9807085df1f9cc9318206cd649dc0b76be3de

diff --git a/flutter/test-app-local-dependency/ios/Runner.xcodeproj/project.pbxproj b/flutter/test-app-local-dependency/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -150,6 +150,7 @@
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				47E9AAF8724B27176BE2FBDD /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -166,7 +167,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -243,6 +244,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		47E9AAF8724B27176BE2FBDD /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -350,7 +368,10 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.arthenica.ffmpegkit.flutter.FFmpegKitFlutter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -470,7 +491,10 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.arthenica.ffmpegkit.flutter.FFmpegKitFlutter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				VERSIONING_SYSTEM = "apple-generic";
@@ -485,7 +509,10 @@
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.arthenica.ffmpegkit.flutter.FFmpegKitFlutter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				VERSIONING_SYSTEM = "apple-generic";

diff --git a/...ter/test-app-local-dependency/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/...ter/test-app-local-dependency/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/flutter/test-app-local-dependency/lib/abstract.dart b/flutter/test-app-local-dependency/lib/abstract.dart
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021 Taner Sener
+ * Copyright (c) 2018-2022 Taner Sener
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/flutter/test-app-local-dependency/lib/audio_tab.dart b/flutter/test-app-local-dependency/lib/audio_tab.dart
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021 Taner Sener
+ * Copyright (c) 2018-2022 Taner Sener
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,6 @@ import 'package:ffmpeg_kit_flutter/ffmpeg_kit.dart';
 import 'package:ffmpeg_kit_flutter/ffmpeg_kit_config.dart';
 import 'package:ffmpeg_kit_flutter/log.dart';
 import 'package:ffmpeg_kit_flutter/return_code.dart';
-import 'package:ffmpeg_kit_flutter/session.dart';
 import 'package:flutter/material.dart';
 
 import 'abstract.dart';
@@ -92,7 +91,7 @@ class AudioTab {
 
         ffprint("FFmpeg process started with arguments:\n'${ffmpegCommand}'.");
 
-        FFmpegKit.executeAsync(ffmpegCommand, (Session session) async {
+        FFmpegKit.execute(ffmpegCommand).then((session) async {
           final state =
               FFmpegKitConfig.sessionStateToString(await session.getState());
           final returnCode = await session.getReturnCode();
@@ -125,7 +124,7 @@ class AudioTab {
 
       ffprint("Creating audio sample with '$ffmpegCommand'.");
 
-      FFmpegKit.executeAsync(ffmpegCommand, (session) async {
+      FFmpegKit.execute(ffmpegCommand).then((session) async {
         final state =
             FFmpegKitConfig.sessionStateToString(await session.getState());
         final returnCode = await session.getReturnCode();

diff --git a/flutter/test-app-local-dependency/lib/command_tab.dart b/flutter/test-app-local-dependency/lib/command_tab.dart
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021 Taner Sener
+ * Copyright (c) 2018-2022 Taner Sener
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -56,8 +56,10 @@ class CommandTab {
     showPopup(COMMAND_TEST_TOOLTIP_TEXT);
   }
 
-  void appendOutput(String logMessage) {
-    _outputText += logMessage;
+  void appendOutput(String? logMessage) {
+    if (logMessage != null) {
+      _outputText += logMessage;
+    }
     _refreshable.refresh();
   }
 
@@ -82,20 +84,21 @@ class CommandTab {
 
     ffprint("FFmpeg process started with arguments:\n\'$ffmpegCommand\'");
 
-    FFmpegKit.executeAsync(ffmpegCommand, (session) async {
+    FFmpegKit.execute(ffmpegCommand).then((session) async {
       final state =
           FFmpegKitConfig.sessionStateToString(await session.getState());
       final returnCode = await session.getReturnCode();
       final failStackTrace = await session.getFailStackTrace();
+      final output = await session.getOutput();
 
       ffprint(
           "FFmpeg process exited with state ${state} and rc ${returnCode}.${notNull(failStackTrace, "\\n")}");
 
+      appendOutput(output);
+
       if (state == SessionState.failed || !ReturnCode.isSuccess(returnCode)) {
         showPopup("Command failed. Please check output for the details.");
       }
-    }, (log) {
-      appendOutput(log.getMessage());
     });
   }
 

diff --git a/flutter/test-app-local-dependency/lib/concurrent_execution_tab.dart b/flutter/test-app-local-dependency/lib/concurrent_execution_tab.dart
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021 Taner Sener
+ * Copyright (c) 2018-2022 Taner Sener
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,7 +26,6 @@ import 'package:ffmpeg_kit_flutter/ffmpeg_kit.dart';
 import 'package:ffmpeg_kit_flutter/ffmpeg_kit_config.dart';
 import 'package:ffmpeg_kit_flutter/log.dart';
 import 'package:ffmpeg_kit_flutter/return_code.dart';
-import 'package:ffmpeg_kit_flutter/session.dart';
 
 import 'abstract.dart';
 import 'popup.dart';
@@ -87,7 +86,7 @@ class ConcurrentExecutionTab {
                 "mpeg4",
                 "");
 
-            FFmpegKit.executeAsync(ffmpegCommand, (Session session) async {
+            FFmpegKit.executeAsync(ffmpegCommand, (session) async {
               final sessionId = await session.getSessionId();
               final state = FFmpegKitConfig.sessionStateToString(
                   await session.getState());

diff --git a/flutter/test-app-local-dependency/lib/decoration.dart b/flutter/test-app-local-dependency/lib/decoration.dart
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2021 Taner Sener
+ * Copyright (c) 2018-2022 Taner Sener
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal