BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

Browse Source
This commit is contained in:
Richard Alam 2013-03-22 14:17:59 +00:00
commit a5c193bc7a
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
View File

@ -119,40 +119,42 @@ package org.bigbluebutton.modules.videoconf.business
h264profile = H264Profile.BASELINE; h264profile = H264Profile.BASELINE;
} }
var h264Level:String = H264Level.LEVEL_4_1; var h264Level:String = H264Level.LEVEL_4_1;
if (videoOptions.h264Level != "1") { if (videoOptions.h264Level == "1") {
h264Level = H264Level.LEVEL_1; h264Level = H264Level.LEVEL_1;
} else if (videoOptions.h264Level != "1.1") { } else if (videoOptions.h264Level == "1.1") {
h264Level = H264Level.LEVEL_1_1; h264Level = H264Level.LEVEL_1_1;
} else if (videoOptions.h264Level != "1.2") { } else if (videoOptions.h264Level == "1.2") {
h264Level = H264Level.LEVEL_1_2; h264Level = H264Level.LEVEL_1_2;
} else if (videoOptions.h264Level != "1.3") { } else if (videoOptions.h264Level == "1.3") {
h264Level = H264Level.LEVEL_1_3; h264Level = H264Level.LEVEL_1_3;
} else if (videoOptions.h264Level != "1b") { } else if (videoOptions.h264Level == "1b") {
h264Level = H264Level.LEVEL_1B; h264Level = H264Level.LEVEL_1B;
} else if (videoOptions.h264Level != "2") { } else if (videoOptions.h264Level == "2") {
h264Level = H264Level.LEVEL_2; h264Level = H264Level.LEVEL_2;
} else if (videoOptions.h264Level != "2.1") { } else if (videoOptions.h264Level == "2.1") {
h264Level = H264Level.LEVEL_2_1; h264Level = H264Level.LEVEL_2_1;
} else if (videoOptions.h264Level != "2.2") { } else if (videoOptions.h264Level == "2.2") {
h264Level = H264Level.LEVEL_2_2; h264Level = H264Level.LEVEL_2_2;
} else if (videoOptions.h264Level != "3") { } else if (videoOptions.h264Level == "3") {
h264Level = H264Level.LEVEL_3; h264Level = H264Level.LEVEL_3;
} else if (videoOptions.h264Level != "3.1") { } else if (videoOptions.h264Level == "3.1") {
h264Level = H264Level.LEVEL_3_1; h264Level = H264Level.LEVEL_3_1;
} else if (videoOptions.h264Level != "3.2") { } else if (videoOptions.h264Level == "3.2") {
h264Level = H264Level.LEVEL_3_2; h264Level = H264Level.LEVEL_3_2;
} else if (videoOptions.h264Level != "4") { } else if (videoOptions.h264Level == "4") {
h264Level = H264Level.LEVEL_4; h264Level = H264Level.LEVEL_4;
} else if (videoOptions.h264Level != "4.1") { } else if (videoOptions.h264Level == "4.1") {
h264Level = H264Level.LEVEL_4_1; h264Level = H264Level.LEVEL_4_1;
} else if (videoOptions.h264Level != "4.2") { } else if (videoOptions.h264Level == "4.2") {
h264Level = H264Level.LEVEL_4_2; h264Level = H264Level.LEVEL_4_2;
} else if (videoOptions.h264Level != "5") { } else if (videoOptions.h264Level == "5") {
h264Level = H264Level.LEVEL_5; h264Level = H264Level.LEVEL_5;
} else if (videoOptions.h264Level != "5.1") { } else if (videoOptions.h264Level == "5.1") {
h264Level = H264Level.LEVEL_5_1; h264Level = H264Level.LEVEL_5_1;
} }
LogUtil.info("Codec used: " + h264Level);
h264.setProfileLevel(h264profile, h264Level); h264.setProfileLevel(h264profile, h264Level);
ns.videoStreamSettings = h264; ns.videoStreamSettings = h264;
} }