ChrisChrome/sccp_manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

- Add Video codecs supported in Global config

Browse source
This commit is contained in:
PhantomVl 2019-07-10 20:53:00 +03:00 committed by Diederik de Groot
parent 2e88b605bc
commit 743d61d7eb
No known key found for this signature in database
GPG key ID: AFA728250A1BECD6
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Sccp_manager.class.php
View file

@ -1291,6 +1291,7 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
} }
switch ($key) { switch ($key) {
case 'voicecodecs': case 'voicecodecs':
case 'vcodec':
foreach ($value as $keycodeс => $valcodeс) { foreach ($value as $keycodeс => $valcodeс) {
$save_codec[$i] = $keycodeс; $save_codec[$i] = $keycodeс;
$i++; $i++;
@ -1473,32 +1474,36 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
} }
public function getCodecs($type, $showDefaults = false) { public function getCodecs($type, $showDefaults = false) {
$codecs_res = array();
switch ($type) { switch ($type) {
case 'audio': case 'audio':
$codecs = $this->getMyConfig('voicecodecs'); $lcodecs = $this->getMyConfig('voicecodecs');
$allCodecs = $this->FreePBX->Codecs->getAudio();
break; break;
case 'video': case 'video':
$codecs = $this->getConfig('videocodecs'); $lcodecs = $this->getMyConfig('voicecodecs');
$allCodecs = array('h264'=>'1','h263'=>'','h265'=>'','h261'=>'');
// $allCodecs = $this->FreePBX->Codecs->getVideo();
break; break;
case 'text': case 'text':
$codecs = $this->getConfig('textcodecs'); $lcodecs = $this->getConfig('textcodecs');
break; break;
case 'image': case 'image':
$codecs = $this->getConfig('imagecodecs'); $lcodecs = $this->getConfig('imagecodecs');
break; break;
default: default:
throw new Exception(_('Unknown Type')); throw new Exception(_('Unknown Type'));
break; break;
} }
if (empty($codecs) || !is_array($codecs)) { if (empty($lcodecs) || !is_array($lcodecs)) {
switch ($type) { switch ($type) {
case 'audio': case 'audio':
$codecs = $this->FreePBX->Codecs->getAudio(true); $codecs = $this->FreePBX->Codecs->getAudio(true);
break; break;
case 'video': case 'video':
$codecs = $this->FreePBX->Codecs->getVideo(true); // $codecs = $this->FreePBX->Codecs->getVideo(true);
$codecs = array('h264'=>'1','h263'=>'','h265'=>'','h261'=>'');
break; break;
case 'text': case 'text':
$codecs = $this->FreePBX->Codecs->getText(true); $codecs = $this->FreePBX->Codecs->getText(true);
@ -1507,6 +1512,12 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
$codecs = $this->FreePBX->Codecs->getImage(true); $codecs = $this->FreePBX->Codecs->getImage(true);
break; break;
} }
} else {
foreach ($lcodecs as $c => $v) {
if (isset($allCodecs[$c])) {
$codecs[$c] = true;
}
}
} }
if ($showDefaults) { if ($showDefaults) {
@ -1515,7 +1526,8 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
$allCodecs = $this->FreePBX->Codecs->getAudio(); $allCodecs = $this->FreePBX->Codecs->getAudio();
break; break;
case 'video': case 'video':
$allCodecs = $this->FreePBX->Codecs->getVideo(); // $allCodecs = $this->FreePBX->Codecs->getVideo();
$allCodecs = array('h264'=>'1','h263'=>'','h265'=>'','h261'=>'');
break; break;
case 'text': case 'text':
$allCodecs = $this->FreePBX->Codecs->getText(); $allCodecs = $this->FreePBX->Codecs->getText();