From 5342f07a820c0bca392f83cc83ab4451a2d259c0 Mon Sep 17 00:00:00 2001 From: Nicolas Maillat Date: Fri, 29 Nov 2019 16:38:47 +0100 Subject: [PATCH] Revert "PHRAS-1324 : libfaac abandoned 4.1" --- .../Controller/Admin/SubdefsController.php | 24 +++++++++---------- lib/Alchemy/Phrasea/Media/Subdef/Video.php | 2 +- tests/classes/databox/subdefTest.php | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php b/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php index 5c2a61f2e5..e30aa03946 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php @@ -362,7 +362,7 @@ class SubdefsController extends Controller Video::OPTION_SIZE => "256", Video::OPTION_FRAMERATE => "25", Video::OPTION_VCODEC => "libx264", - Video::OPTION_ACODEC => "libmp3lame", + Video::OPTION_ACODEC => "libfaac", Subdef::OPTION_DEVICE => ["all"] ], "240P H264 256 kbps ACC 128kbps" => [ @@ -373,7 +373,7 @@ class SubdefsController extends Controller Video::OPTION_SIZE => "426", Video::OPTION_FRAMERATE => "25", Video::OPTION_VCODEC => "libx264", - Video::OPTION_ACODEC => "libmp3lame", + Video::OPTION_ACODEC => "libfaac", Subdef::OPTION_DEVICE => ["all"] ], "360P H264 576 kbps ACC 128kbps" => [ @@ -384,7 +384,7 @@ class SubdefsController extends Controller Video::OPTION_SIZE => "480", Video::OPTION_FRAMERATE => "25", Video::OPTION_VCODEC => "libtheora", - Video::OPTION_ACODEC => "libmp3lame", + Video::OPTION_ACODEC => "libfaac", Subdef::OPTION_DEVICE => ["all"] ], "480P H264 750 kbps ACC 128kbps" => [ @@ -395,7 +395,7 @@ class SubdefsController extends Controller Video::OPTION_SIZE => "854", Video::OPTION_FRAMERATE => "25", Video::OPTION_VCODEC => "libx264", - Video::OPTION_ACODEC => "libmp3lame", + Video::OPTION_ACODEC => "libfaac", Subdef::OPTION_DEVICE => ["all"] ], "720P H264 1492 kbps ACC 128kbps" => [ @@ -406,7 +406,7 @@ class SubdefsController extends Controller Video::OPTION_SIZE => "1280", Video::OPTION_FRAMERATE => "25", Video::OPTION_VCODEC => "libx264", - Video::OPTION_ACODEC => "libmp3lame", + Video::OPTION_ACODEC => "libfaac", Subdef::OPTION_DEVICE => ["all"] ], "1080P H264 2420 kbps ACC 128kbps" => [ @@ -417,7 +417,7 @@ class SubdefsController extends Controller Video::OPTION_SIZE => "1920", Video::OPTION_FRAMERATE => "25", Video::OPTION_VCODEC => "libx264", - Video::OPTION_ACODEC => "libmp3lame", + Video::OPTION_ACODEC => "libfaac", Subdef::OPTION_DEVICE => ["all"] ], "video codec libvpx" => null, @@ -429,7 +429,7 @@ class SubdefsController extends Controller Video::OPTION_SIZE => "256", Video::OPTION_FRAMERATE => "25", Video::OPTION_VCODEC => "libvpx", - Video::OPTION_ACODEC => "libmp3lame", + Video::OPTION_ACODEC => "libfaac", Subdef::OPTION_DEVICE => ["all"] ], "240P webm 256 kbps ACC 128kbps" => [ @@ -440,7 +440,7 @@ class SubdefsController extends Controller Video::OPTION_SIZE => "426", Video::OPTION_FRAMERATE => "25", Video::OPTION_VCODEC => "libvpx", - Video::OPTION_ACODEC => "libmp3lame", + Video::OPTION_ACODEC => "libfaac", Subdef::OPTION_DEVICE => ["all"] ], "360P webm 576 kbps ACC 128kbps" => [ @@ -451,7 +451,7 @@ class SubdefsController extends Controller Video::OPTION_SIZE => "480", Video::OPTION_FRAMERATE => "25", Video::OPTION_VCODEC => "libvpx", - Video::OPTION_ACODEC => "libmp3lame", + Video::OPTION_ACODEC => "libfaac", Subdef::OPTION_DEVICE => ["all"] ], "480P webm 750 kbps ACC 128kbps" => [ @@ -462,7 +462,7 @@ class SubdefsController extends Controller Video::OPTION_SIZE => "854", Video::OPTION_FRAMERATE => "25", Video::OPTION_VCODEC => "libvpx", - Video::OPTION_ACODEC => "libmp3lame", + Video::OPTION_ACODEC => "libfaac", Subdef::OPTION_DEVICE => ["all"] ], "720P webm 1492 kbps ACC 128kbps" => [ @@ -473,7 +473,7 @@ class SubdefsController extends Controller Video::OPTION_SIZE => "1280", Video::OPTION_FRAMERATE => "25", Video::OPTION_VCODEC => "libvpx", - Video::OPTION_ACODEC => "libmp3lame", + Video::OPTION_ACODEC => "libfaac", Subdef::OPTION_DEVICE => ["all"] ], "1080P webm 2420 kbps ACC 128kbps" => [ @@ -484,7 +484,7 @@ class SubdefsController extends Controller Video::OPTION_SIZE => "1920", Video::OPTION_FRAMERATE => "25", Video::OPTION_VCODEC => "libvpx", - Video::OPTION_ACODEC => "libmp3lame", + Video::OPTION_ACODEC => "libfaac", Subdef::OPTION_DEVICE => ["all"] ], ], diff --git a/lib/Alchemy/Phrasea/Media/Subdef/Video.php b/lib/Alchemy/Phrasea/Media/Subdef/Video.php index 24a5812f90..ef0a113564 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/Video.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/Video.php @@ -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\Enum($this->translator->trans('Video Codec'), self::OPTION_VCODEC, ['libx264', 'libvpx', 'libtheora'], 'libx264')); $this->unregisterOption(self::OPTION_ACODEC); - $this->registerOption(new OptionType\Enum($this->translator->trans('Audio Codec'), self::OPTION_ACODEC, ['libfdk_aac', 'libvo_aacenc', 'libmp3lame', 'libvorbis'], 'libfdk_aac')); + $this->registerOption(new OptionType\Enum($this->translator->trans('Audio Codec'), self::OPTION_ACODEC, ['libfaac', 'libvo_aacenc', 'libmp3lame', 'libvorbis'], 'libfaac')); } public function getType() diff --git a/tests/classes/databox/subdefTest.php b/tests/classes/databox/subdefTest.php index 75fbc962b9..f403712621 100644 --- a/tests/classes/databox/subdefTest.php +++ b/tests/classes/databox/subdefTest.php @@ -83,7 +83,7 @@ class databox_subdefTest extends \PHPUnit_Framework_TestCase 10 1 192 - libmp3lame + libfaac libx264 ';