TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[mob][photos] Try converting any unsupported format on Android

Browse Source
This commit is contained in:
laurenspriem
2024-09-03 13:13:56 +02:00
parent 9dadb92d8d
commit ed3b27475e
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
mobile/lib/utils/image_ml_util.dart
View File

@@ -29,30 +29,25 @@ Future<(Image, ByteData)> decodeImageFromPath(String imagePath) async {
return (image, imageByteData);
} catch (e, s) {
final format = imagePath.split('.').last;
if ((format == 'heic' || format == 'heif') && Platform.isAndroid) {
_logger.info('Cannot decode $format, converting to JPG format');
if (Platform.isAndroid) {
_logger.info('Cannot decode $format, converting to JPG on Android');
final String? jpgPath =
await HeifConverter.convert(imagePath, format: 'jpg');
if (jpgPath == null) {
_logger.severe('Error converting $format to jpg:', e, s);
throw Exception(
'InvalidImageFormatException: Error decoding image of format $format',
);
if (jpgPath != null) {
final imageData = await File(jpgPath).readAsBytes();
final image = await decodeImageFromData(imageData);
final ByteData imageByteData = await getByteDataFromImage(image);
return (image, imageByteData);
}
final imageData = await File(jpgPath).readAsBytes();
final image = await decodeImageFromData(imageData);
final ByteData imageByteData = await getByteDataFromImage(image);
return (image, imageByteData);
} else {
_logger.severe(
'Error decoding image of format $format:',
e,
s,
);
throw Exception(
'InvalidImageFormatException: Error decoding image of format $format',
);
}
_logger.severe(
'Error decoding image of format $format (Android: ${Platform.isAndroid})',
e,
s,
);
throw Exception(
'InvalidImageFormatException: Error decoding image of format $format',
);
}
}