mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-12 04:23:19 +00:00
resolve conflict
This commit is contained in:
@@ -33,9 +33,9 @@ class SubdefsController extends Controller
|
||||
$subviews_mapping = $this->getSubviewsMapping();
|
||||
|
||||
return $this->render('admin/subdefs.html.twig', [
|
||||
'databox' => $databox,
|
||||
'subdefs' => $databox->get_subdef_structure(),
|
||||
'config' => $config,
|
||||
'databox' => $databox,
|
||||
'subdefs' => $databox->get_subdef_structure(),
|
||||
'config' => $config,
|
||||
'subviews_mapping' => $subviews_mapping
|
||||
]);
|
||||
}
|
||||
@@ -53,7 +53,7 @@ class SubdefsController extends Controller
|
||||
|
||||
$databox = $this->findDataboxById((int) $sbas_id);
|
||||
|
||||
$add_subdef = ['class' => null, 'name' => null, 'group' => null, 'mediaType' => null, 'presets' => null];
|
||||
$add_subdef = ['class' => null, 'name' => null, 'group' => null, 'mediaType' => null, 'presets' => null];
|
||||
foreach ($add_subdef as $k => $v) {
|
||||
if (!isset($toadd_subdef[$k]) || trim($toadd_subdef[$k]) === '') {
|
||||
unset($add_subdef[$k]);
|
||||
@@ -68,7 +68,8 @@ class SubdefsController extends Controller
|
||||
$name = $delete_subef[1];
|
||||
$subdefs = $databox->get_subdef_structure();
|
||||
$subdefs->delete_subdef($group, $name);
|
||||
} elseif (count($add_subdef) === 5) {
|
||||
}
|
||||
elseif (count($add_subdef) === 5) {
|
||||
$subdefs = $databox->get_subdef_structure();
|
||||
|
||||
$group = $add_subdef['group'];
|
||||
@@ -87,7 +88,7 @@ class SubdefsController extends Controller
|
||||
$config = $this->getConfiguration();
|
||||
|
||||
//On applique directement les valeurs du preset à la sous def
|
||||
switch($mediatype) {
|
||||
switch ($mediatype) {
|
||||
case Subdef::TYPE_IMAGE :
|
||||
$options["path"] = "";
|
||||
$options["meta"] = true;
|
||||
@@ -98,7 +99,7 @@ class SubdefsController extends Controller
|
||||
$options[Image::OPTION_FLATTEN] = $config["image"]["definitions"][$preset][Image::OPTION_FLATTEN];
|
||||
$options[Image::OPTION_QUALITY] = $config["image"]["definitions"][$preset][Image::OPTION_QUALITY];
|
||||
$options[Image::OPTION_ICODEC] = $config["image"]["definitions"][$preset][Image::OPTION_ICODEC];
|
||||
foreach($config["image"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
|
||||
foreach ($config["image"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
|
||||
$options[Subdef::OPTION_DEVICE][] = $devices;
|
||||
}
|
||||
break;
|
||||
@@ -114,7 +115,7 @@ class SubdefsController extends Controller
|
||||
$options[Video::OPTION_FRAMERATE] = $config["video"]["definitions"][$preset][Video::OPTION_FRAMERATE];
|
||||
$options[Video::OPTION_VCODEC] = $config["video"]["definitions"][$preset][Video::OPTION_VCODEC];
|
||||
$options[Video::OPTION_ACODEC] = $config["video"]["definitions"][$preset][Video::OPTION_ACODEC];
|
||||
foreach($config["video"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
|
||||
foreach ($config["video"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
|
||||
$options[Subdef::OPTION_DEVICE][] = $devices;
|
||||
}
|
||||
break;
|
||||
@@ -122,7 +123,7 @@ class SubdefsController extends Controller
|
||||
$options["path"] = "";
|
||||
$options["meta"] = true;
|
||||
$options["mediatype"] = $mediatype;
|
||||
foreach($config["document"]["definitions"][$preset]["devices"] as $devices) {
|
||||
foreach ($config["document"]["definitions"][$preset]["devices"] as $devices) {
|
||||
$options["devices"][] = $devices;
|
||||
}
|
||||
break;
|
||||
@@ -132,7 +133,7 @@ class SubdefsController extends Controller
|
||||
$options["mediatype"] = $mediatype;
|
||||
$options[Gif::OPTION_SIZE] = $config["gif"]["definitions"][$preset][Gif::OPTION_SIZE];
|
||||
$options[Gif::OPTION_DELAY] = $config["gif"]["definitions"][$preset][Gif::OPTION_DELAY];
|
||||
foreach($config["gif"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
|
||||
foreach ($config["gif"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
|
||||
$options[Subdef::OPTION_DEVICE][] = $devices;
|
||||
}
|
||||
break;
|
||||
@@ -143,7 +144,7 @@ class SubdefsController extends Controller
|
||||
$options[Audio::OPTION_AUDIOBITRATE] = $config["audio"]["definitions"][$preset][Audio::OPTION_AUDIOBITRATE];
|
||||
$options[Audio::OPTION_AUDIOSAMPLERATE] = $config["audio"]["definitions"][$preset][Audio::OPTION_AUDIOSAMPLERATE];
|
||||
$options[Audio::OPTION_ACODEC] = $config["audio"]["definitions"][$preset][Audio::OPTION_ACODEC];
|
||||
foreach($config["audio"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
|
||||
foreach ($config["audio"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) {
|
||||
$options[Subdef::OPTION_DEVICE][] = $devices;
|
||||
}
|
||||
break;
|
||||
@@ -206,13 +207,13 @@ class SubdefsController extends Controller
|
||||
*/
|
||||
protected function getSubviewsMapping()
|
||||
{
|
||||
$mapping = array(
|
||||
Type::TYPE_IMAGE => array(Subdef::TYPE_IMAGE),
|
||||
Type::TYPE_VIDEO => array(Subdef::TYPE_IMAGE, Subdef::TYPE_VIDEO, Subdef::TYPE_ANIMATION),
|
||||
Type::TYPE_AUDIO => array(Subdef::TYPE_IMAGE, Subdef::TYPE_AUDIO),
|
||||
Type::TYPE_DOCUMENT => array(Subdef::TYPE_IMAGE, Subdef::TYPE_FLEXPAPER),
|
||||
Type::TYPE_FLASH => array(Subdef::TYPE_IMAGE)
|
||||
);
|
||||
$mapping = [
|
||||
Type::TYPE_IMAGE => [Subdef::TYPE_IMAGE],
|
||||
Type::TYPE_VIDEO => [Subdef::TYPE_IMAGE, Subdef::TYPE_VIDEO, Subdef::TYPE_ANIMATION],
|
||||
Type::TYPE_AUDIO => [Subdef::TYPE_IMAGE, Subdef::TYPE_AUDIO],
|
||||
Type::TYPE_DOCUMENT => [Subdef::TYPE_IMAGE, Subdef::TYPE_FLEXPAPER],
|
||||
Type::TYPE_FLASH => [Subdef::TYPE_IMAGE]
|
||||
];
|
||||
|
||||
return $mapping;
|
||||
}
|
||||
@@ -222,135 +223,135 @@ class SubdefsController extends Controller
|
||||
*/
|
||||
protected function getConfiguration()
|
||||
{
|
||||
$config = array(
|
||||
Subdef::TYPE_IMAGE => array(
|
||||
"definitions" => array(
|
||||
"JPG" => null,
|
||||
"160px JPG" => array(
|
||||
$config = [
|
||||
Subdef::TYPE_IMAGE => [
|
||||
"definitions" => [
|
||||
"JPG" => null,
|
||||
"160px JPG" => [
|
||||
Image::OPTION_SIZE => "160",
|
||||
Image::OPTION_RESOLUTION => "75",
|
||||
Image::OPTION_STRIP => "yes",
|
||||
Image::OPTION_FLATTEN => "yes",
|
||||
Image::OPTION_QUALITY => "75",
|
||||
Image::OPTION_ICODEC => "jpeg",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"320 px JPG (thumbnail Phraseanet)" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"320 px JPG (thumbnail Phraseanet)" => [
|
||||
Image::OPTION_SIZE => "320",
|
||||
Image::OPTION_RESOLUTION => "75",
|
||||
Image::OPTION_STRIP => "yes",
|
||||
Image::OPTION_FLATTEN => "yes",
|
||||
Image::OPTION_QUALITY => "75",
|
||||
Image::OPTION_ICODEC => "jpeg",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"640px JPG" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"640px JPG" => [
|
||||
Image::OPTION_SIZE => "640",
|
||||
Image::OPTION_RESOLUTION => "75",
|
||||
Image::OPTION_STRIP => "yes",
|
||||
Image::OPTION_FLATTEN => "yes",
|
||||
Image::OPTION_QUALITY => "75",
|
||||
Image::OPTION_ICODEC => "jpeg",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"1280px JPG (preview Phraseanet)" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"1280px JPG (preview Phraseanet)" => [
|
||||
Image::OPTION_SIZE => "1280",
|
||||
Image::OPTION_RESOLUTION => "75",
|
||||
Image::OPTION_STRIP => "yes",
|
||||
Image::OPTION_FLATTEN => "yes",
|
||||
Image::OPTION_QUALITY => "75",
|
||||
Image::OPTION_ICODEC => "jpeg",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"2560px JPG" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"2560px JPG" => [
|
||||
Image::OPTION_SIZE => "2560",
|
||||
Image::OPTION_RESOLUTION => "75",
|
||||
Image::OPTION_STRIP => "yes",
|
||||
Image::OPTION_FLATTEN => "yes",
|
||||
Image::OPTION_QUALITY => "75",
|
||||
Image::OPTION_ICODEC => "jpeg",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"PNG" => null,
|
||||
"160px PNG 8 bits" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"PNG" => null,
|
||||
"160px PNG 8 bits" => [
|
||||
Image::OPTION_SIZE => "160",
|
||||
Image::OPTION_RESOLUTION => "75",
|
||||
Image::OPTION_STRIP => "yes",
|
||||
Image::OPTION_FLATTEN => "yes",
|
||||
Image::OPTION_QUALITY => "75",
|
||||
Image::OPTION_ICODEC => "png",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"320px PNG 8 bits" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"320px PNG 8 bits" => [
|
||||
Image::OPTION_SIZE => "320",
|
||||
Image::OPTION_RESOLUTION => "75",
|
||||
Image::OPTION_STRIP => "yes",
|
||||
Image::OPTION_FLATTEN => "yes",
|
||||
Image::OPTION_QUALITY => "75",
|
||||
Image::OPTION_ICODEC => "png",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"640px PNG 8 bits" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"640px PNG 8 bits" => [
|
||||
Image::OPTION_SIZE => "640",
|
||||
Image::OPTION_RESOLUTION => "75",
|
||||
Image::OPTION_STRIP => "yes",
|
||||
Image::OPTION_FLATTEN => "yes",
|
||||
Image::OPTION_QUALITY => "75",
|
||||
Image::OPTION_ICODEC => "png",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"1280px PNG 8 bits" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"1280px PNG 8 bits" => [
|
||||
Image::OPTION_SIZE => "1280",
|
||||
Image::OPTION_RESOLUTION => "75",
|
||||
Image::OPTION_STRIP => "yes",
|
||||
Image::OPTION_FLATTEN => "yes",
|
||||
Image::OPTION_QUALITY => "75",
|
||||
Image::OPTION_ICODEC => "png",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"2560px PNG 8 bits" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"2560px PNG 8 bits" => [
|
||||
Image::OPTION_SIZE => "2560",
|
||||
Image::OPTION_RESOLUTION => "75",
|
||||
Image::OPTION_STRIP => "yes",
|
||||
Image::OPTION_FLATTEN => "yes",
|
||||
Image::OPTION_QUALITY => "75",
|
||||
Image::OPTION_ICODEC => "png",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"TIFF" => null,
|
||||
"1280 TIFF" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"TIFF" => null,
|
||||
"1280 TIFF" => [
|
||||
Image::OPTION_SIZE => "1280",
|
||||
Image::OPTION_RESOLUTION => "75",
|
||||
Image::OPTION_STRIP => "yes",
|
||||
Image::OPTION_FLATTEN => "yes",
|
||||
Image::OPTION_QUALITY => "75",
|
||||
Image::OPTION_ICODEC => "tiff",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"2560px TIFF" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"2560px TIFF" => [
|
||||
Image::OPTION_SIZE => "2560",
|
||||
Image::OPTION_RESOLUTION => "75",
|
||||
Image::OPTION_STRIP => "yes",
|
||||
Image::OPTION_FLATTEN => "yes",
|
||||
Image::OPTION_QUALITY => "75",
|
||||
Image::OPTION_ICODEC => "tiff",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
),
|
||||
"form" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
],
|
||||
"form" => [
|
||||
Image::OPTION_SIZE => "slide",
|
||||
Image::OPTION_RESOLUTION => "slide",
|
||||
Image::OPTION_STRIP => "radio",
|
||||
Image::OPTION_FLATTEN => "radio",
|
||||
Image::OPTION_QUALITY => "slide",
|
||||
Image::OPTION_ICODEC => "select",
|
||||
Subdef::OPTION_DEVICE => "checkbox",
|
||||
),
|
||||
),
|
||||
Subdef::TYPE_VIDEO => array(
|
||||
"definitions" => array(
|
||||
"video codec H264" => null,
|
||||
"144P H264 128 kbps ACC 128kbps" => array(
|
||||
Subdef::OPTION_DEVICE => "checkbox",
|
||||
],
|
||||
],
|
||||
Subdef::TYPE_VIDEO => [
|
||||
"definitions" => [
|
||||
"video codec H264" => null,
|
||||
"144P H264 128 kbps ACC 128kbps" => [
|
||||
Video::OPTION_AUDIOBITRATE => "128",
|
||||
Video::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Video::OPTION_BITRATE => "128",
|
||||
@@ -359,9 +360,9 @@ class SubdefsController extends Controller
|
||||
Video::OPTION_FRAMERATE => "25",
|
||||
Video::OPTION_VCODEC => "libx264",
|
||||
Video::OPTION_ACODEC => "libfaac",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"240P H264 256 kbps ACC 128kbps" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"240P H264 256 kbps ACC 128kbps" => [
|
||||
Video::OPTION_AUDIOBITRATE => "128",
|
||||
Video::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Video::OPTION_BITRATE => "256",
|
||||
@@ -370,9 +371,9 @@ class SubdefsController extends Controller
|
||||
Video::OPTION_FRAMERATE => "25",
|
||||
Video::OPTION_VCODEC => "libx264",
|
||||
Video::OPTION_ACODEC => "libfaac",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"360P H264 576 kbps ACC 128kbps" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"360P H264 576 kbps ACC 128kbps" => [
|
||||
Video::OPTION_AUDIOBITRATE => "128",
|
||||
Video::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Video::OPTION_BITRATE => "576",
|
||||
@@ -381,9 +382,9 @@ class SubdefsController extends Controller
|
||||
Video::OPTION_FRAMERATE => "25",
|
||||
Video::OPTION_VCODEC => "libtheora",
|
||||
Video::OPTION_ACODEC => "libfaac",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"480P H264 750 kbps ACC 128kbps" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"480P H264 750 kbps ACC 128kbps" => [
|
||||
Video::OPTION_AUDIOBITRATE => "128",
|
||||
Video::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Video::OPTION_BITRATE => "750",
|
||||
@@ -392,9 +393,9 @@ class SubdefsController extends Controller
|
||||
Video::OPTION_FRAMERATE => "25",
|
||||
Video::OPTION_VCODEC => "libx264",
|
||||
Video::OPTION_ACODEC => "libfaac",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"720P H264 1492 kbps ACC 128kbps" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"720P H264 1492 kbps ACC 128kbps" => [
|
||||
Video::OPTION_AUDIOBITRATE => "128",
|
||||
Video::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Video::OPTION_BITRATE => "1492",
|
||||
@@ -403,9 +404,9 @@ class SubdefsController extends Controller
|
||||
Video::OPTION_FRAMERATE => "25",
|
||||
Video::OPTION_VCODEC => "libx264",
|
||||
Video::OPTION_ACODEC => "libfaac",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"1080P H264 2420 kbps ACC 128kbps" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"1080P H264 2420 kbps ACC 128kbps" => [
|
||||
Video::OPTION_AUDIOBITRATE => "128",
|
||||
Video::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Video::OPTION_BITRATE => "2420",
|
||||
@@ -414,10 +415,10 @@ class SubdefsController extends Controller
|
||||
Video::OPTION_FRAMERATE => "25",
|
||||
Video::OPTION_VCODEC => "libx264",
|
||||
Video::OPTION_ACODEC => "libfaac",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"video codec libvpx" => null,
|
||||
"144P webm 128 kbps ACC 128kbps" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"video codec libvpx" => null,
|
||||
"144P webm 128 kbps ACC 128kbps" => [
|
||||
Video::OPTION_AUDIOBITRATE => "128",
|
||||
Video::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Video::OPTION_BITRATE => "128",
|
||||
@@ -426,9 +427,9 @@ class SubdefsController extends Controller
|
||||
Video::OPTION_FRAMERATE => "25",
|
||||
Video::OPTION_VCODEC => "libvpx",
|
||||
Video::OPTION_ACODEC => "libfaac",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"240P webm 256 kbps ACC 128kbps" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"240P webm 256 kbps ACC 128kbps" => [
|
||||
Video::OPTION_AUDIOBITRATE => "128",
|
||||
Video::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Video::OPTION_BITRATE => "256",
|
||||
@@ -437,9 +438,9 @@ class SubdefsController extends Controller
|
||||
Video::OPTION_FRAMERATE => "25",
|
||||
Video::OPTION_VCODEC => "libvpx",
|
||||
Video::OPTION_ACODEC => "libfaac",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"360P webm 576 kbps ACC 128kbps" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"360P webm 576 kbps ACC 128kbps" => [
|
||||
Video::OPTION_AUDIOBITRATE => "128",
|
||||
Video::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Video::OPTION_BITRATE => "576",
|
||||
@@ -448,9 +449,9 @@ class SubdefsController extends Controller
|
||||
Video::OPTION_FRAMERATE => "25",
|
||||
Video::OPTION_VCODEC => "libvpx",
|
||||
Video::OPTION_ACODEC => "libfaac",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"480P webm 750 kbps ACC 128kbps" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"480P webm 750 kbps ACC 128kbps" => [
|
||||
Video::OPTION_AUDIOBITRATE => "128",
|
||||
Video::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Video::OPTION_BITRATE => "750",
|
||||
@@ -459,9 +460,9 @@ class SubdefsController extends Controller
|
||||
Video::OPTION_FRAMERATE => "25",
|
||||
Video::OPTION_VCODEC => "libvpx",
|
||||
Video::OPTION_ACODEC => "libfaac",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"720P webm 1492 kbps ACC 128kbps" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"720P webm 1492 kbps ACC 128kbps" => [
|
||||
Video::OPTION_AUDIOBITRATE => "128",
|
||||
Video::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Video::OPTION_BITRATE => "1492",
|
||||
@@ -470,9 +471,9 @@ class SubdefsController extends Controller
|
||||
Video::OPTION_FRAMERATE => "25",
|
||||
Video::OPTION_VCODEC => "libvpx",
|
||||
Video::OPTION_ACODEC => "libfaac",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"1080P webm 2420 kbps ACC 128kbps" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"1080P webm 2420 kbps ACC 128kbps" => [
|
||||
Video::OPTION_AUDIOBITRATE => "128",
|
||||
Video::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Video::OPTION_BITRATE => "2420",
|
||||
@@ -481,10 +482,10 @@ class SubdefsController extends Controller
|
||||
Video::OPTION_FRAMERATE => "25",
|
||||
Video::OPTION_VCODEC => "libvpx",
|
||||
Video::OPTION_ACODEC => "libfaac",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
),
|
||||
"form" => array(
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
],
|
||||
"form" => [
|
||||
Video::OPTION_AUDIOBITRATE => "slide",
|
||||
Video::OPTION_AUDIOSAMPLERATE => "select",
|
||||
Video::OPTION_BITRATE => "slide",
|
||||
@@ -493,67 +494,67 @@ class SubdefsController extends Controller
|
||||
Video::OPTION_FRAMERATE => "slide",
|
||||
Video::OPTION_VCODEC => "select",
|
||||
Video::OPTION_ACODEC => "select",
|
||||
Subdef::OPTION_DEVICE => "checkbox",
|
||||
),
|
||||
),
|
||||
Subdef::TYPE_ANIMATION => array(
|
||||
"definitions" => array(
|
||||
"256 px fast 200 ms" => array(
|
||||
Gif::OPTION_SIZE => "256",
|
||||
Gif::OPTION_DELAY => "200",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"256 px very fast 120 ms" => array(
|
||||
Gif::OPTION_SIZE => "256",
|
||||
Gif::OPTION_DELAY => "120",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"320 px fast 200 ms" => array(
|
||||
Gif::OPTION_SIZE => "320",
|
||||
Gif::OPTION_DELAY => "200",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
),
|
||||
"form" => array(
|
||||
Gif::OPTION_SIZE => "slide",
|
||||
Gif::OPTION_DELAY => "slide",
|
||||
Subdef::OPTION_DEVICE => "checkbox",
|
||||
),
|
||||
),
|
||||
Subdef::TYPE_AUDIO => array(
|
||||
"definitions" => array(
|
||||
"Low AAC 96 kbit/s" => array(
|
||||
Audio::OPTION_AUDIOBITRATE => "100",
|
||||
Audio::OPTION_AUDIOSAMPLERATE => "8000",
|
||||
Audio::OPTION_ACODEC => "libmp3lame",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"Normal AAC 128 kbit/s" => array(
|
||||
Audio::OPTION_AUDIOBITRATE => "180",
|
||||
Audio::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Audio::OPTION_ACODEC => "libmp3lame",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
"High AAC 320 kbit/s" => array(
|
||||
Audio::OPTION_AUDIOBITRATE => "230",
|
||||
Audio::OPTION_AUDIOSAMPLERATE => "50000",
|
||||
Audio::OPTION_ACODEC => "libmp3lame",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
),
|
||||
),
|
||||
"form" => array(
|
||||
Audio::OPTION_AUDIOBITRATE => "slide",
|
||||
Audio::OPTION_AUDIOSAMPLERATE => "select",
|
||||
Audio::OPTION_ACODEC => "select",
|
||||
Subdef::OPTION_DEVICE => "checkbox",
|
||||
),
|
||||
),
|
||||
Subdef::TYPE_FLEXPAPER => array(
|
||||
"definitions" => array(
|
||||
),
|
||||
"form" => array(),
|
||||
),
|
||||
);
|
||||
Subdef::OPTION_DEVICE => "checkbox",
|
||||
],
|
||||
],
|
||||
Subdef::TYPE_ANIMATION => [
|
||||
"definitions" => [
|
||||
"256 px fast 200 ms" => [
|
||||
Gif::OPTION_SIZE => "256",
|
||||
Gif::OPTION_DELAY => "200",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"256 px very fast 120 ms" => [
|
||||
Gif::OPTION_SIZE => "256",
|
||||
Gif::OPTION_DELAY => "120",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"320 px fast 200 ms" => [
|
||||
Gif::OPTION_SIZE => "320",
|
||||
Gif::OPTION_DELAY => "200",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
],
|
||||
"form" => [
|
||||
Gif::OPTION_SIZE => "slide",
|
||||
Gif::OPTION_DELAY => "slide",
|
||||
Subdef::OPTION_DEVICE => "checkbox",
|
||||
],
|
||||
],
|
||||
Subdef::TYPE_AUDIO => [
|
||||
"definitions" => [
|
||||
"Low AAC 96 kbit/s" => [
|
||||
Audio::OPTION_AUDIOBITRATE => "100",
|
||||
Audio::OPTION_AUDIOSAMPLERATE => "8000",
|
||||
Audio::OPTION_ACODEC => "libmp3lame",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"Normal AAC 128 kbit/s" => [
|
||||
Audio::OPTION_AUDIOBITRATE => "180",
|
||||
Audio::OPTION_AUDIOSAMPLERATE => "44100",
|
||||
Audio::OPTION_ACODEC => "libmp3lame",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
"High AAC 320 kbit/s" => [
|
||||
Audio::OPTION_AUDIOBITRATE => "230",
|
||||
Audio::OPTION_AUDIOSAMPLERATE => "50000",
|
||||
Audio::OPTION_ACODEC => "libmp3lame",
|
||||
Subdef::OPTION_DEVICE => ["all"]
|
||||
],
|
||||
],
|
||||
"form" => [
|
||||
Audio::OPTION_AUDIOBITRATE => "slide",
|
||||
Audio::OPTION_AUDIOSAMPLERATE => "select",
|
||||
Audio::OPTION_ACODEC => "select",
|
||||
Subdef::OPTION_DEVICE => "checkbox",
|
||||
],
|
||||
],
|
||||
Subdef::TYPE_FLEXPAPER => [
|
||||
"definitions" => [
|
||||
],
|
||||
"form" => [],
|
||||
],
|
||||
];
|
||||
|
||||
return $config;
|
||||
}
|
||||
|
Reference in New Issue
Block a user