Author: solomax
Date: Sat Aug 27 04:26:50 2016
New Revision: 1757944
URL: http://svn.apache.org/viewvc?rev=1757944&view=rev
Log:
[OPENMEETINGS-1358] rtmps tunneled seems to work
Added:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1757944&r1=1757943&r2=1757944&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -144,7 +144,7 @@ public class CoreScreenShare implements
instance = new
RTMPScreenShare(this);
break;
case rtmpt:
- instance = new
RTMPTScreenShare(this, false);
+ instance = new
RTMPTScreenShare(this);
break;
case rtmps:
boolean nativeSsl =
bool(args[9]);
@@ -154,7 +154,7 @@ public class CoreScreenShare implements
client.setKeyStorePassword(args[11]);
instance = client;
} else {
- instance = new
RTMPTScreenShare(this, true);
+ instance = new
RTMPTSScreenShare(this, true);
}
break;
case rtmpe:
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java?rev=1757944&r1=1757943&r2=1757944&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -27,30 +27,24 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RTMPSScreenShare extends RTMPSClient implements IScreenShare {
- private static final Logger logger =
LoggerFactory.getLogger(RTMPSScreenShare.class);
+ private static final Logger log =
LoggerFactory.getLogger(RTMPSScreenShare.class);
private final CoreScreenShare core;
public RTMPSScreenShare(CoreScreenShare core) {
- protocol = "rtmps"; //FIXME TODO need to be removed after fix
in red5
this.core = core;
};
- //
------------------------------------------------------------------------
- //
- // Override
- //
- //
------------------------------------------------------------------------
@Override
public void connectionOpened(RTMPConnection conn) {
- logger.debug("connection opened");
+ log.debug("connection opened");
super.connectionOpened(conn);
core.setDeadlockGuard(conn);
}
@Override
public void connectionClosed(RTMPConnection conn) {
- logger.debug("connection closed");
+ log.debug("connection closed");
super.connectionClosed(conn);
if (core.isAudioNotify()) {
AudioTone.play();
@@ -66,7 +60,7 @@ public class RTMPSScreenShare extends RT
@Override
public void handleException(Throwable throwable) {
- logger.error("{}", new Object[] { throwable.getCause() });
+ log.error("{}", new Object[] { throwable.getCause() });
System.out.println(throwable.getCause());
}
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java?rev=1757944&r1=1757943&r2=1757944&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -27,7 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RTMPScreenShare extends RTMPClient implements IScreenShare {
- private static final Logger logger =
LoggerFactory.getLogger(RTMPScreenShare.class);
+ private static final Logger log =
LoggerFactory.getLogger(RTMPScreenShare.class);
private final CoreScreenShare core;
@@ -35,21 +35,16 @@ public class RTMPScreenShare extends RTM
this.core = core;
}
- //
------------------------------------------------------------------------
- //
- // Override
- //
- //
------------------------------------------------------------------------
@Override
public void connectionOpened(RTMPConnection conn) {
- logger.debug("connection opened");
+ log.debug("connection opened");
super.connectionOpened(conn);
core.setDeadlockGuard(conn);
}
@Override
public void connectionClosed(RTMPConnection conn) {
- logger.debug("connection closed");
+ log.debug("connection closed");
super.connectionClosed(conn);
if (core.isAudioNotify()) {
AudioTone.play();
@@ -65,7 +60,7 @@ public class RTMPScreenShare extends RTM
@Override
public void handleException(Throwable throwable) {
- logger.error("{}", new Object[] { throwable.getCause() });
+ log.error("{}", new Object[] { throwable.getCause() });
System.out.println(throwable.getCause());
}
}
Added:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java?rev=1757944&view=auto
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java
(added)
+++
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.screen.webstart;
+
+import org.red5.client.net.rtmpt.RTMPTClient;
+import org.red5.server.net.ICommand;
+import org.red5.server.net.rtmp.Channel;
+import org.red5.server.net.rtmp.RTMPConnection;
+import org.red5.server.net.rtmp.message.Header;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RTMPTSScreenShare extends RTMPTClient implements IScreenShare {
+ private static final Logger log =
LoggerFactory.getLogger(RTMPTSScreenShare.class);
+
+ private final CoreScreenShare core;
+
+ public RTMPTSScreenShare(CoreScreenShare core, boolean secure) {
+ this.core = core;
+ };
+
+ @Override
+ public void connectionOpened(RTMPConnection conn) {
+ log.debug("connection opened");
+ super.connectionOpened(conn);
+ core.setDeadlockGuard(conn);
+ }
+
+ @Override
+ public void connectionClosed(RTMPConnection conn) {
+ log.debug("connection closed");
+ super.connectionClosed(conn);
+ if (core.isAudioNotify()) {
+ AudioTone.play();
+ }
+ core.stopStream();
+ }
+
+ @Override
+ protected void onCommand(RTMPConnection conn, Channel channel, Header
source, ICommand command) {
+ super.onCommand(conn, channel, source, command);
+ core.onCommand(conn, channel, source, command);
+ }
+
+ @Override
+ public void handleException(Throwable throwable) {
+ log.error("{}", new Object[] { throwable.getCause() });
+ System.out.println(throwable.getCause());
+ }
+}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java?rev=1757944&r1=1757943&r2=1757944&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -27,32 +27,24 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RTMPTScreenShare extends RTMPTClient implements IScreenShare {
- private static final Logger logger =
LoggerFactory.getLogger(RTMPTScreenShare.class);
+ private static final Logger log =
LoggerFactory.getLogger(RTMPTScreenShare.class);
private final CoreScreenShare core;
- public RTMPTScreenShare(CoreScreenShare core, boolean secure) {
+ public RTMPTScreenShare(CoreScreenShare core) {
this.core = core;
- if (secure) {
- protocol = "rtmps";
- }
};
- //
------------------------------------------------------------------------
- //
- // Override
- //
- //
------------------------------------------------------------------------
@Override
public void connectionOpened(RTMPConnection conn) {
- logger.debug("connection opened");
+ log.debug("connection opened");
super.connectionOpened(conn);
core.setDeadlockGuard(conn);
}
@Override
public void connectionClosed(RTMPConnection conn) {
- logger.debug("connection closed");
+ log.debug("connection closed");
super.connectionClosed(conn);
if (core.isAudioNotify()) {
AudioTone.play();
@@ -68,7 +60,7 @@ public class RTMPTScreenShare extends RT
@Override
public void handleException(Throwable throwable) {
- logger.error("{}", new Object[] { throwable.getCause() });
+ log.error("{}", new Object[] { throwable.getCause() });
System.out.println(throwable.getCause());
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1757944&r1=1757943&r2=1757944&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -144,7 +144,7 @@ public class CoreScreenShare implements
instance = new
RTMPScreenShare(this);
break;
case rtmpt:
- instance = new
RTMPTScreenShare(this, false);
+ instance = new
RTMPTScreenShare(this);
break;
case rtmps:
boolean nativeSsl =
bool(args[9]);
@@ -154,7 +154,7 @@ public class CoreScreenShare implements
client.setKeyStorePassword(args[11]);
instance = client;
} else {
- instance = new
RTMPTScreenShare(this, true);
+ instance = new
RTMPTSScreenShare(this, true);
}
break;
case rtmpe:
Modified:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java?rev=1757944&r1=1757943&r2=1757944&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -27,30 +27,24 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RTMPSScreenShare extends RTMPSClient implements IScreenShare {
- private static final Logger logger =
LoggerFactory.getLogger(RTMPSScreenShare.class);
+ private static final Logger log =
LoggerFactory.getLogger(RTMPSScreenShare.class);
private final CoreScreenShare core;
public RTMPSScreenShare(CoreScreenShare core) {
- protocol = "rtmps"; //FIXME TODO need to be removed after fix
in red5
this.core = core;
};
- //
------------------------------------------------------------------------
- //
- // Override
- //
- //
------------------------------------------------------------------------
@Override
public void connectionOpened(RTMPConnection conn) {
- logger.debug("connection opened");
+ log.debug("connection opened");
super.connectionOpened(conn);
core.setDeadlockGuard(conn);
}
@Override
public void connectionClosed(RTMPConnection conn) {
- logger.debug("connection closed");
+ log.debug("connection closed");
super.connectionClosed(conn);
if (core.isAudioNotify()) {
AudioTone.play();
@@ -66,7 +60,7 @@ public class RTMPSScreenShare extends RT
@Override
public void handleException(Throwable throwable) {
- logger.error("{}", new Object[] { throwable.getCause() });
+ log.error("{}", new Object[] { throwable.getCause() });
System.out.println(throwable.getCause());
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java?rev=1757944&r1=1757943&r2=1757944&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -27,7 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RTMPScreenShare extends RTMPClient implements IScreenShare {
- private static final Logger logger =
LoggerFactory.getLogger(RTMPScreenShare.class);
+ private static final Logger log =
LoggerFactory.getLogger(RTMPScreenShare.class);
private final CoreScreenShare core;
@@ -35,21 +35,16 @@ public class RTMPScreenShare extends RTM
this.core = core;
}
- //
------------------------------------------------------------------------
- //
- // Override
- //
- //
------------------------------------------------------------------------
@Override
public void connectionOpened(RTMPConnection conn) {
- logger.debug("connection opened");
+ log.debug("connection opened");
super.connectionOpened(conn);
core.setDeadlockGuard(conn);
}
@Override
public void connectionClosed(RTMPConnection conn) {
- logger.debug("connection closed");
+ log.debug("connection closed");
super.connectionClosed(conn);
if (core.isAudioNotify()) {
AudioTone.play();
@@ -65,7 +60,7 @@ public class RTMPScreenShare extends RTM
@Override
public void handleException(Throwable throwable) {
- logger.error("{}", new Object[] { throwable.getCause() });
+ log.error("{}", new Object[] { throwable.getCause() });
System.out.println(throwable.getCause());
}
}
Added:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java?rev=1757944&view=auto
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java
(added)
+++
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.screen.webstart;
+
+import org.red5.client.net.rtmpt.RTMPTClient;
+import org.red5.server.net.ICommand;
+import org.red5.server.net.rtmp.Channel;
+import org.red5.server.net.rtmp.RTMPConnection;
+import org.red5.server.net.rtmp.message.Header;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RTMPTSScreenShare extends RTMPTClient implements IScreenShare {
+ private static final Logger log =
LoggerFactory.getLogger(RTMPTSScreenShare.class);
+
+ private final CoreScreenShare core;
+
+ public RTMPTSScreenShare(CoreScreenShare core, boolean secure) {
+ this.core = core;
+ };
+
+ @Override
+ public void connectionOpened(RTMPConnection conn) {
+ log.debug("connection opened");
+ super.connectionOpened(conn);
+ core.setDeadlockGuard(conn);
+ }
+
+ @Override
+ public void connectionClosed(RTMPConnection conn) {
+ log.debug("connection closed");
+ super.connectionClosed(conn);
+ if (core.isAudioNotify()) {
+ AudioTone.play();
+ }
+ core.stopStream();
+ }
+
+ @Override
+ protected void onCommand(RTMPConnection conn, Channel channel, Header
source, ICommand command) {
+ super.onCommand(conn, channel, source, command);
+ core.onCommand(conn, channel, source, command);
+ }
+
+ @Override
+ public void handleException(Throwable throwable) {
+ log.error("{}", new Object[] { throwable.getCause() });
+ System.out.println(throwable.getCause());
+ }
+}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java?rev=1757944&r1=1757943&r2=1757944&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -27,32 +27,24 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RTMPTScreenShare extends RTMPTClient implements IScreenShare {
- private static final Logger logger =
LoggerFactory.getLogger(RTMPTScreenShare.class);
+ private static final Logger log =
LoggerFactory.getLogger(RTMPTScreenShare.class);
private final CoreScreenShare core;
- public RTMPTScreenShare(CoreScreenShare core, boolean secure) {
+ public RTMPTScreenShare(CoreScreenShare core) {
this.core = core;
- if (secure) {
- protocol = "rtmps";
- }
};
- //
------------------------------------------------------------------------
- //
- // Override
- //
- //
------------------------------------------------------------------------
@Override
public void connectionOpened(RTMPConnection conn) {
- logger.debug("connection opened");
+ log.debug("connection opened");
super.connectionOpened(conn);
core.setDeadlockGuard(conn);
}
@Override
public void connectionClosed(RTMPConnection conn) {
- logger.debug("connection closed");
+ log.debug("connection closed");
super.connectionClosed(conn);
if (core.isAudioNotify()) {
AudioTone.play();
@@ -68,7 +60,7 @@ public class RTMPTScreenShare extends RT
@Override
public void handleException(Throwable throwable) {
- logger.error("{}", new Object[] { throwable.getCause() });
+ log.error("{}", new Object[] { throwable.getCause() });
System.out.println(throwable.getCause());
}
}
Modified:
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1757944&r1=1757943&r2=1757944&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -144,7 +144,7 @@ public class CoreScreenShare implements
instance = new
RTMPScreenShare(this);
break;
case rtmpt:
- instance = new
RTMPTScreenShare(this, false);
+ instance = new
RTMPTScreenShare(this);
break;
case rtmps:
boolean nativeSsl =
bool(args[9]);
@@ -154,7 +154,7 @@ public class CoreScreenShare implements
client.setKeyStorePassword(args[11]);
instance = client;
} else {
- instance = new
RTMPTScreenShare(this, true);
+ instance = new
RTMPTSScreenShare(this, true);
}
break;
case rtmpe:
Modified:
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java?rev=1757944&r1=1757943&r2=1757944&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
(original)
+++
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -27,30 +27,24 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RTMPSScreenShare extends RTMPSClient implements IScreenShare {
- private static final Logger logger =
LoggerFactory.getLogger(RTMPSScreenShare.class);
+ private static final Logger log =
LoggerFactory.getLogger(RTMPSScreenShare.class);
private final CoreScreenShare core;
public RTMPSScreenShare(CoreScreenShare core) {
- protocol = "rtmps"; //FIXME TODO need to be removed after fix
in red5
this.core = core;
};
- //
------------------------------------------------------------------------
- //
- // Override
- //
- //
------------------------------------------------------------------------
@Override
public void connectionOpened(RTMPConnection conn) {
- logger.debug("connection opened");
+ log.debug("connection opened");
super.connectionOpened(conn);
core.setDeadlockGuard(conn);
}
@Override
public void connectionClosed(RTMPConnection conn) {
- logger.debug("connection closed");
+ log.debug("connection closed");
super.connectionClosed(conn);
if (core.isAudioNotify()) {
AudioTone.play();
@@ -66,7 +60,7 @@ public class RTMPSScreenShare extends RT
@Override
public void handleException(Throwable throwable) {
- logger.error("{}", new Object[] { throwable.getCause() });
+ log.error("{}", new Object[] { throwable.getCause() });
System.out.println(throwable.getCause());
}
}
Modified:
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java?rev=1757944&r1=1757943&r2=1757944&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
(original)
+++
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -27,7 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RTMPScreenShare extends RTMPClient implements IScreenShare {
- private static final Logger logger =
LoggerFactory.getLogger(RTMPScreenShare.class);
+ private static final Logger log =
LoggerFactory.getLogger(RTMPScreenShare.class);
private final CoreScreenShare core;
@@ -35,21 +35,16 @@ public class RTMPScreenShare extends RTM
this.core = core;
}
- //
------------------------------------------------------------------------
- //
- // Override
- //
- //
------------------------------------------------------------------------
@Override
public void connectionOpened(RTMPConnection conn) {
- logger.debug("connection opened");
+ log.debug("connection opened");
super.connectionOpened(conn);
core.setDeadlockGuard(conn);
}
@Override
public void connectionClosed(RTMPConnection conn) {
- logger.debug("connection closed");
+ log.debug("connection closed");
super.connectionClosed(conn);
if (core.isAudioNotify()) {
AudioTone.play();
@@ -65,7 +60,7 @@ public class RTMPScreenShare extends RTM
@Override
public void handleException(Throwable throwable) {
- logger.error("{}", new Object[] { throwable.getCause() });
+ log.error("{}", new Object[] { throwable.getCause() });
System.out.println(throwable.getCause());
}
}
Added:
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java?rev=1757944&view=auto
==============================================================================
---
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java
(added)
+++
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTSScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.screen.webstart;
+
+import org.red5.client.net.rtmpt.RTMPTClient;
+import org.red5.server.net.ICommand;
+import org.red5.server.net.rtmp.Channel;
+import org.red5.server.net.rtmp.RTMPConnection;
+import org.red5.server.net.rtmp.message.Header;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RTMPTSScreenShare extends RTMPTClient implements IScreenShare {
+ private static final Logger log =
LoggerFactory.getLogger(RTMPTSScreenShare.class);
+
+ private final CoreScreenShare core;
+
+ public RTMPTSScreenShare(CoreScreenShare core, boolean secure) {
+ this.core = core;
+ };
+
+ @Override
+ public void connectionOpened(RTMPConnection conn) {
+ log.debug("connection opened");
+ super.connectionOpened(conn);
+ core.setDeadlockGuard(conn);
+ }
+
+ @Override
+ public void connectionClosed(RTMPConnection conn) {
+ log.debug("connection closed");
+ super.connectionClosed(conn);
+ if (core.isAudioNotify()) {
+ AudioTone.play();
+ }
+ core.stopStream();
+ }
+
+ @Override
+ protected void onCommand(RTMPConnection conn, Channel channel, Header
source, ICommand command) {
+ super.onCommand(conn, channel, source, command);
+ core.onCommand(conn, channel, source, command);
+ }
+
+ @Override
+ public void handleException(Throwable throwable) {
+ log.error("{}", new Object[] { throwable.getCause() });
+ System.out.println(throwable.getCause());
+ }
+}
Modified:
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java?rev=1757944&r1=1757943&r2=1757944&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
(original)
+++
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
Sat Aug 27 04:26:50 2016
@@ -27,32 +27,24 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class RTMPTScreenShare extends RTMPTClient implements IScreenShare {
- private static final Logger logger =
LoggerFactory.getLogger(RTMPTScreenShare.class);
+ private static final Logger log =
LoggerFactory.getLogger(RTMPTScreenShare.class);
private final CoreScreenShare core;
- public RTMPTScreenShare(CoreScreenShare core, boolean secure) {
+ public RTMPTScreenShare(CoreScreenShare core) {
this.core = core;
- if (secure) {
- protocol = "rtmps";
- }
};
- //
------------------------------------------------------------------------
- //
- // Override
- //
- //
------------------------------------------------------------------------
@Override
public void connectionOpened(RTMPConnection conn) {
- logger.debug("connection opened");
+ log.debug("connection opened");
super.connectionOpened(conn);
core.setDeadlockGuard(conn);
}
@Override
public void connectionClosed(RTMPConnection conn) {
- logger.debug("connection closed");
+ log.debug("connection closed");
super.connectionClosed(conn);
if (core.isAudioNotify()) {
AudioTone.play();
@@ -68,7 +60,7 @@ public class RTMPTScreenShare extends RT
@Override
public void handleException(Throwable throwable) {
- logger.error("{}", new Object[] { throwable.getCause() });
+ log.error("{}", new Object[] { throwable.getCause() });
System.out.println(throwable.getCause());
}
}
