hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 12:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

add libfdk_aac and change presets name

Browse Source
This commit is contained in:
aynsix
2019-12-02 16:34:49 +04:00
parent 8227b86c3e
commit cac34cc3a4
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php
View File

@@ -354,7 +354,7 @@ class SubdefsController extends Controller
Subdef::TYPE_VIDEO => [ Subdef::TYPE_VIDEO => [
"definitions" => [ "definitions" => [
"video codec H264" => null, "video codec H264" => null,
"144P H264 128 kbps ACC 128kbps" => [ "144P H264 128 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "128", Video::OPTION_BITRATE => "128",
@@ -362,10 +362,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "256", Video::OPTION_SIZE => "256",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264", Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"240P H264 256 kbps ACC 128kbps" => [ "240P H264 256 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "256", Video::OPTION_BITRATE => "256",
@@ -373,10 +373,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "426", Video::OPTION_SIZE => "426",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264", Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"360P H264 576 kbps ACC 128kbps" => [ "360P H264 576 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "576", Video::OPTION_BITRATE => "576",
@@ -384,10 +384,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "480", Video::OPTION_SIZE => "480",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libtheora", Video::OPTION_VCODEC => "libtheora",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"480P H264 750 kbps ACC 128kbps" => [ "480P H264 750 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "750", Video::OPTION_BITRATE => "750",
@@ -395,10 +395,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "854", Video::OPTION_SIZE => "854",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264", Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"720P H264 1492 kbps ACC 128kbps" => [ "720P H264 1492 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "1492", Video::OPTION_BITRATE => "1492",
@@ -406,10 +406,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "1280", Video::OPTION_SIZE => "1280",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264", Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"1080P H264 2420 kbps ACC 128kbps" => [ "1080P H264 2420 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "2420", Video::OPTION_BITRATE => "2420",
@@ -417,11 +417,11 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "1920", Video::OPTION_SIZE => "1920",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libx264", Video::OPTION_VCODEC => "libx264",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"video codec libvpx" => null, "video codec libvpx" => null,
"144P webm 128 kbps ACC 128kbps" => [ "144P webm 128 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "128", Video::OPTION_BITRATE => "128",
@@ -429,10 +429,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "256", Video::OPTION_SIZE => "256",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx", Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"240P webm 256 kbps ACC 128kbps" => [ "240P webm 256 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "256", Video::OPTION_BITRATE => "256",
@@ -440,10 +440,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "426", Video::OPTION_SIZE => "426",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx", Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"360P webm 576 kbps ACC 128kbps" => [ "360P webm 576 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "576", Video::OPTION_BITRATE => "576",
@@ -451,10 +451,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "480", Video::OPTION_SIZE => "480",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx", Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"480P webm 750 kbps ACC 128kbps" => [ "480P webm 750 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "750", Video::OPTION_BITRATE => "750",
@@ -462,10 +462,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "854", Video::OPTION_SIZE => "854",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx", Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"720P webm 1492 kbps ACC 128kbps" => [ "720P webm 1492 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "1492", Video::OPTION_BITRATE => "1492",
@@ -473,10 +473,10 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "1280", Video::OPTION_SIZE => "1280",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx", Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
"1080P webm 2420 kbps ACC 128kbps" => [ "1080P webm 2420 kbps MP3 128kbps" => [
Video::OPTION_AUDIOBITRATE => "128", Video::OPTION_AUDIOBITRATE => "128",
Video::OPTION_AUDIOSAMPLERATE => "44100", Video::OPTION_AUDIOSAMPLERATE => "44100",
Video::OPTION_BITRATE => "2420", Video::OPTION_BITRATE => "2420",
@@ -484,7 +484,7 @@ class SubdefsController extends Controller
Video::OPTION_SIZE => "1920", Video::OPTION_SIZE => "1920",
Video::OPTION_FRAMERATE => "25", Video::OPTION_FRAMERATE => "25",
Video::OPTION_VCODEC => "libvpx", Video::OPTION_VCODEC => "libvpx",
Video::OPTION_ACODEC => "libfaac", Video::OPTION_ACODEC => "libmp3lame",
Subdef::OPTION_DEVICE => ["all"] Subdef::OPTION_DEVICE => ["all"]
], ],
], ],

2
lib/Alchemy/Phrasea/Media/Subdef/Video.php
View File

@@ -33,7 +33,7 @@ class Video extends Audio
$this->registerOption(new OptionType\Range($this->translator->trans('Frame Rate'), self::OPTION_FRAMERATE, 1, 200, 20)); $this->registerOption(new OptionType\Range($this->translator->trans('Frame Rate'), self::OPTION_FRAMERATE, 1, 200, 20));
$this->registerOption(new OptionType\Enum($this->translator->trans('Video Codec'), self::OPTION_VCODEC, ['libx264', 'libvpx', 'libtheora'], 'libx264')); $this->registerOption(new OptionType\Enum($this->translator->trans('Video Codec'), self::OPTION_VCODEC, ['libx264', 'libvpx', 'libtheora'], 'libx264'));
$this->unregisterOption(self::OPTION_ACODEC); $this->unregisterOption(self::OPTION_ACODEC);
$this->registerOption(new OptionType\Enum($this->translator->trans('Audio Codec'), self::OPTION_ACODEC, ['libfaac', 'libvo_aacenc', 'libmp3lame', 'libvorbis'], 'libfaac')); $this->registerOption(new OptionType\Enum($this->translator->trans('Audio Codec'), self::OPTION_ACODEC, ['libfaac', 'libvo_aacenc', 'libmp3lame', 'libvorbis', 'libfdk_aac'], 'libfdk_aac'));
} }
public function getType() public function getType()