mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5767 from owncloud/moviepreviewfallback 

Added ffmpeg fallback when avconv is not available
This commit is contained in:
Morris Jobke 2013-11-14 16:39:39 -08:00
parent 57a3141cb1 617dc0e468
commit 6ef39931cb
1 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/private/preview/movies.php
View File

@ -8,21 +8,39 @@
*/
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
if (!\OC_Util::runningOnWindows()) {
$isShellExecEnabled = !in_array('shell_exec', explode(', ', ini_get('disable_functions')));
$whichAVCONV = ($isShellExecEnabled ? shell_exec('which avconv') : '');
$isAVCONVAvailable = !empty($whichAVCONV);
$isExecEnabled = !in_array('exec', explode(', ', ini_get('disable_functions')));
$ffmpegBinary = null;
$avconvBinary = null;
if($isShellExecEnabled && $isAVCONVAvailable) {
if ($isExecEnabled) {
$avconvBinary = findBinaryPath('avconv');
if (!$avconvBinary) {
$ffmpegBinary = findBinaryPath('ffmpeg');
}
}
if($isExecEnabled && ( $avconvBinary || $ffmpegBinary )) {
class Movie extends Provider {
public static $avconvBinary;
public static $ffmpegBinary;
public function getMimeType() {
return '/video\/.*/';
}
public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
// TODO: use proc_open() and stream the source file ?
$absPath = \OC_Helper::tmpFile();
$tmpPath = \OC_Helper::tmpFile();
@ -31,21 +49,39 @@ if (!\OC_Util::runningOnWindows()) {
$firstmb = stream_get_contents($handle, 1048576); //1024 * 1024 = 1048576
file_put_contents($absPath, $firstmb);
//$cmd = 'ffmpeg -y -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 -ss 1 -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) . ' ' . $tmpPath;
$cmd = 'avconv -an -y -ss 1 -i ' . escapeshellarg($absPath) . ' -f mjpeg -vframes 1 ' . escapeshellarg($tmpPath);
if (self::$avconvBinary) {
$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);
$image = new \OC_Image();
$image->loadFromFile($tmpPath);
exec($cmd, $output, $returnCode);
unlink($absPath);
unlink($tmpPath);
return $image->valid() ? $image : false;
if ($returnCode === 0) {
$image = new \OC_Image();
$image->loadFromFile($tmpPath);
unlink($tmpPath);
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');
}
}