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

Merge branch '3.7'

Browse Source
This commit is contained in:
Romain Neutron
2012-12-17 15:30:05 +01:00
parent 5ba4b78062 8aa964d635
commit 0eaa5db98e
25 changed files with 269 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/classes/databox/subdef.class.php
View File

@@ -304,7 +304,19 @@ class databox_subdef
*/
protected function buildAudioSubdef(SimpleXMLElement $sd)
{
return new Audio();
$audio = new Audio();
if ($sd->acodec) {
$audio->setOptionValue(Audio::OPTION_ACODEC, (string) $sd->acodec);
}
if ($sd->bitrate) {
$audio->setOptionValue(Audio::OPTION_BITRATE, (int) $sd->bitrate);
}
if ($sd->audiosamplerate) {
$audio->setOptionValue(Audio::OPTION_AUDIOSAMPLERATE, (int) $sd->audiosamplerate);
}
return $audio;
}
/**
@@ -363,6 +375,12 @@ class databox_subdef
if ($sd->bitrate) {
$video->setOptionValue(Video::OPTION_BITRATE, (int) $sd->bitrate);
}
if ($sd->audiosamplerate) {
$video->setOptionValue(Video::OPTION_AUDIOSAMPLERATE, (int) $sd->audiosamplerate);
}
if ($sd->GOPsize) {
$video->setOptionValue(Video::OPTION_GOPSIZE, (int) $sd->GOPsize);
}
return $video;
}