fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix video aspect ratio when ffprobe returns rotation data in side_data_list

Browse source 
https://xetown.com/questions/1789336
This commit is contained in:
Kijin Sung 2023-12-06 10:34:39 +09:00
parent a78df8d4fd
commit 11b728bf4a
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/file/file.controller.php
View file

@ -1379,17 +1379,26 @@ class FileController extends File
return $file_info; return $file_info;
} }
// Get video size and duration // Check if video needs to be rotated
$rotate = false;
if (isset($stream_info['video']['tags']['rotate']) && in_array($stream_info['video']['tags']['rotate'], [90, 270])) if (isset($stream_info['video']['tags']['rotate']) && in_array($stream_info['video']['tags']['rotate'], [90, 270]))
{ {
$file_info['width'] = (int)$stream_info['video']['height']; $rotate = true;
$file_info['height'] = (int)$stream_info['video']['width'];
} }
else elseif (isset($stream_info['video']['side_data_list']) && is_array($stream_info['video']['side_data_list']))
{ {
$file_info['width'] = (int)$stream_info['video']['width']; foreach ($stream_info['video']['side_data_list'] as $side_data)
$file_info['height'] = (int)$stream_info['video']['height']; {
if (isset($side_data['rotation']) && in_array(abs($side_data['rotation']), [90, 270]))
{
$rotate = true;
} }
}
}
// Get video size and duration
$file_info['width'] = intval($rotate ? $stream_info['video']['height'] : $stream_info['video']['width']);
$file_info['height'] = intval($rotate ? $stream_info['video']['width'] : $stream_info['video']['height']);
$file_info['duration'] = round($stream_info['video']['duration']); $file_info['duration'] = round($stream_info['video']['duration']);
$adjusted = [ $adjusted = [
'width' => $file_info['width'], 'width' => $file_info['width'],