RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lp: fix support for Ultra HDR motion photos 

Signed-off-by: Varun Patil <radialapps@gmail.com>
pull/1010/head
Varun Patil 2024-01-19 09:23:08 -08:00
parent 6c9fd552e4
commit e6760c7452
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Db/LivePhoto.php
View File

@ -68,14 +68,23 @@ class LivePhoto
// //
// The video is then located at the end of the file, so we can get the offset. // The video is then located at the end of the file, so we can get the offset.
// Match each DirectoryItemSemantic to find MotionPhoto, then get the length. // Match each DirectoryItemSemantic to find MotionPhoto, then get the length.
//
// There are cases where Google decided to completely screw up and not include
// the length for one of the *earlier* DirectoryItemSemantic; in this case we still
// hope that the video is located at the end, and thus the last DirectoryItemLength
// seen before the DirectoryItemSemantic of MotionPhoto is the length of the video.
// https://github.com/pulsejet/memories/issues/965
$path = $file->getStorage()->getLocalFile($file->getInternalPath()) $path = $file->getStorage()->getLocalFile($file->getInternalPath())
?: throw new \Exception('[BUG][LivePhoto] Failed to get local file path'); ?: throw new \Exception('[BUG][LivePhoto] Failed to get local file path');
$extExif = Exif::getExifWithDuplicates($path); $extExif = Exif::getExifWithDuplicates($path);
$lastLength = null; // last DirectoryItemLength seen
foreach ($extExif as $key => $value) { foreach ($extExif as $key => $value) {
if (str_ends_with($key, ':DirectoryItemSemantic')) { if (str_ends_with($key, ':DirectoryItemSemantic')) {
if ('MotionPhoto' === $value) { if ('MotionPhoto' === $value) {
$videoLength = $extExif[str_replace('Semantic', 'Length', $key)]; // Found the video, try to find the corresponding semantic length
// If we can't find it, use the last length seen
$videoLength = $extExif[str_replace('Semantic', 'Length', $key)] ?? $lastLength;
if (\is_int($videoLength) && $videoLength > 0) { if (\is_int($videoLength) && $videoLength > 0) {
$videoOffset = $file->getSize() - $videoLength; $videoOffset = $file->getSize() - $videoLength;
@ -83,6 +92,10 @@ class LivePhoto
} }
} }
} }
if (str_ends_with($key, ':DirectoryItemLength')) {
$lastLength = $value;
}
} }
// Fallback: video should hopefully be in trailer // Fallback: video should hopefully be in trailer