fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Implement AVIF/HEIC -> JPG conversion using ImageMagick 7.x

Browse source
This commit is contained in:
Kijin Sung 2023-05-24 14:56:03 +09:00
parent f7c01cccfb
commit d1d2fa7686
1 changed files with 58 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

64
modules/file/file.controller.php
View file

@ -832,7 +832,7 @@ class FileController extends File
if(!$manual_insert) if(!$manual_insert)
{ {
// image // image
if(in_array($file_info['extension'], ['gif', 'jpg', 'jpeg', 'jfif', 'png', 'webp', 'bmp'])) if(in_array($file_info['extension'], ['gif', 'jpg', 'jpeg', 'jfif', 'png', 'webp', 'bmp', 'avif', 'heic', 'heif']))
{ {
$file_info = $this->adjustUploadedImage($file_info, $config); $file_info = $this->adjustUploadedImage($file_info, $config);
} }
@ -1019,7 +1019,31 @@ class FileController extends File
public function adjustUploadedImage($file_info, $config) public function adjustUploadedImage($file_info, $config)
{ {
// Get image information // Get image information
if (!$image_info = Rhymix\Framework\Image::getImageInfo($file_info['tmp_name'])) if (in_array($file_info['extension'], ['avif', 'heic', 'heif']) && !empty($config->magick_command))
{
$command = \RX_WINDOWS ? escapeshellarg($config->magick_command) : $config->magick_command;
$command .= ' identify ' . escapeshellarg($file_info['tmp_name']);
@exec($command, $output, $return_var);
if ($return_var === 0 && preg_match('/([A-Z]+) ([0-9]+)x([0-9]+)/', substr(array_last($output), strlen($file_info['tmp_name'])), $matches))
{
$image_info = [
'width' => (int)$matches[2],
'height' => (int)$matches[3],
'type' => strtolower($matches[1]),
];
}
else
{
$image_info = false;
}
}
else
{
$image_info = Rhymix\Framework\Image::getImageInfo($file_info['tmp_name']);
}
// Return if image cannot be converted
if (!$image_info)
{ {
return $file_info; return $file_info;
} }
@ -1056,6 +1080,18 @@ class FileController extends File
{ {
$adjusted['type'] = 'jpg'; $adjusted['type'] = 'jpg';
} }
elseif ($config->image_autoconv['avif2jpg'] && $image_info['type'] === 'avif')
{
$adjusted['type'] = 'jpg';
}
elseif ($config->image_autoconv['heic2jpg'] && $image_info['type'] === 'heic')
{
$adjusted['type'] = 'jpg';
}
elseif ($image_info['type'] === 'avif' || $image_info['type'] === 'heic')
{
return $file_info;
}
// Adjust image rotation // Adjust image rotation
if ($config->image_autorotate && $image_info['type'] === 'jpg') if ($config->image_autorotate && $image_info['type'] === 'jpg')
@ -1134,12 +1170,10 @@ class FileController extends File
} }
// Convert image if adjusted // Convert image if adjusted
if ( if ($adjusted['width'] !== $image_info['width'] ||
$force ||
$adjusted['width'] !== $image_info['width'] ||
$adjusted['height'] !== $image_info['height'] || $adjusted['height'] !== $image_info['height'] ||
$adjusted['type'] !== $image_info['type'] || $adjusted['type'] !== $image_info['type'] ||
$adjusted['rotate'] !== 0 $adjusted['rotate'] !== 0 || $force
) )
{ {
$output_name = $file_info['tmp_name'] . '.converted.' . $adjusted['type']; $output_name = $file_info['tmp_name'] . '.converted.' . $adjusted['type'];
@ -1147,6 +1181,7 @@ class FileController extends File
// Generate an output file // Generate an output file
if ($adjusted['type'] === 'mp4') if ($adjusted['type'] === 'mp4')
{ {
// Width and height must be even
$adjusted['width'] -= $adjusted['width'] % 2; $adjusted['width'] -= $adjusted['width'] % 2;
$adjusted['height'] -= $adjusted['height'] % 2; $adjusted['height'] -= $adjusted['height'] % 2;
@ -1169,6 +1204,23 @@ class FileController extends File
} }
} }
} }
elseif ($image_info['type'] === 'avif' || $image_info['type'] === 'heic')
{
// Width and height must be even
$adjusted['width'] -= $adjusted['width'] % 2;
$adjusted['height'] -= $adjusted['height'] % 2;
// Convert using magick
$command = vsprintf('%s %s -resize %dx%d %s', [
\RX_WINDOWS ? escapeshellarg($config->magick_command) : $config->magick_command,
escapeshellarg($file_info['tmp_name']),
$adjusted['width'],
$adjusted['height'],
escapeshellarg($output_name),
]);
@exec($command, $output, $return_var);
$result = $return_var === 0 ? true : false;
}
else else
{ {
$result = FileHandler::createImageFile($file_info['tmp_name'], $output_name, $adjusted['width'], $adjusted['height'], $adjusted['type'], 'fill', $adjusted['quality'], $adjusted['rotate']); $result = FileHandler::createImageFile($file_info['tmp_name'], $output_name, $adjusted['width'], $adjusted['height'], $adjusted['type'], 'fill', $adjusted['quality'], $adjusted['rotate']);