mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-28 12:19:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix code styling after 9d3ee3c

Browse source
This commit is contained in:
plegall 2022-07-29 15:40:02 +02:00
parent 9d3ee3c85d
commit e7317a7fe4
1 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

54
admin/include/functions_upload.inc.php
View file

@ -640,43 +640,45 @@ function upload_file_video($representative_ext, $file_path)
prepare_directory(dirname($representative_file_path));
// Get duration of video and determine time of poster
exec('ffprobe -v error -show_entries format=duration -of default=noprint_wrappers=1:nokey=1'." '$file_path'",$O,$S);
if(!empty($O[0]))
{
$second = min(floor($O[0]*10)/10, 2);
}
else
{
$second = 0; // Safest position of the poster
exec('ffprobe -v error -show_entries format=duration -of default=noprint_wrappers=1:nokey=1'." '$file_path'", $O, $S);
if (!empty($O[0]))
{
$second = min(floor($O[0]*10)/10, 2);
}
else
{
$second = 0; // Safest position of the poster
}
$logger->info(__FUNCTION__.', Poster at '.$second.'s');
// Generate poster
// See https://trac.ffmpeg.org/wiki/Seeking
// Generate poster, see https://trac.ffmpeg.org/wiki/Seeking
$ffmpeg = $conf['ffmpeg_dir'].'ffmpeg';
$ffmpeg.= ' -ss '.$second; // Fast seeking
$ffmpeg.= ' -i "'.$file_path.'"'; // Video file
$ffmpeg.= ' -frames:v 1'; // Extract one frame
$ffmpeg.= ' "'.$representative_file_path.'"'; // Output file
$ffmpeg.= ' -ss '.$second; // Fast seeking
$ffmpeg.= ' -i "'.$file_path.'"'; // Video file
$ffmpeg.= ' -frames:v 1'; // Extract one frame
$ffmpeg.= ' "'.$representative_file_path.'"'; // Output file
@exec($ffmpeg.' 2>&1',$FO,$FS);
if(!empty($FO[0]))
{
$logger->debug(__FUNCTION__.', Tried '.$ffmpeg);
$logger->debug($FO[0]);
}
@exec($ffmpeg.' 2>&1', $FO, $FS);
if (!empty($FO[0]))
{
$logger->debug(__FUNCTION__.', Tried '.$ffmpeg);
$logger->debug($FO[0]);
}
// Did we generate the file ?
if (!file_exists($representative_file_path))
{
// Let's try with avconv if ffmpeg unavailable
$avconv = str_replace('ffmpeg', 'avconv', $ffmpeg);
@exec($avconv.' 2>&1',$AO,$AS);
if(!empty($AO[0]))
{
$logger->debug(__FUNCTION__.', Tried '.$avconv);
$logger->debug($AO[0]);
}
@exec($avconv.' 2>&1', $AO, $AS);
if (!empty($AO[0]))
{
$logger->debug(__FUNCTION__.', Tried '.$avconv);
$logger->debug($AO[0]);
}
}
// Did we finally generate the file ?