mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-08-13 17:34:04 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1056 from freshleafmedia/feature/avif-support

Browse Source 
AVIF Support
This commit is contained in:
Oliver Vogel
2021-07-05 18:24:52 +02:00
committed by GitHub
parent c1e052ef00 9c1188b4d8
commit b349463dae
4 changed files with 68 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Intervention/Image/AbstractEncoder.php
View File

@@ -84,6 +84,13 @@ abstract class AbstractEncoder
*/
abstract protected function processWebp();
/**
* Processes and returns image as Avif encoded string
*
* @return string
*/
abstract protected function processAvif();
/**
* Process a given image
*
@@ -169,6 +176,11 @@ abstract class AbstractEncoder
case 'image/x-webp':
$this->result = $this->processWebp();
break;
case 'avif':
case 'image/avif':
$this->result = $this->processAvif();
break;
default:
throw new NotSupportedException(

12
src/Intervention/Image/Gd/Encoder.php
View File

@@ -122,4 +122,16 @@ class Encoder extends \Intervention\Image\AbstractEncoder
"PSD format is not supported by Gd Driver."
);
}
/**
* Processes and returns encoded image as AVIF string
*
* @return string
*/
protected function processAvif()
{
throw new NotSupportedException(
"AVIF format is not supported by Gd Driver."
);
}
}

22
src/Intervention/Image/Imagick/Encoder.php
View File

@@ -170,4 +170,26 @@ class Encoder extends AbstractEncoder
return $imagick->getImagesBlob();
}
protected function processAvif()
{
if ( ! \Imagick::queryFormats('AVIF')) {
throw new NotSupportedException(
"AVIF format is not supported by Imagick installation."
);
}
$format = 'avif';
$compression = \Imagick::COMPRESSION_UNDEFINED;
$imagick = $this->image->getCore();
$imagick->setFormat($format);
$imagick->setImageFormat($format);
$imagick->setCompression($compression);
$imagick->setImageCompression($compression);
$imagick->setCompressionQuality($this->quality);
$imagick->setImageCompressionQuality($this->quality);
return $imagick->getImagesBlob();
}
}

22
tests/EncoderTest.php
View File

@@ -76,6 +76,18 @@ class EncoderTest extends TestCase
}
/**
* @expectedException \Intervention\Image\Exception\NotSupportedException
*/
public function testProcessAvifGd()
{
$core = imagecreatefromjpeg(__DIR__.'/images/test.jpg');
$encoder = new GdEncoder;
$image = Mockery::mock('\Intervention\Image\Image');
$img = $encoder->process($image, 'avif', 90);
$this->assertInstanceOf('Intervention\Image\Image', $img);
}
/**
* @expectedException \Intervention\Image\Exception\NotSupportedException
*/
@@ -195,6 +207,16 @@ class EncoderTest extends TestCase
$img = $encoder->process($image, 'webp', 90);
}
/**
* @expectedException \Intervention\Image\Exception\NotSupportedException
*/
public function testProcessAvifImagick()
{
$encoder = new ImagickEncoder;
$image = Mockery::mock('\Intervention\Image\Image');
$img = $encoder->process($image, 'avif', 90);
}
public function testProcessTiffImagick()
{
$core = $this->getImagickMock('tiff');