From b256b0428f7c8a378f910ee43c0ee8a6c4eec1fe Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Sat, 5 Aug 2023 18:33:53 +0200 Subject: [PATCH] ffmpegkit LTS --- CHANGELOG.md | 1 + android/app/src/main/AndroidManifest.xml | 3 +-- android/build.gradle | 2 +- plugins/aves_video_ffmpeg/lib/src/metadata.dart | 4 ++-- plugins/aves_video_ffmpeg/pubspec.lock | 13 ++++++------- plugins/aves_video_ffmpeg/pubspec.yaml | 6 +----- pubspec.lock | 13 ++++++------- 7 files changed, 18 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00afc36fb..7d24c8622 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. ### Added +- Video: improved seek accuracy, HDR support, AV1 support, playback speed from x0.25 to x4 - support for animated AVIF (requires rescan) - Collection: filtering by rating range - About: data usage diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index d5193fd09..dd8cbd10d 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -57,9 +57,8 @@ 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 --> - + diff --git a/android/build.gradle b/android/build.gradle index af9765600..fd0f3742e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { kotlin_version = '1.8.21' ksp_version = "$kotlin_version-1.0.11" - agp_version = '8.1.0' + agp_version = '7.4.2' glide_version = '4.15.1' // AppGallery Connect plugin versions: https://developer.huawei.com/consumer/en/doc/development/AppGallery-connect-Guides/agc-sdk-changenotes-0000001058732550 huawei_agconnect_version = '1.9.1.300' diff --git a/plugins/aves_video_ffmpeg/lib/src/metadata.dart b/plugins/aves_video_ffmpeg/lib/src/metadata.dart index 1c4b4a39c..eff959bf4 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/ffmpeg_kit_config.dart'; -import 'package:ffmpeg_kit_flutter/ffprobe_kit.dart'; +import 'package:ffmpeg_kit_flutter_min/ffmpeg_kit_config.dart'; +import 'package:ffmpeg_kit_flutter_min/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 3cb5159ec..a923c7b33 100644 --- a/plugins/aves_video_ffmpeg/pubspec.lock +++ b/plugins/aves_video_ffmpeg/pubspec.lock @@ -46,15 +46,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.5" - ffmpeg_kit_flutter: + ffmpeg_kit_flutter_min: dependency: "direct main" description: - path: "flutter/flutter" - ref: development-flutter - resolved-ref: "497bda9b0bbd4fb94b3d578fa0c40632b3793de7" - url: "https://github.com/arthenica/ffmpeg-kit.git" - source: git - version: "5.1.0" + name: ffmpeg_kit_flutter_min + sha256: "103367b415fc19c181f02bf85ba3b932c9599223280d52aeafffd02f979535ea" + url: "https://pub.dev" + source: hosted + version: "5.1.0-LTS" 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 61ddcf735..60d761a43 100644 --- a/plugins/aves_video_ffmpeg/pubspec.yaml +++ b/plugins/aves_video_ffmpeg/pubspec.yaml @@ -12,11 +12,7 @@ dependencies: path: ../aves_model aves_video: path: ../aves_video - ffmpeg_kit_flutter: - git: - url: https://github.com/arthenica/ffmpeg-kit.git - ref: development-flutter - path: flutter/flutter + ffmpeg_kit_flutter_min: 5.1.0-LTS dev_dependencies: flutter_lints: diff --git a/pubspec.lock b/pubspec.lock index ccf317683..77e9d9c2c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -351,15 +351,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.2" - ffmpeg_kit_flutter: + ffmpeg_kit_flutter_min: dependency: transitive description: - path: "flutter/flutter" - ref: development-flutter - resolved-ref: "497bda9b0bbd4fb94b3d578fa0c40632b3793de7" - url: "https://github.com/arthenica/ffmpeg-kit.git" - source: git - version: "5.1.0" + name: ffmpeg_kit_flutter_min + sha256: "103367b415fc19c181f02bf85ba3b932c9599223280d52aeafffd02f979535ea" + url: "https://pub.dev" + source: hosted + version: "5.1.0-LTS" ffmpeg_kit_flutter_platform_interface: dependency: transitive description: