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-11 10:59:53 +03:00 committed by Diederik de Groot
parent 743d61d7eb
commit 3f7c56a553
No known key found for this signature in database
GPG key ID: AFA728250A1BECD6
1 changed files with 19 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
Sccp_manager.class.php
View file

@ -1474,7 +1474,9 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
} }
public function getCodecs($type, $showDefaults = false) { public function getCodecs($type, $showDefaults = false) {
$codecs_res = array(); $allSupported = array();
// $Sccp_Codec = array('gsm','slin16','alow','ulaw','g722','g723','g726','g728','g729','ilibc','isac','opus','h224','aac','h264','h263','h265','h261');
$Sccp_Codec = array('gsm','slin16','alaw','ulaw','g722','g723','g726','g728','g729','ilibc','opus','h264','h263','h265','h261');
switch ($type) { switch ($type) {
case 'audio': case 'audio':
$lcodecs = $this->getMyConfig('voicecodecs'); $lcodecs = $this->getMyConfig('voicecodecs');
@ -1482,63 +1484,42 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
break; break;
case 'video': case 'video':
$lcodecs = $this->getMyConfig('voicecodecs'); $lcodecs = $this->getMyConfig('voicecodecs');
$allCodecs = array('h264'=>'1','h263'=>'','h265'=>'','h261'=>''); $allCodecs = $this->FreePBX->Codecs->getVideo();
// $allCodecs = $this->FreePBX->Codecs->getVideo();
break; break;
case 'text': case 'text':
$lcodecs = $this->getConfig('textcodecs'); $lcodecs = $this->getConfig('textcodecs');
$allCodecs = $this->FreePBX->Codecs->getText(true);
break; break;
case 'image': case 'image':
$lcodecs = $this->getConfig('imagecodecs'); $lcodecs = $this->getConfig('imagecodecs');
$allCodecs = $this->FreePBX->Codecs->getImage(true);
break; break;
default: default:
throw new Exception(_('Unknown Type')); throw new Exception(_('Unknown Type'));
break; break;
} }
foreach ($allCodecs as $c => $v) {
if (array_search($c,$Sccp_Codec) !=null) {
$allSupported[$c] =$v;
}
}
if (empty($lcodecs) || !is_array($lcodecs)) { if (empty($lcodecs) || (!is_array($lcodecs)) ) {
switch ($type) { if (empty($allSupported)) {
case 'audio': $lcodecs = $allCodecs;
$codecs = $this->FreePBX->Codecs->getAudio(true); } else {
break; $lcodecs = $allSupported;
case 'video':
// $codecs = $this->FreePBX->Codecs->getVideo(true);
$codecs = array('h264'=>'1','h263'=>'','h265'=>'','h261'=>'');
break;
case 'text':
$codecs = $this->FreePBX->Codecs->getText(true);
break;
case 'image':
$codecs = $this->FreePBX->Codecs->getImage(true);
break;
} }
} else { } else {
foreach ($lcodecs as $c => $v) { foreach ($lcodecs as $c => $v) {
if (isset($allCodecs[$c])) { if (isset($allSupported[$c])) {
$codecs[$c] = true; $codecs[$c] = true;
} }
} }
} }
if ($showDefaults) { if ($showDefaults) {
switch ($type) { foreach ($allSupported as $c => $v) {
case 'audio':
$allCodecs = $this->FreePBX->Codecs->getAudio();
break;
case 'video':
// $allCodecs = $this->FreePBX->Codecs->getVideo();
$allCodecs = array('h264'=>'1','h263'=>'','h265'=>'','h261'=>'');
break;
case 'text':
$allCodecs = $this->FreePBX->Codecs->getText();
break;
case 'image':
$allCodecs = $this->FreePBX->Codecs->getImage();
break;
}
// Update the $codecs array by adding un-selected codecs to the end of it.
foreach ($allCodecs as $c => $v) {
if (!isset($codecs[$c])) { if (!isset($codecs[$c])) {
$codecs[$c] = false; $codecs[$c] = false;
} }