vanzhiganov/clipbucket
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modified : Fixed a bit of errors

Browse source
This commit is contained in:
Fahad Abbas 2016-03-08 17:57:57 +05:00
parent 765e6c6c51
commit f63144539e
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
upload/admin_area/lab_resources/experiments.php
View file

@ -95,7 +95,7 @@ if(isset($_POST['experiment']))
$msg[] = "<br>".nl2br($width); $msg[] = "<br>".nl2br($width);
$msg[] = "<br>".nl2br($v_bitrate); $msg[] = "<br>".nl2br($v_bitrate);
$msg[] = "<br>".nl2br($a_bitrate); $msg[] = "<br>".nl2br($a_bitrate);
$msg[] = "<br>".nl2br(shell_output($Cbucket->configs['ffmpegpath'].' -i '.$victimFile." -vcodec libx264 -acodec libfaac -s ".$width."x".$height." -preset ".$preset." -f mp4 -b:v ".$v_bitrate." -b:a ".$a_bitrate." -r 25 -ar 22050 ".TEMP_DIR."/".$t."121.mp4")); $msg[] = "<br>".nl2br(shell_output($Cbucket->configs['ffmpegpath'].' -i '.$victimFile." -vcodec libx264 -acodec ".config('audio_codec')." -s ".$width."x".$height." -preset ".$preset." -f mp4 -b:v ".$v_bitrate." -b:a ".$a_bitrate." -r 25 -ar 22050 ".TEMP_DIR."/".$t."121.mp4"));
$msg[] = "<div class=\"expOK\">Video file is convertable..</div>"; $msg[] = "<div class=\"expOK\">Video file is convertable..</div>";
} }
@ -116,7 +116,7 @@ if(isset($_POST['experiment']))
$msg[] = "<br>".nl2br($width); $msg[] = "<br>".nl2br($width);
$msg[] = "<br>".nl2br($v_bitrate); $msg[] = "<br>".nl2br($v_bitrate);
$msg[] = "<br>".nl2br($a_bitrate); $msg[] = "<br>".nl2br($a_bitrate);
$msg[] = "<br>".nl2br(shell_output($Cbucket->configs['ffmpegpath'].' -i '.$victimFile." -vcodec libx264 -acodec libfaac -s ".$width."x".$height." -preset ".$preset." -f mp4 -b:v ".$v_bitrate." -b:a ".$a_bitrate." -r 25 -ar 22050 ".TEMP_DIR."/".$t."121.mp4")); $msg[] = "<br>".nl2br(shell_output($Cbucket->configs['ffmpegpath'].' -i '.$victimFile." -vcodec libx264 -acodec ".config('audio_codec')." -s ".$width."x".$height." -preset ".$preset." -f mp4 -b:v ".$v_bitrate." -b:a ".$a_bitrate." -r 25 -ar 22050 ".TEMP_DIR."/".$t."121.mp4"));
$msg[] = "<div class=\"expOK\">Video file is convertable..</div>"; $msg[] = "<div class=\"expOK\">Video file is convertable..</div>";
} }
else else

1
upload/includes/classes/conversion/ffmpeg.class.php
View file

@ -1,5 +1,6 @@
<?php <?php
define('FFMPEG_BINARY', get_binaries('ffmpeg')); define('FFMPEG_BINARY', get_binaries('ffmpeg'));
define('MP4Box_BINARY', get_binaries('mp4box'));
define('MEDIAINFO_BINARY', get_binaries('media_info')); define('MEDIAINFO_BINARY', get_binaries('media_info'));
define('FFPROBE', get_binaries('ffprobe_path')); define('FFPROBE', get_binaries('ffprobe_path'));

2
upload/includes/functions.php
View file

@ -3657,7 +3657,7 @@
case 'ffmpeg': case 'ffmpeg':
{ {
//Gett FFMPEG SVN version //Gett FFMPEG SVN version
dump($result); //dump($result);
preg_match("/svn-r([0-9]+)/i",strtolower($result),$matches); preg_match("/svn-r([0-9]+)/i",strtolower($result),$matches);
//pr($matches); //pr($matches);
if(is_numeric(floatval($matches[1])) && $matches[1]) { if(is_numeric(floatval($matches[1])) && $matches[1]) {