diff --git a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php b/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php index 6b938cb569..a0adaba9ac 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php @@ -145,6 +145,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]; + $options[Audio::OPTION_AUDIOCHANNEL] = $config["audio"]["definitions"][$preset][Audio::OPTION_AUDIOCHANNEL]; foreach ($config["audio"]["definitions"][$preset][Subdef::OPTION_DEVICE] as $devices) { $options[Subdef::OPTION_DEVICE][] = $devices; } @@ -211,7 +212,7 @@ class SubdefsController extends Controller { $mapping = [ Type::TYPE_IMAGE => [Subdef::TYPE_IMAGE, Subdef::TYPE_PDF], - Type::TYPE_VIDEO => [Subdef::TYPE_IMAGE, Subdef::TYPE_VIDEO, Subdef::TYPE_ANIMATION], + Type::TYPE_VIDEO => [Subdef::TYPE_IMAGE, Subdef::TYPE_VIDEO, Subdef::TYPE_ANIMATION, Subdef::TYPE_AUDIO], Type::TYPE_AUDIO => [Subdef::TYPE_IMAGE, Subdef::TYPE_AUDIO], Type::TYPE_DOCUMENT => [Subdef::TYPE_IMAGE, Subdef::TYPE_FLEXPAPER, Subdef::TYPE_PDF], Type::TYPE_FLASH => [Subdef::TYPE_IMAGE] @@ -543,11 +544,19 @@ class SubdefsController extends Controller Audio::OPTION_ACODEC => "libmp3lame", Subdef::OPTION_DEVICE => ["all"] ], + "Wave Mono 256 kbit/s" => [ + Audio::OPTION_AUDIOBITRATE => "256", + Audio::OPTION_AUDIOSAMPLERATE => "16000", + Audio::OPTION_ACODEC => "pcm_s16le", + Audio::OPTION_AUDIOCHANNEL => "mono", + Subdef::OPTION_DEVICE => ["all"] + ], ], "form" => [ Audio::OPTION_AUDIOBITRATE => "slide", Audio::OPTION_AUDIOSAMPLERATE => "select", Audio::OPTION_ACODEC => "select", + Audio::OPTION_AUDIOCHANNEL => "select", Subdef::OPTION_DEVICE => "checkbox", ], ], diff --git a/lib/Alchemy/Phrasea/Filesystem/FilesystemService.php b/lib/Alchemy/Phrasea/Filesystem/FilesystemService.php index fe2ac305c9..8da30984f0 100644 --- a/lib/Alchemy/Phrasea/Filesystem/FilesystemService.php +++ b/lib/Alchemy/Phrasea/Filesystem/FilesystemService.php @@ -201,6 +201,8 @@ class FilesystemService return 'ogg'; case 'libmp3lame': return 'mp3'; + case 'pcm_s16le': + return 'wav'; } return null; diff --git a/lib/Alchemy/Phrasea/Media/Subdef/Audio.php b/lib/Alchemy/Phrasea/Media/Subdef/Audio.php index ac50940dc1..2551669dd1 100644 --- a/lib/Alchemy/Phrasea/Media/Subdef/Audio.php +++ b/lib/Alchemy/Phrasea/Media/Subdef/Audio.php @@ -19,6 +19,7 @@ class Audio extends Provider const OPTION_THREADS = 'threads'; const OPTION_ACODEC = 'acodec'; const OPTION_AUDIOSAMPLERATE = 'audiosamplerate'; + const OPTION_AUDIOCHANNEL = 'audiochannel'; public function __construct(TranslatorInterface $translator) { @@ -29,9 +30,12 @@ class Audio extends Provider 47250, 48000, 50000, 50400, 88200, 96000 ]; + $audioChannel = ['mono', 'stereo']; + $this->registerOption(new OptionType\Range($this->translator->trans('Audio Birate'), self::OPTION_AUDIOBITRATE, 32, 320, 128, 32)); $this->registerOption(new OptionType\Enum($this->translator->trans('AudioSamplerate'), self::OPTION_AUDIOSAMPLERATE, $AVaudiosamplerate)); - $this->registerOption(new OptionType\Enum($this->translator->trans('Audio Codec'), self::OPTION_ACODEC, ['libmp3lame', 'flac'], 'libmp3lame')); + $this->registerOption(new OptionType\Enum($this->translator->trans('Audio Codec'), self::OPTION_ACODEC, ['libmp3lame', 'flac', 'pcm_s16le'], 'libmp3lame')); + $this->registerOption(new OptionType\Enum($this->translator->trans('Audio channel'), self::OPTION_AUDIOCHANNEL, $audioChannel)); } public function getType() @@ -53,7 +57,21 @@ class Audio extends Provider $this->spec->setAudioCodec($this->getOption(self::OPTION_ACODEC)->getValue()); $this->spec->setAudioSampleRate($this->getOption(self::OPTION_AUDIOSAMPLERATE)->getValue()); $this->spec->setAudioKiloBitrate($this->getOption(self::OPTION_AUDIOBITRATE)->getValue()); + $this->spec->setAudioChannels($this->getChannelNumber($this->getOption(self::OPTION_AUDIOCHANNEL)->getValue())); return $this->spec; } + + private function getChannelNumber($audioChannel) + { + switch($audioChannel) + { + case 'mono': + return 1; + case 'stereo': + return 2; + default: + return null; + } + } } diff --git a/lib/classes/databox/subdef.php b/lib/classes/databox/subdef.php index 0dcab4ccc1..f1a269d731 100644 --- a/lib/classes/databox/subdef.php +++ b/lib/classes/databox/subdef.php @@ -44,7 +44,7 @@ class databox_subdef SubdefType::TYPE_DOCUMENT => [SubdefSpecs::TYPE_IMAGE, SubdefSpecs::TYPE_FLEXPAPER, SubdefSpecs::TYPE_PDF], SubdefType::TYPE_FLASH => [SubdefSpecs::TYPE_IMAGE], SubdefType::TYPE_IMAGE => [SubdefSpecs::TYPE_IMAGE, SubdefSpecs::TYPE_PDF], - SubdefType::TYPE_VIDEO => [SubdefSpecs::TYPE_IMAGE, SubdefSpecs::TYPE_VIDEO, SubdefSpecs::TYPE_ANIMATION], + SubdefType::TYPE_VIDEO => [SubdefSpecs::TYPE_IMAGE, SubdefSpecs::TYPE_VIDEO, SubdefSpecs::TYPE_ANIMATION, SubdefSpecs::TYPE_AUDIO], SubdefType::TYPE_UNKNOWN => [SubdefSpecs::TYPE_IMAGE], ]; const CLASS_THUMBNAIL = 'thumbnail'; @@ -156,6 +156,10 @@ class databox_subdef if ($sd->audiosamplerate) { $audio->setOptionValue(Audio::OPTION_AUDIOSAMPLERATE, (int) $sd->audiosamplerate); } + if ($sd->audiochannel) { + $audio->setOptionValue(Audio::OPTION_AUDIOCHANNEL, (string) $sd->audiochannel); + } + return $audio; } /**