Merge branch '1910_hwdec'

Author: deckerst

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - Collection: allow using width/height when bulk renaming
+- Video: allow forcing hardware acceleration
 
 ## <a id="v1.13.12"></a>[v1.13.12] - 2025-12-23
 

lib/l10n/app_en.arb

@@ -841,6 +841,8 @@
   "settingsSystemDefault": "System default",
   "settingsDefault": "Default",
   "settingsDisabled": "Disabled",
+  "settingsEnabled": "Enabled",
+  "settingsForced": "Forced",
   "settingsAskEverytime": "Ask everytime",
   "settingsModificationWarningDialogMessage": "Other settings will be modified.",
 

lib/model/device.dart

@@ -7,9 +7,10 @@ final Device device = Device._private();
 
 class Device {
   late final String _packageName, _packageVersion, _userAgent;
-  late final bool _canAuthenticateUser, _canPinShortcut;
+  late final bool _canAuthenticateUser, _canPinShortcut, _showPinShortcutFeedback;
   late final bool _canRenderFlagEmojis, _canRenderSubdivisionFlagEmojis, _canRequestManageMedia, _canSetLockScreenWallpaper;
-  late final bool _hasGeocoder, _isDynamicColorAvailable, _isTelevision, _showPinShortcutFeedback, _supportEdgeToEdgeUIMode, _supportPictureInPicture;
+  late final bool _hasGeocoder, _isDynamicColorAvailable, _supportEdgeToEdgeUIMode, _supportPictureInPicture;
+  late final bool _isPhysicalDevice, _isTelevision;
 
   String get packageName => _packageName;
 
@@ -33,6 +34,8 @@ class Device {
 
   bool get isDynamicColorAvailable => _isDynamicColorAvailable;
 
+  bool get isPhysicalDevice => _isPhysicalDevice;
+
   bool get isTelevision => _isTelevision;
 
   bool get showPinShortcutFeedback => _showPinShortcutFeedback;
@@ -50,6 +53,7 @@ class Device {
     _userAgent = '$_packageName/$_packageVersion';
 
     final androidInfo = await DeviceInfoPlugin().androidInfo;
+    _isPhysicalDevice = androidInfo.isPhysicalDevice;
     _isTelevision = androidInfo.systemFeatures.contains('android.software.leanback');
 
     final auth = LocalAuthentication();

lib/model/settings/settings.dart

@@ -71,6 +71,7 @@ class Settings with ChangeNotifier, SettingsAccess, SearchSettings, AppSettings,
     _unregister();
     _register(monitorPlatformSettings);
     initAppSettings();
+    await sanitize();
   }
 
   void _unregister() {
@@ -184,6 +185,11 @@ class Settings with ChangeNotifier, SettingsAccess, SearchSettings, AppSettings,
       set(SettingKeys.videoBackgroundModeKey, null);
     }
     collectionBurstPatterns = collectionBurstPatterns.where(BurstPatterns.options.contains).toList();
+
+    // emulator
+    if (!device.isPhysicalDevice) {
+      set(SettingKeys.videoHardwareAccelerationKey, VideoHardwareAcceleration.disabled);
+    }
   }
 
   // tag editor
@@ -383,7 +389,6 @@ class Settings with ChangeNotifier, SettingsAccess, SearchSettings, AppSettings,
             case SettingKeys.viewerGestureSideTapNextKey:
             case SettingKeys.viewerUseCutoutKey:
             case SettingKeys.enableMotionPhotoAutoPlayKey:
-            case SettingKeys.enableVideoHardwareAccelerationKey:
             case SettingKeys.videoGestureDoubleTapTogglePlayKey:
             case SettingKeys.videoGestureSideDoubleTapSeekKey:
             case SettingKeys.videoGestureVerticalDragBrightnessVolumeKey:
@@ -426,6 +431,7 @@ class Settings with ChangeNotifier, SettingsAccess, SearchSettings, AppSettings,
             case SettingKeys.imageBackgroundKey:
             case SettingKeys.videoAutoPlayModeKey:
             case SettingKeys.videoBackgroundModeKey:
+            case SettingKeys.videoHardwareAccelerationKey:
             case SettingKeys.videoLoopModeKey:
             case SettingKeys.videoResumptionModeKey:
             case SettingKeys.subtitleTextAlignmentKey:

lib/view/src/settings/enums.dart

@@ -176,6 +176,17 @@ extension ExtraVideoBackgroundModeView on VideoBackgroundMode {
   }
 }
 
+extension ExtraVideoHardwareAccelerationView on VideoHardwareAcceleration {
+  String getName(BuildContext context) {
+    final l10n = context.l10n;
+    return switch (this) {
+      VideoHardwareAcceleration.disabled => l10n.settingsDisabled,
+      VideoHardwareAcceleration.enabled => l10n.settingsEnabled,
+      VideoHardwareAcceleration.forced => l10n.settingsForced,
+    };
+  }
+}
+
 extension ExtraVideoLoopModeView on VideoLoopMode {
   String getName(BuildContext context) {
     final l10n = context.l10n;

lib/widgets/settings/video/playback.dart

@@ -21,10 +21,12 @@ class VideoPlaybackPage extends StatelessWidget {
       body: SafeArea(
         child: ListView(
           children: [
-            SettingsSwitchListTile(
-              selector: (context, s) => s.enableVideoHardwareAcceleration,
-              onChanged: (v) => settings.enableVideoHardwareAcceleration = v,
-              title: context.l10n.settingsVideoEnableHardwareAcceleration,
+            SettingsSelectionListTile<VideoHardwareAcceleration>(
+              values: VideoHardwareAcceleration.values,
+              getName: (context, v) => v.getName(context),
+              selector: (context, s) => s.videoHardwareAcceleration,
+              onSelection: (v) => settings.videoHardwareAcceleration = v,
+              tileTitle: context.l10n.settingsVideoEnableHardwareAcceleration,
             ),
             SettingsSelectionListTile<VideoAutoPlayMode>(
               values: VideoAutoPlayMode.values,

plugins/aves_model/lib/src/settings/enums.dart

@@ -36,6 +36,8 @@ enum VideoAutoPlayMode { disabled, playMuted, playWithSound }
 
 enum VideoBackgroundMode { disabled, pip }
 
+enum VideoHardwareAcceleration { disabled, enabled, forced }
+
 enum VideoLoopMode { never, shortOnly, always }
 
 enum VideoResumptionMode { never, ask, always }

plugins/aves_model/lib/src/settings/keys.dart

@@ -111,9 +111,9 @@ class SettingKeys {
   static const imageBackgroundKey = 'image_background';
 
   // video
-  static const enableVideoHardwareAccelerationKey = 'video_hwaccel_mediacodec';
-  static const videoBackgroundModeKey = 'video_background_mode';
   static const videoAutoPlayModeKey = 'video_auto_play_mode';
+  static const videoBackgroundModeKey = 'video_background_mode';
+  static const videoHardwareAccelerationKey = 'video_hardware_acceleration';
   static const videoLoopModeKey = 'video_loop';
   static const videoResumptionModeKey = 'video_resumption_mode';
   static const videoControlActionsKey = 'video_control_actions';

plugins/aves_video/lib/src/settings/defaults.dart

@@ -5,9 +5,9 @@ import 'package:aves_utils/aves_utils.dart';
 
 class SettingsDefaults {
   // video
-  static const enableVideoHardwareAcceleration = true;
   static const videoAutoPlayMode = VideoAutoPlayMode.disabled;
   static const videoBackgroundMode = VideoBackgroundMode.disabled;
+  static const videoHardwareAcceleration = VideoHardwareAcceleration.enabled;
   static const videoLoopMode = VideoLoopMode.shortOnly;
   static const videoResumptionMode = VideoResumptionMode.ask;
   static const videoShowRawTimedText = false;

plugins/aves_video/lib/src/settings/video.dart

@@ -2,9 +2,9 @@ import 'package:aves_model/aves_model.dart';
 import 'package:aves_video/src/settings/defaults.dart';
 
 mixin VideoSettings on SettingsAccess {
-  bool get enableVideoHardwareAcceleration => getBool(SettingKeys.enableVideoHardwareAccelerationKey) ?? SettingsDefaults.enableVideoHardwareAcceleration;
+  VideoHardwareAcceleration get videoHardwareAcceleration => getEnumOrDefault(SettingKeys.videoHardwareAccelerationKey, SettingsDefaults.videoHardwareAcceleration, VideoHardwareAcceleration.values);
 
-  set enableVideoHardwareAcceleration(bool newValue) => set(SettingKeys.enableVideoHardwareAccelerationKey, newValue);
+  set videoHardwareAcceleration(VideoHardwareAcceleration newValue) => set(SettingKeys.videoHardwareAccelerationKey, newValue.toString());
 
   VideoAutoPlayMode get videoAutoPlayMode => getEnumOrDefault(SettingKeys.videoAutoPlayModeKey, SettingsDefaults.videoAutoPlayMode, VideoAutoPlayMode.values);