Skip to content

Commit

Permalink
fix #163 - Support VP9 codec
Browse files Browse the repository at this point in the history
  • Loading branch information
@deleolajide
deleolajide committed Dec 30, 2020
1 parent a07d497 commit 65c1da8
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 7 deletions.
6 changes: 5 additions & 1 deletion ofmeet/src/main/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJicofoWrapper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,19 @@ public synchronized void initialize( File pluginDirectory) throws Exception
final String jicofoHomePath = pluginDirectory.getPath() + File.separator + "classes" + File.separator + "jicofo";
final File props_file = new File(jicofoHomePath + File.separator + "config" + File.separator + "sip-communicator.properties");
Properties props = new Properties();

props.load(new FileInputStream(props_file));

props.setProperty("org.jitsi.jicofo.BRIDGE_MUC", "ofmeet@" + MAIN_MUC);
props.setProperty("org.jitsi.jicofo.jigasi.BREWERY", "ofgasi@" + MAIN_MUC);
props.setProperty( "org.jitsi.jicofo.ALWAYS_TRUST_MODE_ENABLED", "true" );
props.setProperty( "org.jitsi.jicofo.PING_INTERVAL", "-1" );
props.setProperty( "org.jitsi.jicofo.SERVICE_REDISCOVERY_INTERVAL", "60000" );
props.setProperty( "org.jitsi.jicofo.DISABLE_AUTO_OWNER", Boolean.toString( !JiveGlobals.getBooleanProperty( "ofmeet.conference.auto-moderator", true ) ) );

props.setProperty( "org.jitsi.jicofo.ENABLE_H264", Boolean.toString( !JiveGlobals.getBooleanProperty( "ofmeet.jicofo.force.vp9", false ) ) );
props.setProperty( "org.jitsi.jicofo.ENABLE_VP8", Boolean.toString( !JiveGlobals.getBooleanProperty( "ofmeet.jicofo.force.vp9", false ) ) );
props.setProperty( "org.jitsi.jicofo.ENABLE_VP9", Boolean.toString( JiveGlobals.getBooleanProperty( "ofmeet.jicofo.force.vp9", false ) ) );

Log.debug("sip-communicator.properties");

for (Object key: props.keySet()) {
Expand Down
7 changes: 4 additions & 3 deletions pade/changelog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,16 @@ <h1>

<p><b>1.3.0</b> -- <i>December 31, 2020</i></p>
<ul>
<li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/50">Issue #50 - Enhancement: Sort Entries in Contact Manager</a></li>
<li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/51">Issue #51 - Make the icon area of a contact clickable</a></li>
<li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/145">Issue #145 - Use UI message type error, which will stay until dismissed</a></li>
<li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/153">Issue #153 - Meta-Bug: unknown local path in POM for Pade</a></li>
<li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/154">Issue #154 - Start Order of Plugins OFMeet and Pade</a></li>
<li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/163">Issue #163 - Support VP9 codec</a></li>
<li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/168">Issue #168 - Avatar still shows broken in list</a></li>
<li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/176">Issue #176 - Meeting planner does not show up in Meeting plugin</a></li>
<li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/178">Issue #178 - Remove webinar mode</a></li>
<li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/145">Issue #145 - Use UI message type error, which will stay until dismissed</a></li>
<li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/182">Issue #182 - Feature Request: Allow access to JVB REST-API via private http interface</a></li>
<li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/50">Issue #50 - Enhancement: Sort Entries in Contact Manager</a></li>
<li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/51">Issue #51 - Make the icon area of a contact clickable</a></li>
</ul>

<p><b>1.2.2</b> -- <i>December 20, 2020</i></p>
Expand Down
1 change: 1 addition & 0 deletions pade/src/i18n/pade_i18n.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ config.page.configuration.ofmeet.title=Application Configuration
config.page.configuration.ofmeet.webinar.enabled_desc=Enable Webinar Mode - Everyone is a listener by default. Use config.webinar=false in URL to become a presenter
config.page.configuration.ofmeet.websockets.enabled=Enable support for WebSocket connections instead of default Bidirectional-streams Over Synchronous HTTP (BOSH).
config.page.configuration.ofmeet.disableRtx.enabled_desc=Enable RTX
config.page.configuration.ofmeet.jicofo.force.vp9=Force VP9 Codec. Please note that this will disable H264 and VP8
config.page.configuration.ofmeet.useipv6.enabled=Enable IPv6
config.page.configuration.ofmeet.useipv6.enabled_desc=Enable webrtc to use IPv6
config.page.configuration.ofmeet.useipv6.disabled=Disable IPv6
Expand Down
14 changes: 11 additions & 3 deletions pade/src/web/ofmeet-settings.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
final boolean conferenceadmin = ParamUtils.getBooleanParameter( request, "conferenceadmin" );
final boolean securityenabled = ParamUtils.getBooleanParameter( request, "securityenabled" );
final boolean disableRtx = !ParamUtils.getBooleanParameter( request, "enableRtx" );
final boolean forceVp9 = ParamUtils.getBooleanParameter( request, "forceVp9" );
final String authusername = request.getParameter( "authusername" );
final String sippassword = request.getParameter( "sippassword" );
final String server = request.getParameter( "server" );
Expand Down Expand Up @@ -165,7 +166,7 @@
JiveGlobals.setProperty( "voicebridge.default.proxy.sipserver", server );
JiveGlobals.setProperty( "voicebridge.default.proxy.outboundproxy", outboundproxy );
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.websockets", Boolean.toString( websockets ) );
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.useipv6", Boolean.toString( useIPv6 ) );
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.useipv6", Boolean.toString( useIPv6 ) );
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.usenicks", Boolean.toString( useNicks ) );
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.sip.username", clientusername );
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.sip.password", clientpassword );
Expand All @@ -182,7 +183,8 @@
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.jvb.jvm.customOptions", jvmJvb );
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.focus.jvm.customOptions", jvmJicofo );
JiveGlobals.setProperty( "org.jitsi.videobridge.ofmeet.jigasi.jvm.customOptions", jvmJigasi );
JiveGlobals.setProperty( "ofmeet.jicofo.force.vp9", Boolean.toString( forceVp9 ) );
JiveGlobals.setProperty( "ofmeet.max.full.resolution.participants", maxFullResolutionParticipants );
JiveGlobals.setProperty( "ofmeet.min.height.for.quality.level.low", minHeightForQualityLow );
JiveGlobals.setProperty( "ofmeet.min.height.for.quality.level.std", minHeightForQualityStd );
Expand Down Expand Up @@ -299,7 +301,13 @@
<input type="checkbox" name="websockets" ${admin:getBooleanProperty( "org.jitsi.videobridge.ofmeet.websockets", false) ? "checked" : ""}>
<fmt:message key="config.page.configuration.ofmeet.websockets.enabled" />
</td>
</tr>
</tr>
<tr>
<td nowrap colspan="2">
<input type="checkbox" name="forceVp9" ${admin:getBooleanProperty( "ofmeet.jicofo.force.vp9", false) ? "checked" : ""}>
<fmt:message key="config.page.configuration.ofmeet.jicofo.force.vp9" />
</td>
</tr>
<tr>
<td nowrap colspan="2">
<input type="checkbox" name="enableRtx" ${ofmeetConfig.disableRtx ? "" : "checked"}>
Expand Down

0 comments on commit 65c1da8

Please sign in to comment.