Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mobile][photos] add change entry for video playback speed

r4khul4cfeb81acee2
diff --git a/mobile/apps/photos/changes/video-playback-speed.md b/mobile/apps/photos/changes/video-playback-speed.md
new file mode 100644
index 0000000000..92fd4b86a5
--- /dev/null
+++ b/mobile/apps/photos/changes/video-playback-speed.md
@@ -0,0 +1 @@
+- Add menu option to control video playback speed. (@r4khul)
diff --git a/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart b/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
index 885ddc90f5..4073920895 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
@@ -168,6 +168,7 @@ class _BodyState extends State<_Body> {
_captionUpdatedSubscription;
QrCodeDetectionHelper? _qrHelper;
final Map<String, File> _renderedFiles = {};
+ final _playbackSpeed = ValueNotifier<double>(1.0);
@override
void initState() {
@@ -220,6 +221,7 @@ class _BodyState extends State<_Body> {
_pageController.dispose();
_selectedIndexNotifier.dispose();
_qrHelper?.dispose();
+ _playbackSpeed.dispose();
super.dispose();
SystemChrome.setSystemUIOverlayStyle(
@@ -277,6 +279,7 @@ class _BodyState extends State<_Body> {
mode: widget.config.mode,
showEditAction: widget.config.showEditAction,
onBackPressed: widget.config.onBackPressed,
+ playbackSpeed: _playbackSpeed,
);
},
valueListenable: _selectedIndexNotifier,
@@ -475,6 +478,7 @@ class _BodyState extends State<_Body> {
}
},
qrDetectionsNotifier: _qrHelper?.qrDetectionsNotifier,
+ playbackSpeed: _playbackSpeed,
onTextSelectionStart:
flagService.ocrOverlayEnabled &&
widget.config.mode != DetailPageMode.minimalistic &&
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart b/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart
index 7cdcf106a0..16efef79a3 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart
@@ -35,12 +35,17 @@ import 'package:photos/ui/collections/collection_action_sheet.dart';
import 'package:photos/ui/notification/toast.dart';
import 'package:photos/ui/viewer/actions/suggest_delete_sheet.dart';
import "package:photos/ui/viewer/file/detail_page.dart";
+import "package:photos/ui/viewer/file/video_control/video_speed_bottom_sheet.dart";
import "package:photos/ui/viewer/file_details/favorite_widget.dart";
import "package:photos/ui/viewer/file_details/upload_icon_widget.dart";
import 'package:photos/utils/dialog_util.dart';
import "package:photos/utils/magic_util.dart";
import "package:photos/utils/share_util.dart";
+String _formatPlaybackSpeed(double speed) {
+ return speed == 1.0 ? "1x" : "${speed}x";
+}
+
class FileAppBar extends StatefulWidget {
final EnteFile file;
final Function(EnteFile) onFileRemoved;
@@ -50,6 +55,7 @@ class FileAppBar extends StatefulWidget {
final DetailPageMode mode;
final bool showEditAction;
final FutureOr<void> Function(BuildContext context)? onBackPressed;
+ final ValueNotifier<double> playbackSpeed;
const FileAppBar(
this.file,
@@ -60,6 +66,7 @@ class FileAppBar extends StatefulWidget {
this.mode = DetailPageMode.full,
this.showEditAction = true,
this.onBackPressed,
+ required this.playbackSpeed,
super.key,
});
@@ -411,6 +418,19 @@ class FileAppBarState extends State<FileAppBar> {
}
if (widget.file.isVideo && !restrictFileActions) {
+ items.add(
+ _fileMenuOption(
+ context.strings.playbackSpeed,
+ value: 10,
+ hugeIcon: HugeIcons.strokeRoundedDashboardSpeed02,
+ trailing: ValueListenableBuilder<double>(
+ valueListenable: widget.playbackSpeed,
+ builder: (context, speed, _) =>
+ Text(_formatPlaybackSpeed(speed), style: TextStyles.tiny),
+ ),
+ ),
+ );
+
if (_shouldShowCreateStreamOption()) {
items.add(
_fileMenuOption(
@@ -477,6 +497,7 @@ class FileAppBarState extends State<FileAppBar> {
String label, {
required int value,
required List<List<dynamic>> hugeIcon,
+ Widget? trailing,
}) {
return EntePopupMenuOption<int>(
value: value,
@@ -486,6 +507,7 @@ class FileAppBarState extends State<FileAppBar> {
size: IconSizes.small,
color: context.componentColors.textLight,
),
+ trailingWidget: trailing,
);
}
@@ -524,6 +546,12 @@ class FileAppBarState extends State<FileAppBar> {
await _handleVideoStream('create');
} else if (value == 9) {
await _handleVideoStream('recreate');
+ } else if (value == 10) {
+ await showVideoSpeedBottomSheet(
+ context,
+ currentSpeed: widget.playbackSpeed.value,
+ onSpeedSelected: (speed) => widget.playbackSpeed.value = speed,
+ );
} else if (value == 11) {
widget.onEditRequested(widget.file);
} else if (value == 12) {
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart
index a7ad23c3ae..648056920a 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_widget.dart
@@ -22,6 +22,7 @@ class FileWidget extends StatelessWidget {
final int? itemIndex;
final ValueListenable<int>? activeItemIndexListenable;
final bool? isAudioMutedOverride;
+ final ValueNotifier<double>? playbackSpeed;
final Function({required int memoryDuration})? onFinalFileLoad;
final ValueChanged<File>? onFinalImageLoaded;
final ValueNotifier<QrCodeDetectionResult?>? qrDetectionsNotifier;
@@ -39,6 +40,7 @@ class FileWidget extends StatelessWidget {
this.itemIndex,
this.activeItemIndexListenable,
this.isAudioMutedOverride,
+ this.playbackSpeed,
this.onFinalFileLoad,
this.onFinalImageLoaded,
this.qrDetectionsNotifier,
@@ -86,6 +88,7 @@ class FileWidget extends StatelessWidget {
itemIndex: itemIndex,
activeItemIndexListenable: activeItemIndexListenable,
isAudioMutedOverride: isAudioMutedOverride,
+ playbackSpeed: playbackSpeed,
key: key ?? ValueKey(fileKey),
);
} else {
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_control/video_speed_button.dart b/mobile/apps/photos/lib/ui/viewer/file/video_control/video_speed_button.dart
deleted file mode 100644
index 9ef099916d..0000000000
--- a/mobile/apps/photos/lib/ui/viewer/file/video_control/video_speed_button.dart
+++ /dev/null
@@ -1,64 +0,0 @@
-import "package:flutter/material.dart";
-import "package:hugeicons/hugeicons.dart";
-import "package:photos/theme/colors.dart";
-import "package:photos/theme/ente_theme.dart" show getEnteTextTheme;
-
-class VideoSpeedButton extends StatelessWidget {
- const VideoSpeedButton({
- super.key,
- required this.showControls,
- required this.playbackSpeed,
- required this.onTap,
- });
-
- final bool showControls;
- final double playbackSpeed;
- final VoidCallback onTap;
-
- @override
- Widget build(BuildContext context) {
- return IgnorePointer(
- ignoring: !showControls,
- child: Align(
- alignment: Alignment.centerLeft,
- child: AnimatedOpacity(
- duration: const Duration(milliseconds: 200),
- curve: Curves.easeInQuad,
- opacity: showControls ? 1 : 0,
- child: Padding(
- padding: const EdgeInsets.only(left: 10, bottom: 4),
- child: GestureDetector(
- onTap: onTap,
- child: Container(
- height: 32,
- padding: const EdgeInsets.symmetric(horizontal: 12),
- decoration: BoxDecoration(
- color: Colors.black.withValues(alpha: 0.5),
- borderRadius: const BorderRadius.all(Radius.circular(16)),
- border: Border.all(color: strokeFaintDark),
- ),
- child: Row(
- mainAxisSize: MainAxisSize.min,
- children: [
- const HugeIcon(
- icon: HugeIcons.strokeRoundedTimer02,
- size: 16,
- color: textBaseDark,
- ),
- const SizedBox(width: 4),
- Text(
- playbackSpeed == 1.0 ? "1x" : "${playbackSpeed}x",
- style: getEnteTextTheme(
- context,
- ).mini.copyWith(color: textBaseDark),
- ),
- ],
- ),
- ),
- ),
- ),
- ),
- ),
- );
- }
-}
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart
index 5435d9b482..ee02f8a9df 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget.dart
@@ -32,6 +32,7 @@ class VideoWidget extends StatefulWidget {
final int? itemIndex;
final ValueListenable<int>? activeItemIndexListenable;
final bool? isAudioMutedOverride;
+ final ValueNotifier<double>? playbackSpeed;
const VideoWidget(
this.file, {
@@ -44,6 +45,7 @@ class VideoWidget extends StatefulWidget {
this.itemIndex,
this.activeItemIndexListenable,
this.isAudioMutedOverride,
+ this.playbackSpeed,
super.key,
});
@@ -60,6 +62,8 @@ class _VideoWidgetState extends State<VideoWidget> {
PlaylistData? playlistData;
final nativePlayerKey = GlobalKey();
final mediaKitKey = GlobalKey();
+ late final ValueNotifier<double> _playbackSpeed =
+ widget.playbackSpeed ?? ValueNotifier<double>(1.0);
bool isPreviewLoadable = false;
@@ -102,6 +106,9 @@ class _VideoWidgetState extends State<VideoWidget> {
void dispose() {
widget.activeItemIndexListenable?.removeListener(_onActiveItemChanged);
useMediaKitForVideoSubscription.cancel();
+ if (widget.playbackSpeed == null) {
+ _playbackSpeed.dispose();
+ }
super.dispose();
}
@@ -204,6 +211,7 @@ class _VideoWidgetState extends State<VideoWidget> {
shouldDisableScroll: widget.shouldDisableScroll,
playlistData: playlistData,
selectedPreview: playPreview,
+ playbackSpeed: _playbackSpeed,
isFromMemories: widget.isFromMemories,
isActive: _isActive,
isAudioMutedOverride: widget.isAudioMutedOverride,
@@ -231,6 +239,7 @@ class _VideoWidgetState extends State<VideoWidget> {
shouldDisableScroll: widget.shouldDisableScroll,
preview: playlistData?.preview,
selectedPreview: playPreview,
+ playbackSpeed: _playbackSpeed,
isFromMemories: widget.isFromMemories,
isActive: _isActive,
isAudioMutedOverride: widget.isAudioMutedOverride,
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart
index b662b21799..d4751cddd4 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit.dart
@@ -41,6 +41,7 @@ class VideoWidgetMediaKit extends StatefulWidget {
final void Function() onStreamChange;
final File? preview;
final bool selectedPreview;
+ final ValueNotifier<double> playbackSpeed;
final Function({required int memoryDuration})? onFinalFileLoad;
const VideoWidgetMediaKit(
@@ -54,6 +55,7 @@ class VideoWidgetMediaKit extends StatefulWidget {
required this.onStreamChange,
this.preview,
required this.selectedPreview,
+ required this.playbackSpeed,
this.onFinalFileLoad,
super.key,
});
@@ -257,6 +259,7 @@ class _VideoWidgetMediaKitState extends State<VideoWidgetMediaKit>
isFromMemories: widget.isFromMemories,
onStreamChange: widget.onStreamChange,
isPreviewPlayer: widget.selectedPreview,
+ playbackSpeed: widget.playbackSpeed,
)
: Center(
child: ValueListenableBuilder(
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit_common.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit_common.dart
index 2b5e50ca7d..c717e4e485 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit_common.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget_media_kit_common.dart
@@ -9,8 +9,6 @@ import "package:photos/models/file/file.dart";
import "package:photos/states/detail_page_state.dart";
import "package:photos/theme/colors.dart";
import "package:photos/ui/viewer/file/video_control/gallery_video_controls.dart";
-import "package:photos/ui/viewer/file/video_control/video_speed_bottom_sheet.dart";
-import "package:photos/ui/viewer/file/video_control/video_speed_button.dart";
import "package:photos/ui/viewer/file/video_stream_change.dart";
import "package:photos/ui/viewer/file/zoomable_video_viewer.dart";
@@ -23,6 +21,7 @@ class VideoWidget extends StatefulWidget {
final bool isFromMemories;
final void Function() onStreamChange;
final bool isPreviewPlayer;
+ final ValueNotifier<double> playbackSpeed;
const VideoWidget(
this.file,
@@ -35,6 +34,7 @@ class VideoWidget extends StatefulWidget {
// ignore: unused_element
required this.onStreamChange,
required this.isPreviewPlayer,
+ required this.playbackSpeed,
});
@override
@@ -46,12 +46,12 @@ class _VideoWidgetState extends State<VideoWidget> {
final _hideControlsDebouncer = Debouncer(const Duration(milliseconds: 2000));
final _isSeekingNotifier = ValueNotifier<bool>(false);
late final StreamSubscription<bool> _isPlayingStreamSubscription;
- final _playbackSpeed = ValueNotifier<double>(1.0);
@override
void initState() {
super.initState();
- widget.controller.player.setRate(_playbackSpeed.value);
+ widget.playbackSpeed.addListener(_onPlaybackSpeedChanged);
+ widget.controller.player.setRate(widget.playbackSpeed.value);
_isPlayingStreamSubscription = widget.controller.player.stream.playing
.listen((isPlaying) {
if (isPlaying && !_isSeekingNotifier.value) {
@@ -70,15 +70,19 @@ class _VideoWidgetState extends State<VideoWidget> {
@override
void dispose() {
+ widget.playbackSpeed.removeListener(_onPlaybackSpeedChanged);
showControlsNotifier.dispose();
_isPlayingStreamSubscription.cancel();
_hideControlsDebouncer.cancelDebounceTimer();
_isSeekingNotifier.removeListener(isSeekingListener);
_isSeekingNotifier.dispose();
- _playbackSpeed.dispose();
super.dispose();
}
+ void _onPlaybackSpeedChanged() {
+ widget.controller.player.setRate(widget.playbackSpeed.value);
+ }
+
void isSeekingListener() {
if (_isSeekingNotifier.value) {
_hideControlsDebouncer.cancelDebounceTimer();
@@ -202,36 +206,12 @@ class _VideoWidgetState extends State<VideoWidget> {
child: SafeArea(
top: false,
left: false,
- child: Stack(
- children: [
- ValueListenableBuilder<double>(
- valueListenable: _playbackSpeed,
- builder: (context, speed, _) {
- return VideoSpeedButton(
- showControls: value,
- playbackSpeed: speed,
- onTap: () {
- showVideoSpeedBottomSheet(
- context,
- currentSpeed: speed,
- onSpeedSelected: (newSpeed) {
- _playbackSpeed.value = newSpeed;
- widget.controller.player.setRate(
- newSpeed,
- );
- },
- );
- },
- );
- },
- ),
- VideoStreamChangeWidget(
- showControls: value,
- file: widget.file,
- isPreviewPlayer: widget.isPreviewPlayer,
- onStreamChange: widget.onStreamChange,
- ),
- ],
+ right: false,
+ child: VideoStreamChangeWidget(
+ showControls: value,
+ file: widget.file,
+ isPreviewPlayer: widget.isPreviewPlayer,
+ onStreamChange: widget.onStreamChange,
),
),
),
diff --git a/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart b/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart
index 2b921ecd74..4bc22e16d6 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/video_widget_native.dart
@@ -34,8 +34,6 @@ import "package:photos/ui/viewer/file/native_video_player_controls/play_pause_bu
import "package:photos/ui/viewer/file/native_video_player_controls/seek_bar.dart";
import "package:photos/ui/viewer/file/thumbnail_widget.dart";
import "package:photos/ui/viewer/file/video_control/gallery_video_controls.dart";
-import "package:photos/ui/viewer/file/video_control/video_speed_bottom_sheet.dart";
-import "package:photos/ui/viewer/file/video_control/video_speed_button.dart";
import "package:photos/ui/viewer/file/video_stream_change.dart";
import "package:photos/ui/viewer/file/zoomable_video_viewer.dart";
import "package:photos/utils/dialog_util.dart";
@@ -53,6 +51,7 @@ class VideoWidgetNative extends StatefulWidget {
final void Function()? onStreamChange;
final PlaylistData? playlistData;
final bool selectedPreview;
+ final ValueNotifier<double> playbackSpeed;
final Function({required int memoryDuration})? onFinalFileLoad;
const VideoWidgetNative(
@@ -68,6 +67,7 @@ class VideoWidgetNative extends StatefulWidget {
this.playlistData,
this.onFinalFileLoad,
required this.selectedPreview,
+ required this.playbackSpeed,
});
@override
@@ -98,7 +98,6 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
StreamSubscription<DownloadTask>? downloadTaskSubscription;
final _transformationController = TransformationController();
bool _isZooming = false;
- final _playbackSpeed = ValueNotifier<double>(1.0);
@override
void initState() {
@@ -106,6 +105,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
'initState for ${widget.file.generatedID} with tag ${widget.file.tag} and name ${widget.file.displayName}',
);
super.initState();
+ widget.playbackSpeed.addListener(_onPlaybackSpeedChanged);
WidgetsBinding.instance.addObserver(this);
if (widget.selectedPreview) {
@@ -188,7 +188,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
);
await _controller?.loadVideo(videoSource);
await _applyVolume();
- await _controller?.setPlaybackSpeed(_playbackSpeed.value);
+ await _controller?.setPlaybackSpeed(widget.playbackSpeed.value);
await _syncPlayback();
Bus.instance.fire(SeekbarTriggeredEvent(position: 0));
@@ -255,6 +255,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
@override
void dispose() {
+ widget.playbackSpeed.removeListener(_onPlaybackSpeedChanged);
_subscription?.cancel();
_controller?.stop().ignore();
_controller?.dispose();
@@ -287,7 +288,6 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
_showControls.dispose();
_isSeeking.removeListener(_seekListener);
_isSeeking.dispose();
- _playbackSpeed.dispose();
_debouncer.cancelDebounceTimer();
_transformationController.dispose();
wakeLockService.updateWakeLock(
@@ -297,6 +297,10 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
super.dispose();
}
+ void _onPlaybackSpeedChanged() {
+ _controller?.setPlaybackSpeed(widget.playbackSpeed.value);
+ }
+
void _onInteractionLockChanged(bool shouldLock) {
if (!mounted) return;
if (_isZooming != shouldLock) {
@@ -467,40 +471,12 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
child: ValueListenableBuilder(
valueListenable: _showControls,
builder: (context, value, _) {
- return Stack(
- children: [
- ValueListenableBuilder<double>(
- valueListenable: _playbackSpeed,
- builder: (context, speed, _) {
- return VideoSpeedButton(
- showControls: value,
- playbackSpeed: speed,
- onTap: () {
- showVideoSpeedBottomSheet(
- context,
- currentSpeed: speed,
- onSpeedSelected: (newSpeed) {
- _playbackSpeed.value =
- newSpeed;
- _controller
- ?.setPlaybackSpeed(
- newSpeed,
- );
- },
- );
- },
- );
- },
- ),
- VideoStreamChangeWidget(
- showControls: value,
- file: widget.file,
- isPreviewPlayer:
- widget.selectedPreview,
- onStreamChange:
- widget.onStreamChange,
- ),
- ],
+ return VideoStreamChangeWidget(
+ showControls: value,
+ file: widget.file,
+ isPreviewPlayer:
+ widget.selectedPreview,
+ onStreamChange: widget.onStreamChange,
);
},
),
@@ -637,7 +613,7 @@ class _VideoWidgetNativeState extends State<VideoWidgetNative>
Future<void> _onPlaybackReady() async {
if (_isPlaybackReady.value) return;
await _applyVolume();
- await _controller?.setPlaybackSpeed(_playbackSpeed.value);
+ await _controller?.setPlaybackSpeed(widget.playbackSpeed.value);
await _syncPlayback();
final durationInSeconds = durationToSeconds(duration) ?? 10;
widget.onFinalFileLoad?.call(memoryDuration: durationInSeconds);