π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][photos] Fix video upload dimensions
ashil-pilot9cbbaf12f96d
diff --git a/mobile/apps/photos/changes/video-upload-dimensions.md b/mobile/apps/photos/changes/video-upload-dimensions.mdnew file mode 100644index 0000000000..9f35b9ae8f--- /dev/null+++ b/mobile/apps/photos/changes/video-upload-dimensions.md@@ -0,0 +1 @@+- Fixed incorrect aspect ratios for newly uploaded videos.diff --git a/mobile/apps/photos/lib/module/upload/upload_data.dart b/mobile/apps/photos/lib/module/upload/upload_data.dartindex 9bf243e078..2b066ca80f 100644--- a/mobile/apps/photos/lib/module/upload/upload_data.dart+++ b/mobile/apps/photos/lib/module/upload/upload_data.dart@@ -24,6 +24,7 @@ import "package:photos/module/metadata/exif.dart";import 'package:photos/module/metadata/location.dart';import "package:photos/module/metadata/video.dart";import 'package:photos/module/upload/model/media_upload_data.dart';+import "package:photos/module/upload/video_dimensions.dart";import "package:photos/services/sync/origin_fetch_tracker.dart";import "package:photos/src/rust/api/motion_photo_api.dart";import "package:photos/utils/apple_photos_errors.dart";@@ -108,7 +109,11 @@ Future<MediaUploadData> _getMediaUploadDataFromAssetFile(EnteFile file) async {thumbnailData = await _getThumbnailForUpload(asset, file);isDeleted = !(await asset.exists);int? h, w;- if (asset.width != 0 && asset.height != 0) {+ if (file.fileType == FileType.video) {+ final dimensions = await getVideoUploadDimensions(sourceFile);+ w = dimensions?.width;+ h = dimensions?.height;+ } else if (asset.width != 0 && asset.height != 0) {w = asset.width;h = asset.height;if (Platform.isAndroid &&@@ -330,10 +335,10 @@ Future<MediaUploadData> _getMediaUploadDataFromAppCache(EnteFile file) async {}}}- } else if (thumbnailResult.videoInfo != null) {- dimensions = (- width: thumbnailResult.videoInfo!.displayWidth,- height: thumbnailResult.videoInfo!.displayHeight,+ } else if (file.fileType == FileType.video) {+ dimensions = await getVideoUploadDimensions(+ sourceFile,+ sourceVideoInfo: thumbnailResult.videoInfo,);}diff --git a/mobile/apps/photos/lib/module/upload/upload_metadata.dart b/mobile/apps/photos/lib/module/upload/upload_metadata.dartindex 9952c6b57b..239f18375f 100644--- a/mobile/apps/photos/lib/module/upload/upload_metadata.dart+++ b/mobile/apps/photos/lib/module/upload/upload_metadata.dart@@ -47,6 +47,7 @@ Future<PreparedUploadMetadata> prepareUploadMetadata(derivedMetadata,exifTime,isPanorama: isPanorama == true,+ isVideo: file.fileType == FileType.video,hasThumbnail: mediaUploadData.thumbnail != null,),);@@ -56,6 +57,7 @@ Map<String, dynamic> _buildPublicMetadata(DerivedMediaMetadata derivedMetadata,ParsedExifDateTime? exifTime, {required bool isPanorama,+ required bool isVideo,required bool hasThumbnail,}) {final Map<String, dynamic> publicMetadata = {};@@ -63,6 +65,10 @@ Map<String, dynamic> _buildPublicMetadata(publicMetadata[heightKey] = derivedMetadata.height;publicMetadata[widthKey] = derivedMetadata.width;publicMetadata[mediaTypeKey] = isPanorama ? 1 : 0;+ } else if (isVideo) {+ // Nulls overwrite catalog dimensions when upload metadata is merged.+ publicMetadata[heightKey] = null;+ publicMetadata[widthKey] = null;}if (derivedMetadata.motionPhotoStartIndex != null) {publicMetadata[motionVideoIndexKey] = derivedMetadata.motionPhotoStartIndex;diff --git a/mobile/apps/photos/lib/module/upload/video_dimensions.dart b/mobile/apps/photos/lib/module/upload/video_dimensions.dartnew file mode 100644index 0000000000..9401cb377c--- /dev/null+++ b/mobile/apps/photos/lib/module/upload/video_dimensions.dart@@ -0,0 +1,21 @@+import "dart:io";++import "package:logging/logging.dart";+import "package:native_video_editor/native_video_editor.dart";++final _logger = Logger("VideoUploadDimensions");++Future<({int width, int height})?> getVideoUploadDimensions(+ File sourceFile, {+ NativeVideoInfo? sourceVideoInfo,+}) async {+ try {+ final info =+ sourceVideoInfo ??+ await NativeVideoEditor.inspectVideo(sourceFile.path);+ return (width: info.displayWidth, height: info.displayHeight);+ } catch (e, s) {+ _logger.warning("Failed to read upload video dimensions", e, s);+ }+ return null;+}diff --git a/mobile/apps/photos/test/module/upload/video_dimensions_test.dart b/mobile/apps/photos/test/module/upload/video_dimensions_test.dartnew file mode 100644index 0000000000..fecb44c03a--- /dev/null+++ b/mobile/apps/photos/test/module/upload/video_dimensions_test.dart@@ -0,0 +1,121 @@+import "dart:io";++import "package:flutter/services.dart";+import "package:flutter_test/flutter_test.dart";+import "package:native_video_editor/native_video_editor.dart";+import "package:photos/models/file/file.dart";+import "package:photos/models/file/file_type.dart";+import "package:photos/models/metadata/file_magic.dart";+import "package:photos/module/upload/model/media_upload_data.dart";+import "package:photos/module/upload/upload_metadata.dart";+import "package:photos/module/upload/video_dimensions.dart";++void main() {+ TestWidgetsFlutterBinding.ensureInitialized();+ const channel = MethodChannel("native_video_editor");+ late Directory directory;+ late File source;+ late Map<String, Object> videoInfo;+ MethodCall? inspection;+ bool failInspection = false;++ setUp(() async {+ directory = await Directory.systemTemp.createTemp("upload-dimensions-");+ source = await File("${directory.path}/original.mp4").writeAsBytes([0]);+ videoInfo = {+ "duration": 1000,+ "width": 1920,+ "height": 1080,+ "displayWidth": 1080,+ "displayHeight": 1920,+ "rotation": 90,+ };+ inspection = null;+ failInspection = false;+ TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger+ .setMockMethodCallHandler(channel, (call) async {+ inspection = call;+ if (failInspection) {+ throw PlatformException(code: "metadata_unavailable");+ }+ return videoInfo;+ });+ });++ tearDown(() async {+ TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger+ .setMockMethodCallHandler(channel, null);+ await directory.delete(recursive: true);+ });++ test(+ "prepares source display dimensions even without a video thumbnail",+ () async {+ final file = EnteFile()..fileType = FileType.video;+ final dimensions = await getVideoUploadDimensions(source);+ final metadata = await prepareUploadMetadata(+ file,+ MediaUploadData(+ sourceFile: source,+ thumbnail: null,+ isDeleted: false,+ fileHash: "hash",+ derivedMetadata: DerivedMediaMetadata(+ width: dimensions?.width,+ height: dimensions?.height,+ ),+ ),+ null,+ );++ expect(inspection?.method, "getVideoInfo");+ expect(inspection?.arguments, {"videoPath": source.path});+ expect(metadata.publicMetadata[widthKey], 1080);+ expect(metadata.publicMetadata[heightKey], 1920);+ expect(metadata.publicMetadata[noThumbKey], isTrue);+ },+ );++ test("reuses metadata from a thumbnail of the same source", () async {+ failInspection = true;+ videoInfo = {+ ...videoInfo,+ "width": 1080,+ "height": 1920,+ "displayWidth": 1920,+ "displayHeight": 1080,+ "rotation": 270,+ };++ final dimensions = await getVideoUploadDimensions(+ source,+ sourceVideoInfo: NativeVideoInfo.fromMap(videoInfo),+ );++ expect(dimensions, (width: 1920, height: 1080));+ expect(inspection, isNull);+ });++ test("unreadable source prepares explicit null dimensions", () async {+ failInspection = true;+ final file = EnteFile()..fileType = FileType.video;+ final dimensions = await getVideoUploadDimensions(source);+ final metadata = await prepareUploadMetadata(+ file,+ MediaUploadData(+ sourceFile: source,+ thumbnail: Uint8List.fromList([0]),+ isDeleted: false,+ fileHash: "hash",+ derivedMetadata: DerivedMediaMetadata(+ width: dimensions?.width,+ height: dimensions?.height,+ ),+ ),+ null,+ );++ expect(dimensions, isNull);+ expect(metadata.publicMetadata, {widthKey: null, heightKey: null});+ });+}