Merge pull request #5767 from owncloud/moviepreviewfallback
Added ffmpeg fallback when avconv is not available
This commit is contained in:
commit
6ef39931cb
|
@ -8,21 +8,39 @@
|
||||||
*/
|
*/
|
||||||
namespace OC\Preview;
|
namespace OC\Preview;
|
||||||
|
|
||||||
|
function findBinaryPath($program) {
|
||||||
|
exec('which ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
|
||||||
|
if ($returnCode === 0 && count($output) > 0) {
|
||||||
|
return escapeshellcmd($output[0]);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
// movie preview is currently not supported on Windows
|
// movie preview is currently not supported on Windows
|
||||||
if (!\OC_Util::runningOnWindows()) {
|
if (!\OC_Util::runningOnWindows()) {
|
||||||
$isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions')));
|
$isExecEnabled = !in_array('exec', explode(', ', ini_get('disable_functions')));
|
||||||
$whichAVCONV = ($isShellExecEnabled ? shell_exec('which avconv') : '');
|
$ffmpegBinary = null;
|
||||||
$isAVCONVAvailable = !empty($whichAVCONV);
|
$avconvBinary = null;
|
||||||
|
|
||||||
if($isShellExecEnabled && $isAVCONVAvailable) {
|
if ($isExecEnabled) {
|
||||||
|
$avconvBinary = findBinaryPath('avconv');
|
||||||
|
if (!$avconvBinary) {
|
||||||
|
$ffmpegBinary = findBinaryPath('ffmpeg');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if($isExecEnabled && ( $avconvBinary || $ffmpegBinary )) {
|
||||||
|
|
||||||
class Movie extends Provider {
|
class Movie extends Provider {
|
||||||
|
public static $avconvBinary;
|
||||||
|
public static $ffmpegBinary;
|
||||||
|
|
||||||
public function getMimeType() {
|
public function getMimeType() {
|
||||||
return '/video\/.*/';
|
return '/video\/.*/';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
|
public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
|
||||||
|
// TODO: use proc_open() and stream the source file ?
|
||||||
$absPath = \OC_Helper::tmpFile();
|
$absPath = \OC_Helper::tmpFile();
|
||||||
$tmpPath = \OC_Helper::tmpFile();
|
$tmpPath = \OC_Helper::tmpFile();
|
||||||
|
|
||||||
|
@ -31,20 +49,38 @@ if (!\OC_Util::runningOnWindows()) {
|
||||||
$firstmb = stream_get_contents($handle, 1048576); //1024 * 1024 = 1048576
|
$firstmb = stream_get_contents($handle, 1048576); //1024 * 1024 = 1048576
|
||||||
file_put_contents($absPath, $firstmb);
|
file_put_contents($absPath, $firstmb);
|
||||||
|
|
||||||
//$cmd = 'ffmpeg -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmpPath;
|
if (self::$avconvBinary) {
|
||||||
$cmd = 'avconv -an -y -ss 1 -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 ' . escapeshellarg($tmpPath);
|
$cmd = self::$avconvBinary . ' -an -y -ss 1'.
|
||||||
|
' -i ' . escapeshellarg($absPath) .
|
||||||
|
' -f mjpeg -vframes 1 ' . escapeshellarg($tmpPath) .
|
||||||
|
' > /dev/null 2>&1';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
$cmd = self::$ffmpegBinary . ' -y -ss 1' .
|
||||||
|
' -i ' . escapeshellarg($absPath) .
|
||||||
|
' -f mjpeg -vframes 1' .
|
||||||
|
' -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) .
|
||||||
|
' ' . escapeshellarg($tmpPath) .
|
||||||
|
' > /dev/null 2>&1';
|
||||||
|
}
|
||||||
|
|
||||||
shell_exec($cmd);
|
exec($cmd, $output, $returnCode);
|
||||||
|
|
||||||
$image = new \OC_Image();
|
|
||||||
$image->loadFromFile($tmpPath);
|
|
||||||
|
|
||||||
unlink($absPath);
|
unlink($absPath);
|
||||||
unlink($tmpPath);
|
|
||||||
|
|
||||||
|
if ($returnCode === 0) {
|
||||||
|
$image = new \OC_Image();
|
||||||
|
$image->loadFromFile($tmpPath);
|
||||||
|
unlink($tmpPath);
|
||||||
return $image->valid() ? $image : false;
|
return $image->valid() ? $image : false;
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// a bit hacky but didn't want to use subclasses
|
||||||
|
Movie::$avconvBinary = $avconvBinary;
|
||||||
|
Movie::$ffmpegBinary = $ffmpegBinary;
|
||||||
|
|
||||||
\OC\Preview::registerProvider('OC\Preview\Movie');
|
\OC\Preview::registerProvider('OC\Preview\Movie');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue