james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drop support for video without ffmpeg

Browse Source
This commit is contained in:
Shish 2018-09-09 10:21:56 +01:00
parent 38406ef33a
commit 1ed888611a
1 changed files with 25 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
ext/handle_video/main.php
View File

@ -22,11 +22,9 @@ class VideoFileHandler extends DataHandlerExtension {
if($ffmpeg = shell_exec((PHP_OS == 'WINNT' ? 'where' : 'which') . ' ffmpeg')) { if($ffmpeg = shell_exec((PHP_OS == 'WINNT' ? 'where' : 'which') . ' ffmpeg')) {
//ffmpeg exists in PATH, check if it's executable, and if so, default to it instead of static //ffmpeg exists in PATH, check if it's executable, and if so, default to it instead of static
if(is_executable(strtok($ffmpeg, PHP_EOL))) { if(is_executable(strtok($ffmpeg, PHP_EOL))) {
$config->set_default_string('video_thumb_engine', 'ffmpeg');
$config->set_default_string('thumb_ffmpeg_path', 'ffmpeg'); $config->set_default_string('thumb_ffmpeg_path', 'ffmpeg');
} }
} else { } else {
$config->set_default_string('video_thumb_engine', 'static');
$config->set_default_string('thumb_ffmpeg_path', ''); $config->set_default_string('thumb_ffmpeg_path', '');
} }
@ -46,21 +44,9 @@ class VideoFileHandler extends DataHandlerExtension {
} }
public function onSetupBuilding(SetupBuildingEvent $event) { public function onSetupBuilding(SetupBuildingEvent $event) {
//global $config;
$thumbers = array(
'None' => 'static',
'ffmpeg' => 'ffmpeg'
);
$sb = new SetupBlock("Video Thumbnail Options"); $sb = new SetupBlock("Video Thumbnail Options");
$sb->add_label("<br>Path to ffmpeg: ");
$sb->add_choice_option("video_thumb_engine", $thumbers, "Engine: "); $sb->add_text_option("thumb_ffmpeg_path");
//if($config->get_string("video_thumb_engine") == "ffmpeg") {
$sb->add_label("<br>Path to ffmpeg: ");
$sb->add_text_option("thumb_ffmpeg_path");
//}
// Some older versions of ffmpeg have trouble with the automatic aspect ratio scaling. // Some older versions of ffmpeg have trouble with the automatic aspect ratio scaling.
// This adds an option in the Board Config to disable the aspect ratio scaling. // This adds an option in the Board Config to disable the aspect ratio scaling.
@ -87,43 +73,31 @@ class VideoFileHandler extends DataHandlerExtension {
$ok = false; $ok = false;
switch($config->get_string("video_thumb_engine")) $ffmpeg = escapeshellcmd($config->get_string("thumb_ffmpeg_path"));
$w = (int)$config->get_int("thumb_width");
$h = (int)$config->get_int("thumb_height");
$inname = escapeshellarg(warehouse_path("images", $hash));
$outname = escapeshellarg(warehouse_path("thumbs", $hash));
if ($config->get_bool("video_thumb_ignore_aspect_ratio") == true)
{ {
default: $cmd = escapeshellcmd("{$ffmpeg} -y -i {$inname} -ss 00:00:00.0 -f image2 -vframes 1 {$outname}");
case 'static':
$outname = warehouse_path("thumbs", $hash);
copy("ext/handle_video/thumb.jpg", $outname);
$ok = true;
break;
case 'ffmpeg':
$ffmpeg = escapeshellcmd($config->get_string("thumb_ffmpeg_path"));
$w = (int)$config->get_int("thumb_width");
$h = (int)$config->get_int("thumb_height");
$inname = escapeshellarg(warehouse_path("images", $hash));
$outname = escapeshellarg(warehouse_path("thumbs", $hash));
if ($config->get_bool("video_thumb_ignore_aspect_ratio") == true)
{
$cmd = escapeshellcmd("{$ffmpeg} -y -i {$inname} -ss 00:00:00.0 -f image2 -vframes 1 {$outname}");
}
else
{
$scale = 'scale="' . escapeshellarg("if(gt(a,{$w}/{$h}),{$w},-1)") . ':' . escapeshellarg("if(gt(a,{$w}/{$h}),-1,{$h})") . '"';
$cmd = escapeshellcmd("{$ffmpeg} -y -i {$inname} -vf {$scale} -ss 00:00:00.0 -f image2 -vframes 1 {$outname}");
}
exec($cmd, $output, $returnValue);
if ((int)$returnValue == (int)1)
{
$ok = true;
}
log_debug('handle_video', "Generating thumbnail with command `$cmd`, returns $returnValue");
break;
} }
else
{
$scale = 'scale="' . escapeshellarg("if(gt(a,{$w}/{$h}),{$w},-1)") . ':' . escapeshellarg("if(gt(a,{$w}/{$h}),-1,{$h})") . '"';
$cmd = escapeshellcmd("{$ffmpeg} -y -i {$inname} -vf {$scale} -ss 00:00:00.0 -f image2 -vframes 1 {$outname}");
}
exec($cmd, $output, $returnValue);
if ((int)$returnValue == (int)1)
{
$ok = true;
}
log_debug('handle_video', "Generating thumbnail with command `$cmd`, returns $returnValue");
return $ok; return $ok;
} }