Merge pull request #156 from 27chan/patch-6

Add extension mp4
This commit is contained in:
Marcin Łabanowski 2015-08-11 03:33:18 +02:00
commit ae4cac5200

View File

@ -3,60 +3,61 @@
* ffmpeg.php * ffmpeg.php
* A barebones ffmpeg based webm implementation for vichan. * A barebones ffmpeg based webm implementation for vichan.
*/ */
function get_webm_info($filename) { function get_webm_info($filename) {
global $board, $config; global $board, $config;
$filename = escapeshellarg($filename); $filename = escapeshellarg($filename);
$ffprobe = $config['webm']['ffprobe_path']; $ffprobe = $config['webm']['ffprobe_path'];
$ffprobe_out = array(); $ffprobe_out = array();
$webminfo = array(); $webminfo = array();
exec("$ffprobe -v quiet -print_format json -show_format -show_streams $filename", $ffprobe_out); exec("$ffprobe -v quiet -print_format json -show_format -show_streams $filename", $ffprobe_out);
$ffprobe_out = json_decode(implode("\n", $ffprobe_out), 1); $ffprobe_out = json_decode(implode("\n", $ffprobe_out), 1);
$webminfo['error'] = is_valid_webm($ffprobe_out); $webminfo['error'] = is_valid_webm($ffprobe_out);
if(empty($webminfo['error'])) { if(empty($webminfo['error'])) {
$webminfo['width'] = $ffprobe_out['streams'][0]['width']; $webminfo['width'] = $ffprobe_out['streams'][0]['width'];
$webminfo['height'] = $ffprobe_out['streams'][0]['height']; $webminfo['height'] = $ffprobe_out['streams'][0]['height'];
$webminfo['duration'] = $ffprobe_out['format']['duration'];
} }
return $webminfo; return $webminfo;
} }
function is_valid_webm($ffprobe_out) { function is_valid_webm($ffprobe_out) {
global $board, $config; global $board, $config;
if (empty($ffprobe_out)) if (empty($ffprobe_out))
return array('code' => 1, 'msg' => $config['error']['genwebmerror']); return array('code' => 1, 'msg' => $config['error']['genwebmerror']);
$extension = pathinfo($ffprobe_out['format']['filename'], PATHINFO_EXTENSION);
if ($ffprobe_out['format']['format_name'] != 'matroska,webm') if ($extension === 'webm') {
return array('code' => 2, 'msg' => $config['error']['invalidwebm']); if ($ffprobe_out['format']['format_name'] != 'matroska,webm')
return array('code' => 2, 'msg' => $config['error']['invalidwebm']);
} elseif ($extension === 'mp4') {
if ($ffprobe_out['streams'][0]['codec_name'] != 'h264' && $ffprobe_out['streams'][1]['codec_name'] != 'aac')
return array('code' => 2, 'msg' => $config['error']['invalidwebm']);
} else {
return array('code' => 1, 'msg' => $config['error']['genwebmerror']);
}
if ((count($ffprobe_out['streams']) > 1) && (!$config['webm']['allow_audio'])) if ((count($ffprobe_out['streams']) > 1) && (!$config['webm']['allow_audio']))
return array('code' => 3, 'msg' => $config['error']['webmhasaudio']); return array('code' => 3, 'msg' => $config['error']['webmhasaudio']);
if ($ffprobe_out['streams'][0]['codec_name'] != 'vp8')
return array('code' => 2, 'msg' => $config['error']['invalidwebm']);
if (empty($ffprobe_out['streams'][0]['width']) || (empty($ffprobe_out['streams'][0]['height']))) if (empty($ffprobe_out['streams'][0]['width']) || (empty($ffprobe_out['streams'][0]['height'])))
return array('code' => 2, 'msg' => $config['error']['invalidwebm']); return array('code' => 2, 'msg' => $config['error']['invalidwebm']);
if ($ffprobe_out['format']['duration'] > $config['webm']['max_length']) if ($ffprobe_out['format']['duration'] > $config['webm']['max_length'])
return array('code' => 4, 'msg' => $config['error']['webmtoolong']); return array('code' => 4, 'msg' => sprintf($config['error']['webmtoolong'], $config['webm']['max_length']));
} }
function make_webm_thumbnail($filename, $thumbnail, $width, $height, $duration) {
function make_webm_thumbnail($filename, $thumbnail, $width, $height) {
global $board, $config; global $board, $config;
$filename = escapeshellarg($filename); $filename = escapeshellarg($filename);
$thumbnail = escapeshellarg($thumbnail); // Should be safe by default but you $thumbnailfc = escapeshellarg($thumbnail); // Should be safe by default but you
// can never be too safe. // can never be too safe.
$ffmpeg = $config['webm']['ffmpeg_path']; $ffmpeg = $config['webm']['ffmpeg_path'];
$ret = 0;
$ffmpeg_out = array(); $ffmpeg_out = array();
exec("$ffmpeg -strict -2 -ss " . floor($duration / 2) . " -i $filename -v quiet -an -vframes 1 -f mjpeg -vf scale=$width:$height $thumbnailfc 2>&1", $ffmpeg_out, $ret);
exec("$ffmpeg -i $filename -v quiet -ss 00:00:00 -an -vframes 1 -f mjpeg -vf scale=$width:$height $thumbnail 2>&1"); // Work around for https://trac.ffmpeg.org/ticket/4362
if (filesize($thumbnail) === 0) {
return count($ffmpeg_out); // try again with first frame
exec("$ffmpeg -y -strict -2 -ss 0 -i $filename -v quiet -an -vframes 1 -f mjpeg -vf scale=$width:$height $thumbnailfc 2>&1", $ffmpeg_out, $ret);
clearstatcache();
// failed if no thumbnail size even if ret code 0, ffmpeg is buggy
if (filesize($thumbnail) === 0) {
$ret = 1;
}
}
return $ret;
} }