Skip to content

armgit / ente

Public Imported from GitHub
0

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

Fix preview resumption and video dimension fallback

Neeraj Gupta9c1c89e94c1f
diff --git a/mobile/apps/photos/lib/models/ffmpeg/ffprobe_props.dart b/mobile/apps/photos/lib/models/ffmpeg/ffprobe_props.dart
index b9cb5027e4..c584acb061 100644
--- a/mobile/apps/photos/lib/models/ffmpeg/ffprobe_props.dart
+++ b/mobile/apps/photos/lib/models/ffmpeg/ffprobe_props.dart
@@ -182,16 +182,20 @@ class FFProbeProps {
result.fps = _formatFPS(stream[key]);
parsedData[key] = result.fps;
} else if (key == FFProbeKeys.width || key == FFProbeKeys.codedWidth) {
- final width =
- stream[FFProbeKeys.width] ?? stream[FFProbeKeys.codedWidth];
+ var width = stream[FFProbeKeys.width];
+ if (width == null || width == 0) {
+ width = stream[FFProbeKeys.codedWidth];
+ }
if (width != null && width != 0) {
result._width = width.toString();
parsedData[FFProbeKeys.width] = result._width;
}
} else if (key == FFProbeKeys.height ||
key == FFProbeKeys.codedHeight) {
- final height =
- stream[FFProbeKeys.height] ?? stream[FFProbeKeys.codedHeight];
+ var height = stream[FFProbeKeys.height];
+ if (height == null || height == 0) {
+ height = stream[FFProbeKeys.codedHeight];
+ }
if (height != null && height != 0) {
result._height = height.toString();
parsedData[FFProbeKeys.height] = result._height;
diff --git a/mobile/apps/photos/lib/services/video_preview_service.dart b/mobile/apps/photos/lib/services/video_preview_service.dart
index e1b20cd1c8..6bc23c4d02 100644
--- a/mobile/apps/photos/lib/services/video_preview_service.dart
+++ b/mobile/apps/photos/lib/services/video_preview_service.dart
@@ -1423,6 +1423,16 @@ class VideoPreviewService {
return;
}
+ try {
+ isManual =
+ isManual || (await uploadLocksDB.getStreamQueue()).isNotEmpty;
+ } catch (error, stackTrace) {
+ _logger.warning(
+ "Failed to read manual preview queue",
+ error,
+ stackTrace,
+ );
+ }
final isStreamAllowed = isManual ? _allowManualStream() : _allowStream();
if (!isStreamAllowed) return;