dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change the resize, it now depends of the format

Browse source
This commit is contained in:
grosroro 2012-05-30 12:23:55 +02:00
commit 68852ca65a
2 changed files with 33 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/FFMpeg/FFMpeg.php
View file

@ -219,16 +219,7 @@ class FFMpeg extends Binary
$cmd_part2 = ''; $cmd_part2 = '';
if ($format->getWidth() && $format->getHeight()) { if ($format instanceof Format\ResizableVideo) {
switch ($format->getResizeMode()) {
case Video::RESIZEMODE_FIT:
default:
$width = $this->getMultiple($format->getWidth(), 16);
$height = $this->getMultiple($format->getHeight(), 16);
break;
case Video::RESIZEMODE_INSET:
if ( ! $this->prober) { if ( ! $this->prober) {
throw new LogicException('You must set a valid prober if you use RESIZEMODE_INSET'); throw new LogicException('You must set a valid prober if you use RESIZEMODE_INSET');
} }
@ -251,22 +242,10 @@ class FFMpeg extends Binary
} }
} }
$originalRatio = $originalWidth / $originalHeight; list($width, $height) = $format->getComputedDimensions($originalWidth, $originalHeight);
$targetRatio = $format->getWidth() / $format->getHeight(); $width = $this->getMultiple($format->getWidth(), 16);
$height = $this->getMultiple($format->getHeight(), 16);
if($targetRatio >= $originalRatio){
$height = $format->getHeight();
$width = $format->getHeight() * $originalRatio;
}else{
$width = $format->getWidth();
$height = $format->getWidth() / $originalRatio;
}
$width = $this->getMultiple($width, 16);
$height = $this->getMultiple($height, 16);
break;
}
$cmd_part2 .= ' -s ' . $width . 'x' . $height; $cmd_part2 .= ' -s ' . $width . 'x' . $height;
} }