From 99dd7ec0ffd3c4cedd2d205cc9875d78c10be459 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Sat, 5 Aug 2023 19:57:07 +0200
Subject: [PATCH] video: fixed metadata fetch from background

---
 android/app/src/main/AndroidManifest.xml        |  3 ++-
 plugins/aves_video_ffmpeg/lib/src/metadata.dart |  4 ++--
 plugins/aves_video_ffmpeg/pubspec.lock          | 13 +++++++------
 plugins/aves_video_ffmpeg/pubspec.yaml          | 12 +++++++++++-
 pubspec.lock                                    | 13 +++++++------
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index dd8cbd10d..d5193fd09 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -57,8 +57,9 @@
     allow install on API 19, despite the `minSdkVersion` declared in dependencies:
     - Google Maps is from API 20
     - the Security library is from API 21
+    - FFmpegKit for Flutter is from API 24
     -->
-    <uses-sdk tools:overrideLibrary="io.flutter.plugins.googlemaps, androidx.security:security-crypto" />
+    <uses-sdk tools:overrideLibrary="io.flutter.plugins.googlemaps, androidx.security:security-crypto, com.arthenica.ffmpegkit.flutter" />
 
     <!-- from Android 11, we should define <queries> to make other apps visible to this app -->
     <queries>
diff --git a/plugins/aves_video_ffmpeg/lib/src/metadata.dart b/plugins/aves_video_ffmpeg/lib/src/metadata.dart
index eff959bf4..1c4b4a39c 100644
--- a/plugins/aves_video_ffmpeg/lib/src/metadata.dart
+++ b/plugins/aves_video_ffmpeg/lib/src/metadata.dart
@@ -1,7 +1,7 @@
 import 'package:aves_model/aves_model.dart';
 import 'package:aves_video/aves_video.dart';
-import 'package:ffmpeg_kit_flutter_min/ffmpeg_kit_config.dart';
-import 'package:ffmpeg_kit_flutter_min/ffprobe_kit.dart';
+import 'package:ffmpeg_kit_flutter/ffmpeg_kit_config.dart';
+import 'package:ffmpeg_kit_flutter/ffprobe_kit.dart';
 import 'package:flutter/foundation.dart';
 
 class FfmpegVideoMetadataFetcher extends AvesVideoMetadataFetcher {
diff --git a/plugins/aves_video_ffmpeg/pubspec.lock b/plugins/aves_video_ffmpeg/pubspec.lock
index a923c7b33..fbdf55b46 100644
--- a/plugins/aves_video_ffmpeg/pubspec.lock
+++ b/plugins/aves_video_ffmpeg/pubspec.lock
@@ -46,14 +46,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.5"
-  ffmpeg_kit_flutter_min:
+  ffmpeg_kit_flutter:
     dependency: "direct main"
     description:
-      name: ffmpeg_kit_flutter_min
-      sha256: "103367b415fc19c181f02bf85ba3b932c9599223280d52aeafffd02f979535ea"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.1.0-LTS"
+      path: "flutter/flutter"
+      ref: background-lts
+      resolved-ref: "1606719442d8ca04827a94dacd8d3d7a17b5526d"
+      url: "https://github.com/deckerst/ffmpeg-kit.git"
+    source: git
+    version: "5.1.0"
   ffmpeg_kit_flutter_platform_interface:
     dependency: transitive
     description:
diff --git a/plugins/aves_video_ffmpeg/pubspec.yaml b/plugins/aves_video_ffmpeg/pubspec.yaml
index 60d761a43..0fc06138e 100644
--- a/plugins/aves_video_ffmpeg/pubspec.yaml
+++ b/plugins/aves_video_ffmpeg/pubspec.yaml
@@ -12,7 +12,17 @@ dependencies:
     path: ../aves_model
   aves_video:
     path: ../aves_video
-  ffmpeg_kit_flutter_min: 5.1.0-LTS
+#  ffmpeg_kit_flutter_min: 5.1.0-LTS
+#  ffmpeg_kit_flutter:
+#    git:
+#      url: https://github.com/arthenica/ffmpeg-kit.git
+#      ref: development-flutter
+#      path: flutter/flutter
+  ffmpeg_kit_flutter:
+    git:
+      url: https://github.com/deckerst/ffmpeg-kit.git
+      ref: background-lts
+      path: flutter/flutter
 
 dev_dependencies:
   flutter_lints:
diff --git a/pubspec.lock b/pubspec.lock
index 77e9d9c2c..9cf0da8e0 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -351,14 +351,15 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.2"
-  ffmpeg_kit_flutter_min:
+  ffmpeg_kit_flutter:
     dependency: transitive
     description:
-      name: ffmpeg_kit_flutter_min
-      sha256: "103367b415fc19c181f02bf85ba3b932c9599223280d52aeafffd02f979535ea"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.1.0-LTS"
+      path: "flutter/flutter"
+      ref: background-lts
+      resolved-ref: "1606719442d8ca04827a94dacd8d3d7a17b5526d"
+      url: "https://github.com/deckerst/ffmpeg-kit.git"
+    source: git
+    version: "5.1.0"
   ffmpeg_kit_flutter_platform_interface:
     dependency: transitive
     description: