From 9bb5e8181206aed42877152c777bd4dda2c277b7 Mon Sep 17 00:00:00 2001 From: PartyDonut Date: Sat, 30 Aug 2025 11:41:40 +0200 Subject: [PATCH] feat: Use media_kit fork for full libraries --- lib/profiles/default_profile.dart | 17 +++---- pubspec.lock | 82 +++++++++++++++++-------------- pubspec.yaml | 38 ++++++++++++++ 3 files changed, 91 insertions(+), 46 deletions(-) diff --git a/lib/profiles/default_profile.dart b/lib/profiles/default_profile.dart index 95ce9e0..f33505d 100644 --- a/lib/profiles/default_profile.dart +++ b/lib/profiles/default_profile.dart @@ -12,20 +12,20 @@ final videoProfileProvider = StateProvider.autoDispose((ref) => DeviceProfile defaultProfile(PlayerOptions player) => kIsWeb ? webProfile - : DeviceProfile( + : const DeviceProfile( maxStreamingBitrate: 120000000, maxStaticBitrate: 120000000, musicStreamingTranscodingBitrate: 384000, directPlayProfiles: [ - const DirectPlayProfile( + DirectPlayProfile( type: DlnaProfileType.video, ), - const DirectPlayProfile( + DirectPlayProfile( type: DlnaProfileType.audio, ) ], transcodingProfiles: [ - const TranscodingProfile( + TranscodingProfile( audioCodec: 'aac,mp3,mp2', container: 'ts', maxAudioChannels: '2', @@ -36,10 +36,9 @@ DeviceProfile defaultProfile(PlayerOptions player) => kIsWeb ], containerProfiles: [], subtitleProfiles: [ - const SubtitleProfile(format: 'vtt', method: SubtitleDeliveryMethod.$external), - const SubtitleProfile(format: 'ass', method: SubtitleDeliveryMethod.$external), - const SubtitleProfile(format: 'ssa', method: SubtitleDeliveryMethod.$external), - if (player == PlayerOptions.libMDK) - const SubtitleProfile(format: 'pgssub', method: SubtitleDeliveryMethod.$external), + SubtitleProfile(format: 'vtt', method: SubtitleDeliveryMethod.$external), + SubtitleProfile(format: 'ass', method: SubtitleDeliveryMethod.$external), + SubtitleProfile(format: 'ssa', method: SubtitleDeliveryMethod.$external), + SubtitleProfile(format: 'pgssub', method: SubtitleDeliveryMethod.$external), ], ); diff --git a/pubspec.lock b/pubspec.lock index 01c2cd8..284ed1a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1216,66 +1216,74 @@ packages: media_kit: dependency: "direct main" description: - name: media_kit - sha256: "48c10c3785df5d88f0eef970743f8c99b2e5da2b34b9d8f9876e598f62d9e776" - url: "https://pub.dev" - source: hosted + path: media_kit + ref: main + resolved-ref: "7aa9082f6f58731645ef9ecc94b3a60c4fc5e806" + url: "https://github.com/DonutWare/media-kit.git" + source: git version: "1.2.0" media_kit_libs_android_video: - dependency: transitive + dependency: "direct overridden" description: - name: media_kit_libs_android_video - sha256: adff9b571b8ead0867f9f91070f8df39562078c0eb3371d88b9029a2d547d7b7 - url: "https://pub.dev" - source: hosted + path: "libs/android/media_kit_libs_android_video" + ref: HEAD + resolved-ref: "7aa9082f6f58731645ef9ecc94b3a60c4fc5e806" + url: "https://github.com/DonutWare/media-kit.git" + source: git version: "1.3.7" media_kit_libs_ios_video: - dependency: transitive + dependency: "direct overridden" description: - name: media_kit_libs_ios_video - sha256: b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991 - url: "https://pub.dev" - source: hosted + path: "libs/ios/media_kit_libs_ios_video" + ref: HEAD + resolved-ref: "7aa9082f6f58731645ef9ecc94b3a60c4fc5e806" + url: "https://github.com/DonutWare/media-kit.git" + source: git version: "1.1.4" media_kit_libs_linux: - dependency: transitive + dependency: "direct overridden" description: - name: media_kit_libs_linux - sha256: "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf" - url: "https://pub.dev" - source: hosted + path: "libs/linux/media_kit_libs_linux" + ref: HEAD + resolved-ref: "7aa9082f6f58731645ef9ecc94b3a60c4fc5e806" + url: "https://github.com/DonutWare/media-kit.git" + source: git version: "1.2.1" media_kit_libs_macos_video: - dependency: transitive + dependency: "direct overridden" description: - name: media_kit_libs_macos_video - sha256: f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d - url: "https://pub.dev" - source: hosted + path: "libs/macos/media_kit_libs_macos_video" + ref: HEAD + resolved-ref: "7aa9082f6f58731645ef9ecc94b3a60c4fc5e806" + url: "https://github.com/DonutWare/media-kit.git" + source: git version: "1.1.4" media_kit_libs_video: dependency: "direct main" description: - name: media_kit_libs_video - sha256: "958cc55e7065d9d01f52a2842dab2a0812a92add18489f1006d864fb5e42a3ef" - url: "https://pub.dev" - source: hosted + path: "libs/universal/media_kit_libs_video" + ref: main + resolved-ref: "7aa9082f6f58731645ef9ecc94b3a60c4fc5e806" + url: "https://github.com/DonutWare/media-kit.git" + source: git version: "1.0.6" media_kit_libs_windows_video: - dependency: transitive + dependency: "direct overridden" description: - name: media_kit_libs_windows_video - sha256: dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab - url: "https://pub.dev" - source: hosted + path: "libs/windows/media_kit_libs_windows_video" + ref: HEAD + resolved-ref: "7aa9082f6f58731645ef9ecc94b3a60c4fc5e806" + url: "https://github.com/DonutWare/media-kit.git" + source: git version: "1.0.11" media_kit_video: dependency: "direct main" description: - name: media_kit_video - sha256: a656a9463298c1adc64c57f2d012874f7f2900f0c614d9545a3e7b8bb9e2137b - url: "https://pub.dev" - source: hosted + path: media_kit_video + ref: main + resolved-ref: "7aa9082f6f58731645ef9ecc94b3a60c4fc5e806" + url: "https://github.com/DonutWare/media-kit.git" + source: git version: "1.3.0" meta: dependency: transitive diff --git a/pubspec.yaml b/pubspec.yaml index 81d5d33..e66ace5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -68,6 +68,7 @@ dependencies: media_kit: ^1.2.0 # Primary package. media_kit_video: ^1.3.0 # For video rendering. media_kit_libs_video: ^1.0.6 # Native video dependencies. + audio_service: ^0.18.18 fvp: ^0.33.1 video_player: ^2.10.0 @@ -129,6 +130,43 @@ dependencies: archive: ^4.0.7 dart_mappable: ^4.6.0 +dependency_overrides: + media_kit: + git: + url: https://github.com/DonutWare/media-kit.git + ref: main + path: ./media_kit + media_kit_video: + git: + url: https://github.com/DonutWare/media-kit.git + ref: main + path: ./media_kit_video + media_kit_libs_video: + git: + url: https://github.com/DonutWare/media-kit.git + ref: main + path: ./libs/universal/media_kit_libs_video + media_kit_libs_android_video: + git: + url: https://github.com/DonutWare/media-kit.git + path: libs/android/media_kit_libs_android_video + media_kit_libs_ios_video: + git: + url: https://github.com/DonutWare/media-kit.git + path: libs/ios/media_kit_libs_ios_video + media_kit_libs_macos_video: + git: + url: https://github.com/DonutWare/media-kit.git + path: libs/macos/media_kit_libs_macos_video + media_kit_libs_windows_video: + git: + url: https://github.com/DonutWare/media-kit.git + path: libs/windows/media_kit_libs_windows_video + media_kit_libs_linux: + git: + url: https://github.com/DonutWare/media-kit.git + path: libs/linux/media_kit_libs_linux + dev_dependencies: flutter_test: sdk: flutter