From b39eaba3ebc692edc4f13c8986cb6ddb1052ac41 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Mon, 16 Jan 2023 14:36:40 +0100 Subject: [PATCH] minor --- .../deckers/thibault/aves/metadata/XMP.kt | 1 + .../viewer/info/metadata/xmp_namespaces.dart | 2 ++ .../viewer/info/metadata/xmp_ns/google.dart | 35 +++++++++++++------ 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt index e170e9bbc..74a9a9a3d 100644 --- a/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt +++ b/android/app/src/main/kotlin/deckers/thibault/aves/metadata/XMP.kt @@ -71,6 +71,7 @@ object XMP { // cf https://developers.google.com/vr/reference/cardboard-camera-vr-photo-format private val knownDataProps = listOf( XMPPropName(GAUDIO_NS_URI, "Data"), + XMPPropName(GCAMERA_NS_URI, "RelitInputImageData"), XMPPropName(GIMAGE_NS_URI, "Data"), XMPPropName(GDEPTH_NS_URI, "Data"), XMPPropName(GDEPTH_NS_URI, "Confidence"), diff --git a/lib/widgets/viewer/info/metadata/xmp_namespaces.dart b/lib/widgets/viewer/info/metadata/xmp_namespaces.dart index 664b69d61..7264a8c40 100644 --- a/lib/widgets/viewer/info/metadata/xmp_namespaces.dart +++ b/lib/widgets/viewer/info/metadata/xmp_namespaces.dart @@ -50,6 +50,8 @@ class XmpNamespace extends Equatable { return XmpExifNamespace(schemaRegistryPrefixes: schemaRegistryPrefixes, rawProps: rawProps); case Namespaces.gAudio: return XmpGAudioNamespace(schemaRegistryPrefixes: schemaRegistryPrefixes, rawProps: rawProps); + case Namespaces.gCamera: + return XmpGCameraNamespace(schemaRegistryPrefixes: schemaRegistryPrefixes, rawProps: rawProps); case Namespaces.gContainer: return XmpGContainer(schemaRegistryPrefixes: schemaRegistryPrefixes, rawProps: rawProps); case Namespaces.gDepth: diff --git a/lib/widgets/viewer/info/metadata/xmp_ns/google.dart b/lib/widgets/viewer/info/metadata/xmp_ns/google.dart index f41516fb6..e33140105 100644 --- a/lib/widgets/viewer/info/metadata/xmp_ns/google.dart +++ b/lib/widgets/viewer/info/metadata/xmp_ns/google.dart @@ -60,7 +60,27 @@ class XmpGAudioNamespace extends XmpGoogleNamespace { XmpGAudioNamespace({required super.schemaRegistryPrefixes, required super.rawProps}) : super(nsUri: Namespaces.gAudio); @override - List> get dataProps => [Tuple2('${nsPrefix}Data', '${nsPrefix}Mime')]; + List> get dataProps => [ + Tuple2('${nsPrefix}Data', '${nsPrefix}Mime'), + ]; +} + +class XmpGCameraNamespace extends XmpGoogleNamespace { + XmpGCameraNamespace({required super.schemaRegistryPrefixes, required super.rawProps}) : super(nsUri: Namespaces.gCamera); + + @override + List> get dataProps => [ + Tuple2('${nsPrefix}RelitInputImageData', '${nsPrefix}RelitInputImageMime'), + ]; +} + +class XmpGContainer extends XmpNamespace { + XmpGContainer({required super.schemaRegistryPrefixes, required super.rawProps}) : super(nsUri: Namespaces.gContainer); + + @override + late final List cards = [ + XmpCardData(RegExp(nsPrefix + r'Directory\[(\d+)\]/' + nsPrefix + r'Item/(.*)'), title: 'Directory Item'), + ]; } class XmpGDepthNamespace extends XmpGoogleNamespace { @@ -136,14 +156,7 @@ class XmpGImageNamespace extends XmpGoogleNamespace { XmpGImageNamespace({required super.schemaRegistryPrefixes, required super.rawProps}) : super(nsUri: Namespaces.gImage); @override - List> get dataProps => [Tuple2('${nsPrefix}Data', '${nsPrefix}Mime')]; -} - -class XmpGContainer extends XmpNamespace { - XmpGContainer({required super.schemaRegistryPrefixes, required super.rawProps}) : super(nsUri: Namespaces.gContainer); - - @override - late final List cards = [ - XmpCardData(RegExp(nsPrefix + r'Directory\[(\d+)\]/' + nsPrefix + r'Item/(.*)'), title: 'Directory Item'), - ]; + List> get dataProps => [ + Tuple2('${nsPrefix}Data', '${nsPrefix}Mime'), + ]; }