Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

video: media_kit upgrades

Browse source
This commit is contained in:
Thibault Deckers 2023-08-01 23:22:11 +02:00
parent 72bcf6d4e7
commit f3a9c2f385
15 changed files with 198 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/services/common/services.dart
View file

@ -21,6 +21,7 @@ import 'package:aves_services/aves_services.dart';
import 'package:aves_services_platform/aves_services_platform.dart';
import 'package:aves_video/aves_video.dart';
import 'package:aves_video_ijk/aves_video_ijk.dart';
import 'package:aves_video_mpv/aves_video_mpv.dart';
import 'package:get_it/get_it.dart';
import 'package:path/path.dart' as p;
@ -54,7 +55,7 @@ void initPlatformServices() {
getIt.registerLazySingleton<p.Context>(p.Context.new);
getIt.registerLazySingleton<AvesAvailability>(LiveAvesAvailability.new);
getIt.registerLazySingleton<MetadataDb>(SqfliteMetadataDb.new);
getIt.registerLazySingleton<AvesVideoControllerFactory>(IjkVideoControllerFactory.new);
getIt.registerLazySingleton<AvesVideoControllerFactory>(MpvVideoControllerFactory.new);
getIt.registerLazySingleton<AvesVideoMetadataFetcher>(IjkVideoMetadataFetcher.new);
getIt.registerLazySingleton<AppService>(PlatformAppService.new);

4
plugins/aves_map/pubspec.lock
View file

@ -44,10 +44,10 @@ packages:
dependency: "direct main"
description:
name: custom_rounded_rectangle_border
sha256: "57b7af53da4e8bf4afa5a8393c446e953a81c23dd309f4341cfc38d19ff6f062"
sha256: "3e8ca0c26b8d22d5d3842bab59dfd209995f8e42af7c2eef03da70642c040819"
url: "https://pub.dev"
source: hosted
version: "0.2.0-nullsafety.0"
version: "0.3.0"
equatable:
dependency: "direct main"
description:

3
plugins/aves_map/pubspec.yaml
View file

@ -11,8 +11,7 @@ dependencies:
aves_ui:
path: ../aves_ui
collection:
# TODO TLAD as of 2022/02/22, null safe version is pre-release
custom_rounded_rectangle_border: '>=0.2.0-nullsafety.0'
custom_rounded_rectangle_border:
equatable:
fluster:
flutter_map:

4
plugins/aves_platform_meta/pubspec.lock
View file

@ -66,10 +66,10 @@ packages:
dependency: "direct main"
description:
name: plugin_platform_interface
sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.1.5"
sky_engine:
dependency: transitive
description: flutter

4
plugins/aves_report_crashlytics/pubspec.lock
View file

@ -179,10 +179,10 @@ packages:
dependency: transitive
description:
name: plugin_platform_interface
sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.1.5"
sky_engine:
dependency: transitive
description: flutter

4
plugins/aves_screen_state/pubspec.lock
View file

@ -66,10 +66,10 @@ packages:
dependency: "direct main"
description:
name: plugin_platform_interface
sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.1.5"
sky_engine:
dependency: transitive
description: flutter

4
plugins/aves_services/pubspec.lock
View file

@ -51,10 +51,10 @@ packages:
dependency: transitive
description:
name: custom_rounded_rectangle_border
sha256: "57b7af53da4e8bf4afa5a8393c446e953a81c23dd309f4341cfc38d19ff6f062"
sha256: "3e8ca0c26b8d22d5d3842bab59dfd209995f8e42af7c2eef03da70642c040819"
url: "https://pub.dev"
source: hosted
version: "0.2.0-nullsafety.0"
version: "0.3.0"
equatable:
dependency: transitive
description:

24
plugins/aves_services_google/pubspec.lock
View file

@ -66,10 +66,10 @@ packages:
dependency: transitive
description:
name: custom_rounded_rectangle_border
sha256: "57b7af53da4e8bf4afa5a8393c446e953a81c23dd309f4341cfc38d19ff6f062"
sha256: "3e8ca0c26b8d22d5d3842bab59dfd209995f8e42af7c2eef03da70642c040819"
url: "https://pub.dev"
source: hosted
version: "0.2.0-nullsafety.0"
version: "0.3.0"
device_info_plus:
dependency: "direct main"
description:
@ -188,10 +188,10 @@ packages:
dependency: "direct main"
description:
name: google_maps_flutter
sha256: "7e35644d8a88ad86409976db8fa23ddc7d933f8239e57405e4660534be09acd2"
sha256: c290921cd1750b5ede99c82dcaa84740da86278e6ed0f83ad29752b29a8552c6
url: "https://pub.dev"
source: hosted
version: "2.3.1"
version: "2.4.0"
google_maps_flutter_android:
dependency: "direct main"
description:
@ -212,18 +212,18 @@ packages:
dependency: "direct main"
description:
name: google_maps_flutter_platform_interface
sha256: cd310faa7fba3df10ab3f852719f832eaa223e4b315ac46af986572d1cec222f
sha256: b363e9a1ef7d063fb21ec8eef5a450db4b0500cc39712c9410b5cc64013d6fc6
url: "https://pub.dev"
source: hosted
version: "2.3.0"
version: "2.4.0"
google_maps_flutter_web:
dependency: transitive
description:
name: google_maps_flutter_web
sha256: "280170a2dcac3364317b5786f0d2e3c4128fdb795bc0d87ffe56226b0cf1f57d"
sha256: "15303a2ddd04e21ace41c823de8396a61857a61fed4c145f25ca1fc76628c40c"
url: "https://pub.dev"
source: hosted
version: "0.5.1"
version: "0.5.2"
html:
dependency: transitive
description:
@ -340,10 +340,10 @@ packages:
dependency: transitive
description:
name: plugin_platform_interface
sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.1.5"
polylabel:
dependency: transitive
description:
@ -441,10 +441,10 @@ packages:
dependency: transitive
description:
name: win32
sha256: dfdf0136e0aa7a1b474ea133e67cb0154a0acd2599c4f3ada3b49d38d38793ee
sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0
url: "https://pub.dev"
source: hosted
version: "5.0.5"
version: "5.0.6"
win32_registry:
dependency: transitive
description:

8
plugins/aves_services_huawei/pubspec.lock
View file

@ -65,10 +65,10 @@ packages:
dependency: transitive
description:
name: custom_rounded_rectangle_border
sha256: "57b7af53da4e8bf4afa5a8393c446e953a81c23dd309f4341cfc38d19ff6f062"
sha256: "3e8ca0c26b8d22d5d3842bab59dfd209995f8e42af7c2eef03da70642c040819"
url: "https://pub.dev"
source: hosted
version: "0.2.0-nullsafety.0"
version: "0.3.0"
equatable:
dependency: transitive
description:
@ -224,10 +224,10 @@ packages:
dependency: transitive
description:
name: plugin_platform_interface
sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.1.5"
polylabel:
dependency: transitive
description:

4
plugins/aves_services_none/pubspec.lock
View file

@ -58,10 +58,10 @@ packages:
dependency: transitive
description:
name: custom_rounded_rectangle_border
sha256: "57b7af53da4e8bf4afa5a8393c446e953a81c23dd309f4341cfc38d19ff6f062"
sha256: "3e8ca0c26b8d22d5d3842bab59dfd209995f8e42af7c2eef03da70642c040819"
url: "https://pub.dev"
source: hosted
version: "0.2.0-nullsafety.0"
version: "0.3.0"
equatable:
dependency: transitive
description:

2
plugins/aves_video_mpv/lib/src/controller.dart
View file

@ -219,7 +219,7 @@ class MpvVideoController extends AvesVideoController {
controls: NoVideoControls,
wakelock: false,
subtitleViewConfiguration: const SubtitleViewConfiguration(
style: TextStyle(color: Colors.transparent),
visible: false,
),
);
},

60
plugins/aves_video_mpv/pubspec.lock
View file

@ -171,39 +171,35 @@ packages:
media_kit:
dependency: "direct main"
description:
path: media_kit
ref: main
resolved-ref: a1a1d14c5f920442898f22ea61dc9e357a671112
url: "https://github.com/alexmercerind/media_kit"
source: git
version: "1.0.2"
name: media_kit
sha256: "272a9f1dd77ed57b48707fdb0ec0e4a048ef958feccc0d0dd751135fe924b63a"
url: "https://pub.dev"
source: hosted
version: "1.1.1"
media_kit_libs_android_video:
dependency: "direct main"
description:
path: media_kit_libs_android_video
ref: main
resolved-ref: a1a1d14c5f920442898f22ea61dc9e357a671112
url: "https://github.com/alexmercerind/media_kit"
source: git
version: "1.2.0"
name: media_kit_libs_android_video
sha256: ddb0d26ecba72bf7117e37e29b6a50f4ba198bbccb4e47246cae1812087dc721
url: "https://pub.dev"
source: hosted
version: "1.3.0"
media_kit_native_event_loop:
dependency: "direct main"
description:
path: media_kit_native_event_loop
ref: main
resolved-ref: a1a1d14c5f920442898f22ea61dc9e357a671112
url: "https://github.com/alexmercerind/media_kit"
source: git
name: media_kit_native_event_loop
sha256: "5351f0c28124b5358756515d8619abad182cdefe967468d7fb5b274737cc2f59"
url: "https://pub.dev"
source: hosted
version: "1.0.6"
media_kit_video:
dependency: "direct main"
description:
path: media_kit_video
ref: main
resolved-ref: a1a1d14c5f920442898f22ea61dc9e357a671112
url: "https://github.com/alexmercerind/media_kit"
source: git
version: "1.0.2"
name: media_kit_video
sha256: "3ac0403d67710dfb2bf6aabfa6caff1b163e70fb7e1a88423bc1be569b4df6b3"
url: "https://pub.dev"
source: hosted
version: "1.1.1"
meta:
dependency: transitive
description:
@ -248,10 +244,10 @@ packages:
dependency: transitive
description:
name: plugin_platform_interface
sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.1.5"
pointycastle:
dependency: transitive
description:
@ -377,6 +373,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.2"
uuid:
dependency: transitive
description:
name: uuid
sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
url: "https://pub.dev"
source: hosted
version: "3.0.7"
vector_math:
dependency: transitive
description:
@ -413,10 +417,10 @@ packages:
dependency: transitive
description:
name: win32
sha256: dfdf0136e0aa7a1b474ea133e67cb0154a0acd2599c4f3ada3b49d38d38793ee
sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0
url: "https://pub.dev"
source: hosted
version: "5.0.5"
version: "5.0.6"
xml:
dependency: transitive
description:
@ -427,4 +431,4 @@ packages:
version: "6.3.0"
sdks:
dart: ">=3.0.0 <4.0.0"
flutter: ">=3.3.0"
flutter: ">=3.7.0"

43
plugins/aves_video_mpv/pubspec.yaml
View file

@ -23,7 +23,7 @@ dependencies:
dev_dependencies:
flutter_lints:
dependency_overrides:
#dependency_overrides:
# media_kit:
# path: ../../../media_kit/media_kit
# media_kit_video:
@ -32,26 +32,25 @@ dependency_overrides:
# path: ../../../media_kit/media_kit_native_event_loop
# media_kit_libs_android_video:
# path: ../../../media_kit/media_kit_libs_android_video
media_kit:
git:
url: https://github.com/alexmercerind/media_kit
ref: main
path: media_kit
media_kit_video:
git:
url: https://github.com/alexmercerind/media_kit
ref: main
path: media_kit_video
media_kit_native_event_loop:
git:
url: https://github.com/alexmercerind/media_kit
ref: main
path: media_kit_native_event_loop
media_kit_libs_android_video:
git:
url: https://github.com/alexmercerind/media_kit
ref: main
path: media_kit_libs_android_video
# media_kit:
# git:
# url: https://github.com/alexmercerind/media_kit
# ref: main
# path: media_kit
# media_kit_video:
# git:
# url: https://github.com/alexmercerind/media_kit
# ref: main
# path: media_kit_video
# media_kit_native_event_loop:
# git:
# url: https://github.com/alexmercerind/media_kit
# ref: main
# path: media_kit_native_event_loop
# media_kit_libs_android_video:
# git:
# url: https://github.com/alexmercerind/media_kit
# ref: main
# path: libs/android/media_kit_libs_android_video
flutter:

133
pubspec.lock
View file

@ -133,6 +133,13 @@ packages:
relative: true
source: path
version: "0.0.1"
aves_video_mpv:
dependency: "direct main"
description:
path: "plugins/aves_video_mpv"
relative: true
source: path
version: "0.0.1"
barcode:
dependency: transitive
description:
@ -259,10 +266,10 @@ packages:
dependency: transitive
description:
name: custom_rounded_rectangle_border
sha256: "57b7af53da4e8bf4afa5a8393c446e953a81c23dd309f4341cfc38d19ff6f062"
sha256: "3e8ca0c26b8d22d5d3842bab59dfd209995f8e42af7c2eef03da70642c040819"
url: "https://pub.dev"
source: hosted
version: "0.2.0-nullsafety.0"
version: "0.3.0"
dbus:
dependency: transitive
description:
@ -405,10 +412,10 @@ packages:
dependency: "direct main"
description:
name: flex_color_picker
sha256: d8279250820ad279123fa8ee94151dd99400dd9ef4fb096589fcf956765d39a9
sha256: f37476ab3e80dcaca94e428e159944d465dd16312fda9ff41e07e86f04bfa51c
url: "https://pub.dev"
source: hosted
version: "3.2.2"
version: "3.3.0"
flex_seed_scheme:
dependency: transitive
description:
@ -596,10 +603,10 @@ packages:
dependency: transitive
description:
name: google_maps_flutter
sha256: "7e35644d8a88ad86409976db8fa23ddc7d933f8239e57405e4660534be09acd2"
sha256: c290921cd1750b5ede99c82dcaa84740da86278e6ed0f83ad29752b29a8552c6
url: "https://pub.dev"
source: hosted
version: "2.3.1"
version: "2.4.0"
google_maps_flutter_android:
dependency: transitive
description:
@ -620,18 +627,18 @@ packages:
dependency: transitive
description:
name: google_maps_flutter_platform_interface
sha256: cd310faa7fba3df10ab3f852719f832eaa223e4b315ac46af986572d1cec222f
sha256: b363e9a1ef7d063fb21ec8eef5a450db4b0500cc39712c9410b5cc64013d6fc6
url: "https://pub.dev"
source: hosted
version: "2.3.0"
version: "2.4.0"
google_maps_flutter_web:
dependency: transitive
description:
name: google_maps_flutter_web
sha256: "280170a2dcac3364317b5786f0d2e3c4128fdb795bc0d87ffe56226b0cf1f57d"
sha256: "15303a2ddd04e21ace41c823de8396a61857a61fed4c145f25ca1fc76628c40c"
url: "https://pub.dev"
source: hosted
version: "0.5.1"
version: "0.5.2"
highlight:
dependency: transitive
description:
@ -816,6 +823,38 @@ packages:
url: "https://pub.dev"
source: hosted
version: "7.0.7296"
media_kit:
dependency: transitive
description:
name: media_kit
sha256: "272a9f1dd77ed57b48707fdb0ec0e4a048ef958feccc0d0dd751135fe924b63a"
url: "https://pub.dev"
source: hosted
version: "1.1.1"
media_kit_libs_android_video:
dependency: transitive
description:
name: media_kit_libs_android_video
sha256: ddb0d26ecba72bf7117e37e29b6a50f4ba198bbccb4e47246cae1812087dc721
url: "https://pub.dev"
source: hosted
version: "1.3.0"
media_kit_native_event_loop:
dependency: transitive
description:
name: media_kit_native_event_loop
sha256: "5351f0c28124b5358756515d8619abad182cdefe967468d7fb5b274737cc2f59"
url: "https://pub.dev"
source: hosted
version: "1.0.6"
media_kit_video:
dependency: transitive
description:
name: media_kit_video
sha256: "3ac0403d67710dfb2bf6aabfa6caff1b163e70fb7e1a88423bc1be569b4df6b3"
url: "https://pub.dev"
source: hosted
version: "1.1.1"
meta:
dependency: transitive
description:
@ -998,10 +1037,10 @@ packages:
dependency: transitive
description:
name: permission_handler_android
sha256: c0c9754479a4c4b1c1f3862ddc11930c9b3f03bef2816bb4ea6eed1e13551d6f
sha256: "2ffaf52a21f64ac9b35fe7369bb9533edbd4f698e5604db8645b1064ff4cf221"
url: "https://pub.dev"
source: hosted
version: "10.3.2"
version: "10.3.3"
permission_handler_apple:
dependency: transitive
description:
@ -1054,10 +1093,10 @@ packages:
dependency: transitive
description:
name: plugin_platform_interface
sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
version: "2.1.5"
pointycastle:
dependency: transitive
description:
@ -1130,6 +1169,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.0.1"
safe_local_storage:
dependency: transitive
description:
name: safe_local_storage
sha256: ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440
url: "https://pub.dev"
source: hosted
version: "1.0.2"
sanitize_html:
dependency: transitive
description:
@ -1219,7 +1266,7 @@ packages:
source: hosted
version: "2.3.0"
shared_preferences_platform_interface:
dependency: "direct dev"
dependency: transitive
description:
name: shared_preferences_platform_interface
sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1"
@ -1315,18 +1362,18 @@ packages:
dependency: "direct main"
description:
name: sqflite
sha256: b4d6710e1200e96845747e37338ea8a819a12b51689a3bcf31eff0003b37a0b9
sha256: "591f1602816e9c31377d5f008c2d9ef7b8aca8941c3f89cc5fd9d84da0c38a9a"
url: "https://pub.dev"
source: hosted
version: "2.2.8+4"
version: "2.3.0"
sqflite_common:
dependency: transitive
description:
name: sqflite_common
sha256: "8f7603f3f8f126740bc55c4ca2d1027aab4b74a1267a3e31ce51fe40e3b65b8f"
sha256: "1b92f368f44b0dee2425bb861cfa17b6f6cf3961f762ff6f941d20b33355660a"
url: "https://pub.dev"
source: hosted
version: "2.4.5+1"
version: "2.5.0"
stack_trace:
dependency: "direct main"
description:
@ -1448,6 +1495,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.3.1"
universal_platform:
dependency: transitive
description:
name: universal_platform
sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc
url: "https://pub.dev"
source: hosted
version: "1.0.0+1"
uri_parser:
dependency: transitive
description:
name: uri_parser
sha256: "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835"
url: "https://pub.dev"
source: hosted
version: "2.0.2"
url_launcher:
dependency: "direct main"
description:
@ -1460,10 +1523,10 @@ packages:
dependency: transitive
description:
name: url_launcher_android
sha256: "15f5acbf0dce90146a0f5a2c4a002b1814a6303c4c5c075aa2623b2d16156f03"
sha256: "78cb6dea3e93148615109e58e42c35d1ffbf5ef66c44add673d0ab75f12ff3af"
url: "https://pub.dev"
source: hosted
version: "6.0.36"
version: "6.0.37"
url_launcher_ios:
dependency: transitive
description:
@ -1512,6 +1575,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.0.7"
uuid:
dependency: transitive
description:
name: uuid
sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
url: "https://pub.dev"
source: hosted
version: "3.0.7"
vector_math:
dependency: "direct main"
description:
@ -1536,6 +1607,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.7"
wakelock_plus:
dependency: transitive
description:
name: wakelock_plus
sha256: aac3f3258f01781ec9212df94eecef1eb9ba9350e106728def405baa096ba413
url: "https://pub.dev"
source: hosted
version: "1.1.1"
wakelock_plus_platform_interface:
dependency: transitive
description:
name: wakelock_plus_platform_interface
sha256: "40fabed5da06caff0796dc638e1f07ee395fb18801fbff3255a2372db2d80385"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
watcher:
dependency: transitive
description:
@ -1572,10 +1659,10 @@ packages:
dependency: transitive
description:
name: win32
sha256: dfdf0136e0aa7a1b474ea133e67cb0154a0acd2599c4f3ada3b49d38d38793ee
sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0
url: "https://pub.dev"
source: hosted
version: "5.0.5"
version: "5.0.6"
win32_registry:
dependency: transitive
description:

7
pubspec.yaml
View file

@ -42,8 +42,8 @@ dependencies:
path: plugins/aves_video
aves_video_ijk:
path: plugins/aves_video_ijk
# aves_video_mpv:
# path: plugins/aves_video_mpv
aves_video_mpv:
path: plugins/aves_video_mpv
aves_ui:
path: plugins/aves_ui
aves_utils:
@ -121,7 +121,6 @@ dev_dependencies:
flutter_driver:
sdk: flutter
flutter_lints:
shared_preferences_platform_interface:
test:
#dependency_overrides:
@ -152,7 +151,7 @@ dev_dependencies:
# git:
# url: https://github.com/alexmercerind/media_kit
# ref: main
# path: media_kit_libs_android_video
# path: libs/android/media_kit_libs_android_video
flutter:
assets: