kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #891 in FS/freeswitch from ~THEHUNMONKGROUP/freeswitch:feature/FS-9281-add-qqvga-to-list-of-supported-video to master 

* commit '8269b8215bc33bc343a78810a9c6acd6b5ce5c70':
  FS-9281: Add support for QQVGA resolution in Verto
This commit is contained in:
Mike Jerris 2016-08-15 12:41:30 -05:00
parent f9c148979d 8269b8215b
commit bebcddb693
4 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html5/verto/js/src/jquery.FSRTC.js
View File

@ -1089,7 +1089,7 @@
return [w, h];
}
var resList = [[320, 180], [320, 240], [640, 360], [640, 480], [1280, 720], [1920, 1080]];
var resList = [[160, 120], [320, 180], [320, 240], [640, 360], [640, 480], [1280, 720], [1920, 1080]];
var resI = 0;
var ttl = 0;

14
html5/verto/verto_communicator/src/vertoService/services/vertoService.js
View File

@ -3,6 +3,11 @@
/* Controllers */
var videoQuality = [];
var videoQualitySource = [{
id: 'qqvga',
label: 'QQVGA 160x120',
width: 160,
height: 120
}, {
id: 'qvga',
label: 'QVGA 320x240',
width: 320,
@ -35,6 +40,10 @@ var videoQualitySource = [{
}, ];
var videoResolution = {
qqvga: {
width: 160,
height: 120
},
qvga: {
width: 320,
height: 240
@ -910,7 +919,10 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
storage.data.useDedenc = false;
storage.data.vidQual = 'hd';
if (upBand < 512) {
if (upBand < 256) {
storage.data.vidQual = 'qqvga';
}
else if (upBand < 512) {
storage.data.vidQual = 'qvga';
}
else if (upBand < 1024) {

4
html5/verto/video_demo/index.html
View File

@ -394,6 +394,10 @@ if ($('#devices').is(':visible')) {
<div >
<fieldset data-role="controlgroup" data-type="horizontal">
<legend><b>Video Quality</b>:</legend>
<input type="radio" name="vqual" id="vqual_qqvga" value="qqvga">
<label for="vqual_qqvga">QQVGA 160x120</label>
<input type="radio" name="vqual" id="vqual_qvga" value="qvga">
<label for="vqual_qvga">QVGA 320x240</label>

20
html5/verto/video_demo/verto.js
View File

@ -140,7 +140,12 @@ function real_size() {
function check_vid_res()
{
if ($("#vqual_qvga").is(':checked')) {
if ($("#vqual_qqvga").is(':checked')) {
vid_width = 160;
vid_height = 120;
local_vid_width = 80;
local_vid_height = 60;
} else if ($("#vqual_qvga").is(':checked')) {
vid_width = 320;
vid_height = 240;
local_vid_width = 160;
@ -218,6 +223,10 @@ function do_speed_test(fn)
$("#vqual_qvga").prop("checked", true);
vid = "320x240";
}
if (outgoingBandwidth < 256) {
$("#vqual_qqvga").prop("checked", true);
vid = "160x120";
}
//}
if (incomingBandwidth === "default") {
@ -1315,6 +1324,15 @@ function init() {
$("#vqual_qqvga").prop("checked", vqual === "qqvga").change(function(e) {
if ($("#vqual_qqvga").is(':checked')) {
vqual = "qqvga";
$.cookie("verto_demo_vqual", vqual, {
expires: 365
});
}
});
$("#vqual_qvga").prop("checked", vqual === "qvga").change(function(e) {
if ($("#vqual_qvga").is(':checked')) {
vqual = "qvga";