[openmeetings] branch master updated: [OPENMEETINGS-1649] NPE in stream clean-up is fixed, work with xstream is improved
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 6824f7a [OPENMEETINGS-1649] NPE in stream clean-up is fixed, work
with xstream is improved
6824f7a is described below
commit 6824f7a8422aaa4589cc1795543b8559d6aad5f0
Author: Maxim Solodovnik
AuthorDate: Sat Oct 6 11:00:49 2018 +0700
[OPENMEETINGS-1649] NPE in stream clean-up is fixed, work with xstream is
improved
---
.../apache/openmeetings/core/remote/KurentoHandler.java | 17 ++---
.../openmeetings/backup/converter/WbConverter.java | 13 ++---
.../org/apache/openmeetings/web/room/RoomPanel.java | 4
.../openmeetings/web/util/UserDashboardPersister.java | 9 +
.../WEB-INF/classes/META-INF/mysql_persistence.xml | 2 +-
5 files changed, 30 insertions(+), 15 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
index 4425f33..3b86957 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
@@ -66,10 +66,10 @@ import com.github.openjson.JSONObject;
public class KurentoHandler {
private final static Logger log =
LoggerFactory.getLogger(KurentoHandler.class);
- final static String MODE_TEST = "test";
- final static String TAG_KUID = "kuid";
- final static String TAG_MODE = "mode";
- final static String TAG_ROOM = "roomId";
+ private final static String MODE_TEST = "test";
+ private final static String TAG_KUID = "kuid";
+ private final static String TAG_MODE = "mode";
+ private final static String TAG_ROOM = "roomId";
private final static String HMAC_SHA1_ALGORITHM = "HmacSHA1";
public final static String KURENTO_TYPE = "kurento";
private long checkTimeout = 200; //ms
@@ -114,7 +114,7 @@ public class KurentoHandler {
}
}
- static Map tagsAsMap(MediaObject pipe) {
+ private static Map tagsAsMap(MediaObject pipe) {
Map map = new HashMap<>();
for (Tag t : pipe.getTags()) {
map.put(t.getKey(), t.getValue());
@@ -313,8 +313,11 @@ public class KurentoHandler {
usersByUid.remove(uid);
}
}
- if (!test) {
- Client c = (Client)_c;
+ if (test) {
+ return;
+ }
+ Client c = (Client)_c;
+ if (c.getRoomId() != null) {
KRoom room = rooms.get(c.getRoomId());
if (room != null) {
room.leave(c);
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
index 4a1d589..16196b1 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
@@ -51,6 +51,9 @@ import com.github.openjson.JSONArray;
import com.github.openjson.JSONObject;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.XppDriver;
+import com.thoughtworks.xstream.security.NoTypePermission;
+import com.thoughtworks.xstream.security.NullPermission;
+import com.thoughtworks.xstream.security.PrimitiveTypePermission;
public class WbConverter {
private static final Logger log =
LoggerFactory.getLogger(WbConverter.class);
@@ -305,10 +308,14 @@ public class WbConverter {
File file = new File(OmFileHelper.getUploadWmlDir(), name);
log.debug("filepathComplete: {}", file);
- XStream xStream = new XStream(new XppDriver());
- xStream.setMode(XStream.NO_REFERENCES);
+ XStream xstream = new XStream(new XppDriver());
+ xstream.setMode(XStream.NO_REFERENCES);
+ xstream.addPermission(NoTypePermission.NONE);
+ xstream.addPermission(NullPermission.NULL);
+ xstream.addPermission(PrimitiveTypePermission.PRIMITIVES);
+ xstream.allowTypeHierarchy(List.class);
try (InputStream is = new FileInputStream(file); BufferedReader
reader = new BufferedReader(new InputStreamReader(is, UTF_8))) {
- return (List) xStream.fromXML(reader);
+ return (List) xstream.fromXML(reader);
} catch (Exception err) {
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1928] reflow skin is updated, ApacheCon banner is permanently added
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new d4879de [OPENMEETINGS-1928] reflow skin is updated, ApacheCon banner
is permanently added
d4879de is described below
commit d4879de53b2dcbbe450acd0276a8e2c25c1763db
Author: Maxim Solodovnik
AuthorDate: Sat Oct 6 10:15:37 2018 +0700
[OPENMEETINGS-1928] reflow skin is updated, ApacheCon banner is permanently
added
---
openmeetings-server/src/site/resources/css/site.css | 8
openmeetings-server/src/site/resources/js/site.js | 8
pom.xml | 6 +++---
src/site/site.xml | 6 +++---
4 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/openmeetings-server/src/site/resources/css/site.css
b/openmeetings-server/src/site/resources/css/site.css
index 9e9d330..a76f09b 100644
--- a/openmeetings-server/src/site/resources/css/site.css
+++ b/openmeetings-server/src/site/resources/css/site.css
@@ -63,3 +63,11 @@ iframe {
.carousel.slide .carousel-inner .item img {
height: 654px !important;
}
+.apachecon-banner img {
+ height: 62px !important;
+}
+.apachecon-banner div {
+ font-size: small;
+ font-weight: bold;
+ text-align: center;
+}
diff --git a/openmeetings-server/src/site/resources/js/site.js
b/openmeetings-server/src/site/resources/js/site.js
index 88fcece..9509f1f 100644
--- a/openmeetings-server/src/site/resources/js/site.js
+++ b/openmeetings-server/src/site/resources/js/site.js
@@ -23,4 +23,12 @@ $(document).ready(function() {
for (var i = 0; i < topics.length; ++i) {
$('ul.nav li a[title="' + topics[i] +
'"').append('New')
}
+ // "ACNA" banner on the right
+ $('#bannerRight').parent().parent().append(
+ $('')
+ .append($('https://www.apachecon.com;
class="apachecon-banner">')
+ .append($('https://apachecon.com/acna18/banners/acna-sleek-standard.png;>'))
+ .append($('').text('Register to
ApacheCon!'))
+ )
+ );
})
diff --git a/pom.xml b/pom.xml
index b0ae41b..3dbbec8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
1.6
1.6
1.16
- 1.3.10
+ 1.4.0
3.8.0
3.0.0
3.1.0
@@ -107,7 +107,7 @@
2.0.0.AM2
0.9.1
1.19
- 1.4
+ 1.5
test
1.60
@@ -913,7 +913,7 @@
io.github.devacfr.maven.skins
reflow-velocity-tools
-
${reflow-skin.version}
+
${reflow-maven-skin.version}
diff --git a/src/site/site.xml b/src/site/site.xml
index d958798..5504e33 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -12,8 +12,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-http://maven.apache.org/DECORATION/1.7.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0
http://maven.apache.org/xsd/decoration-1.7.0.xsd;
+http://maven.apache.org/DECORATION/1.8.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0
http://maven.apache.org/xsd/decoration-1.8.0.xsd;
name="Apache OpenMeetings Project">
Apache OpenMeetings
@@ -29,7 +29,7 @@
io.github.devacfr.maven.skins
reflow-maven-skin
- ${reflow-skin.version}
+ ${reflow-maven-skin.version}
[openmeetings] branch master updated: [OPENMEETINGS-1928] reflow skin is updated, ApacheCon banner is permanently added
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new dd079e6 [OPENMEETINGS-1928] reflow skin is updated, ApacheCon banner
is permanently added
dd079e6 is described below
commit dd079e6e4d90004220f17e25c418488fd1735399
Author: Maxim Solodovnik
AuthorDate: Sat Oct 6 10:15:37 2018 +0700
[OPENMEETINGS-1928] reflow skin is updated, ApacheCon banner is permanently
added
---
openmeetings-server/src/site/resources/css/site.css | 8
openmeetings-server/src/site/resources/js/site.js | 8
pom.xml | 6 +++---
src/site/site.xml | 6 +++---
4 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/openmeetings-server/src/site/resources/css/site.css
b/openmeetings-server/src/site/resources/css/site.css
index 9e9d330..a76f09b 100644
--- a/openmeetings-server/src/site/resources/css/site.css
+++ b/openmeetings-server/src/site/resources/css/site.css
@@ -63,3 +63,11 @@ iframe {
.carousel.slide .carousel-inner .item img {
height: 654px !important;
}
+.apachecon-banner img {
+ height: 62px !important;
+}
+.apachecon-banner div {
+ font-size: small;
+ font-weight: bold;
+ text-align: center;
+}
diff --git a/openmeetings-server/src/site/resources/js/site.js
b/openmeetings-server/src/site/resources/js/site.js
index 88fcece..9509f1f 100644
--- a/openmeetings-server/src/site/resources/js/site.js
+++ b/openmeetings-server/src/site/resources/js/site.js
@@ -23,4 +23,12 @@ $(document).ready(function() {
for (var i = 0; i < topics.length; ++i) {
$('ul.nav li a[title="' + topics[i] +
'"').append('New')
}
+ // "ACNA" banner on the right
+ $('#bannerRight').parent().parent().append(
+ $('')
+ .append($('https://www.apachecon.com;
class="apachecon-banner">')
+ .append($('https://apachecon.com/acna18/banners/acna-sleek-standard.png;>'))
+ .append($('').text('Register to
ApacheCon!'))
+ )
+ );
})
diff --git a/pom.xml b/pom.xml
index 3e84b47..1acafc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
1.6
1.6
1.16
- 1.3.10
+ 1.4.0
3.8.0
3.0.0
3.1.0
@@ -105,7 +105,7 @@
2.0.0.AM2
0.9.1
1.19
- 1.4
+ 1.5
1.7.25
1.2.3
9.4.12.RC0
@@ -901,7 +901,7 @@
io.github.devacfr.maven.skins
reflow-velocity-tools
-
${reflow-skin.version}
+
${reflow-maven-skin.version}
diff --git a/src/site/site.xml b/src/site/site.xml
index d958798..5504e33 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -12,8 +12,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-http://maven.apache.org/DECORATION/1.7.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0
http://maven.apache.org/xsd/decoration-1.7.0.xsd;
+http://maven.apache.org/DECORATION/1.8.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0
http://maven.apache.org/xsd/decoration-1.8.0.xsd;
name="Apache OpenMeetings Project">
Apache OpenMeetings
@@ -29,7 +29,7 @@
io.github.devacfr.maven.skins
reflow-maven-skin
- ${reflow-skin.version}
+ ${reflow-maven-skin.version}
[openmeetings] branch master updated: [OPENMEETINGS-1649] stream clean-up is improved
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 98b4147 [OPENMEETINGS-1649] stream clean-up is improved
98b4147 is described below
commit 98b4147b997b6843d915307bda2a462cf2375552
Author: Maxim Solodovnik
AuthorDate: Sat Oct 6 09:43:22 2018 +0700
[OPENMEETINGS-1649] stream clean-up is improved
---
.../openmeetings/core/remote/KurentoHandler.java | 26 ++
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
index bba9453..4425f33 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
@@ -310,14 +310,16 @@ public class KurentoHandler {
if (test) {
testsByUid.remove(uid);
} else {
- Client c = (Client)_c;
- KRoom room = rooms.get(c.getRoomId());
- if (room != null) {
- room.leave(c);
- }
usersByUid.remove(uid);
}
}
+ if (!test) {
+ Client c = (Client)_c;
+ KRoom room = rooms.get(c.getRoomId());
+ if (room != null) {
+ room.leave(c);
+ }
+ }
}
public KRoom getRoom(Long roomId) {
@@ -326,9 +328,11 @@ public class KurentoHandler {
if (room == null) {
log.debug("Room {} does not exist. Will create now!",
roomId);
- MediaPipeline pipe = client.createMediaPipeline();
- pipe.addTag(TAG_KUID, kuid);
- pipe.addTag(TAG_ROOM, String.valueOf(roomId));
+ Transaction t = client.beginTransaction();
+ MediaPipeline pipe = client.createMediaPipeline(t);
+ pipe.addTag(t, TAG_KUID, kuid);
+ pipe.addTag(t, TAG_ROOM, String.valueOf(roomId));
+ t.commit();
room = new KRoom(roomId, pipe);
rooms.put(roomId, room);
}
@@ -336,12 +340,6 @@ public class KurentoHandler {
return room;
}
- public void removeRoom(KRoom room) {
- this.rooms.remove(room.getRoomId());
- room.close();
- log.info("Room {} removed and closed", room.getRoomId());
- }
-
private KStream getByUid(String uid) {
return uid == null ? null : usersByUid.get(uid);
}
[jira] [Commented] (OPENMEETINGS-1649) HTML5 video need to be implemented
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1649?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16640117#comment-16640117 ] ASF subversion and git services commented on OPENMEETINGS-1649: --- Commit 5fc72d9250a1ecf19c2a5580b88b01b6ec61f8b8 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=5fc72d9 ] [OPENMEETINGS-1649] broadcast can be restarted > HTML5 video need to be implemented > -- > > Key: OPENMEETINGS-1649 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1649 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.0.0 > > > Flex video in room should be replaced with HTML5 video -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1649] broadcast can be restarted
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 5fc72d9 [OPENMEETINGS-1649] broadcast can be restarted
5fc72d9 is described below
commit 5fc72d9250a1ecf19c2a5580b88b01b6ec61f8b8
Author: Maxim Solodovnik
AuthorDate: Sat Oct 6 00:33:34 2018 +0700
[OPENMEETINGS-1649] broadcast can be restarted
---
.../apache/openmeetings/core/remote/KStream.java | 165 -
.../openmeetings/core/remote/KTestStream.java | 42 +++---
.../openmeetings/core/remote/KurentoHandler.java | 50 +++
.../openmeetings/web/room/raw-video-manager.js | 2 +-
4 files changed, 97 insertions(+), 162 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index 7cc0df5..06f1191 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -23,6 +23,7 @@ package org.apache.openmeetings.core.remote;
import static org.apache.openmeetings.core.remote.KurentoHandler.newKurentoMsg;
+import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -35,8 +36,6 @@ import org.kurento.client.Continuation;
import org.kurento.client.EventListener;
import org.kurento.client.IceCandidate;
import org.kurento.client.IceCandidateFoundEvent;
-import org.kurento.client.MediaFlowOutStateChangeEvent;
-import org.kurento.client.MediaFlowState;
import org.kurento.client.MediaPipeline;
import org.kurento.client.MediaType;
import org.kurento.client.WebRtcEndpoint;
@@ -53,8 +52,8 @@ public class KStream implements IKStream {
private final String uid;
private final MediaPipeline pipeline;
private final Long roomId;
- private WebRtcEndpoint outgoingMedia;
- private final ConcurrentMap incomingMedia = new
ConcurrentHashMap<>();
+ private WebRtcEndpoint outgoingMedia = null;
+ private final ConcurrentMap listeners = new
ConcurrentHashMap<>();
//FIXME TODO multiple streams from client
public KStream(final Client c, MediaPipeline pipeline) {
@@ -66,26 +65,12 @@ public class KStream implements IKStream {
//TODO Min/Max Audio/Video RecvBandwidth
}
- private void initOutMedia(final KurentoHandler h) {
- outgoingMedia = createEndpoint(h, this);
- //TODO add logic here
- outgoingMedia.addMediaFlowOutStateChangeListener(new
EventListener() {
- @Override
- public void onEvent(MediaFlowOutStateChangeEvent event)
{
- log.warn("MediaFlowOutStateChange {}",
event.getState());
- if (MediaFlowState.NOT_FLOWING ==
event.getState()) {
- outgoingMedia.release();
- }
- }
- });
- }
-
public KStream startBroadcast(final KurentoHandler h, final Client c,
final String sdpOffer) {
if (outgoingMedia != null) {
- outgoingMedia.release();
+ release();
}
- initOutMedia(h);
- videoResponse(h, this, sdpOffer);
+ outgoingMedia = createEndpoint(h, h.getBySid(sid));
+ addListener(h, c, sdpOffer);
WebSocketHelper.sendRoom(new TextRoomMessage(c.getRoomId(), c,
RoomMessage.Type.rightUpdated, c.getUid()));
WebSocketHelper.sendRoomOthers(roomId, uid, newKurentoMsg()
.put("id", "newStream")
@@ -102,73 +87,68 @@ public class KStream implements IKStream {
return uid;
}
- /**
-* The room to which the user is currently attending.
-*
-* @return The room
-*/
public Long getRoomId() {
return roomId;
}
public boolean contains(String uid) {
- return this.uid.equals(uid) || incomingMedia.containsKey(uid);
+ return this.uid.equals(uid) || listeners.containsKey(uid);
}
- public void videoResponse(final KurentoHandler h, KStream sender,
String sdpOffer) {
- final boolean self = sender.getUid().equals(uid);
+ public void addListener(final KurentoHandler h, Client c, String
sdpOffer) {
+ final boolean self = c.getUid().equals(uid);
log.info("USER {}: have started {} in room {}", uid, self ?
"broadcasting" : "receiving", roomId);
- log.trace("USER {}: SdpOffer is {}",
[jira] [Commented] (OPENMEETINGS-1945) When clic pause video button become white window only if mouse is over it
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1945?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16639904#comment-16639904 ] Alvaro commented on OPENMEETINGS-1945: -- ...continue the same in OM 4.0.6 Snapshot 457 > When clic pause video button become white window only if mouse is over it > -- > > Key: OPENMEETINGS-1945 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1945 > Project: Openmeetings > Issue Type: Bug > Environment: Debian 9 >Reporter: Alvaro >Assignee: Maxim Solodovnik >Priority: Minor > Attachments: OM 406 Snapshot 456.mp4 > > > OM4.0.6 Snapshot 456 > When clic pause video button become white window, only if mouse is over it. > Please take a look the attached video. > Alvaro > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Created] (OPENMEETINGS-1946) When recording with audio and later play it there is no audio
Alvaro created OPENMEETINGS-1946: Summary: When recording with audio and later play it there is no audio Key: OPENMEETINGS-1946 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1946 Project: Openmeetings Issue Type: Bug Environment: Debian 9 Reporter: Alvaro Assignee: Maxim Solodovnik OM 4.0.6 Snapshot #457 When make a recording with microfon, in moitor WB is a graphic signal, but later when play there is no audio. Is the same in: [https://om.alteametasoft.com:8443/next] -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1649] more work on turn support
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 379283f [OPENMEETINGS-1649] more work on turn support
379283f is described below
commit 379283f8d5a8beceb7c50fc6577b7e352899ec17
Author: Maxim Solodovnik
AuthorDate: Fri Oct 5 17:49:08 2018 +0700
[OPENMEETINGS-1649] more work on turn support
---
.../apache/openmeetings/core/remote/KStream.java | 1 +
.../openmeetings/core/remote/KurentoHandler.java | 5 +
.../org/apache/openmeetings/util/OmFileHelper.java | 3 +--
.../apache/openmeetings/web/room/RoomPanel.java| 8 ++-
.../openmeetings/web/room/raw-video-manager.js | 25 --
.../org/apache/openmeetings/web/room/raw-video.js | 24 +++--
6 files changed, 41 insertions(+), 25 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index 835cb6a..7cc0df5 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -89,6 +89,7 @@ public class KStream implements IKStream {
WebSocketHelper.sendRoom(new TextRoomMessage(c.getRoomId(), c,
RoomMessage.Type.rightUpdated, c.getUid()));
WebSocketHelper.sendRoomOthers(roomId, uid, newKurentoMsg()
.put("id", "newStream")
+ .put("iceServers", h.getTurnServers())
.put("client", c.toJson(false).put("type",
"room"))); // FIXME TODO add multi-stream support
return this;
}
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
index 12fac99..15da866 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
@@ -259,6 +259,7 @@ public class KurentoHandler {
.put("id", "broadcast")
.put("uid", sd.getUid())
.put("stream", new
JSONObject(sd))
+ .put("iceServers",
getTurnServers(false))
.put("client",
c.toJson(true).put("type", "room"))); // FIXME TODO add multi-stream support
//FIXME TODO update interview buttons
} else {
@@ -383,6 +384,10 @@ public class KurentoHandler {
return r;
}
+ public JSONArray getTurnServers() {
+ return getTurnServers(false);
+ }
+
private JSONArray getTurnServers(final boolean test) {
JSONArray arr = new JSONArray();
if (!Strings.isEmpty(turnUrl)) {
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
index 8a29957..482ba40 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
@@ -180,8 +180,7 @@ public class OmFileHelper {
}
public static File getStreamsDir() {
- //FIXME TODO return getDir(OmFileHelper.omHome, STREAMS_DIR);
- return new File(System.getProperty("java.io.tmpdir"),
STREAMS_DIR);
+ return getDir(OmFileHelper.omHome, STREAMS_DIR);
}
public static File getStreamsHibernateDir() {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 4d30f1e..2533e9d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
+import org.apache.openmeetings.core.remote.KurentoHandler;
import org.apache.openmeetings.core.util.WebSocketHelper;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
@@ -167,7 +168,10 @@ public class RoomPanel extends BasePanel {
for (Client c: cm.listByRoom(getRoom().getId())) {
//FIXME TODO add multiple streams support
[jira] [Commented] (OPENMEETINGS-1649) HTML5 video need to be implemented
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1649?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16639651#comment-16639651 ] ASF subversion and git services commented on OPENMEETINGS-1649: --- Commit 379283f8d5a8beceb7c50fc6577b7e352899ec17 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=379283f ] [OPENMEETINGS-1649] more work on turn support > HTML5 video need to be implemented > -- > > Key: OPENMEETINGS-1649 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1649 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.0.0 > > > Flex video in room should be replaced with HTML5 video -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Created] (OPENMEETINGS-1945) When clic pause video button become white window only if mouse is over it
Alvaro created OPENMEETINGS-1945: Summary: When clic pause video button become white window only if mouse is over it Key: OPENMEETINGS-1945 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1945 Project: Openmeetings Issue Type: Bug Environment: Debian 9 Reporter: Alvaro Assignee: Maxim Solodovnik Attachments: OM 406 Snapshot 456.mp4 OM4.0.6 Snapshot 456 When clic pause video button become white window, only if mouse is over it. Please take a look the attached video. Alvaro -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Resolved] (OPENMEETINGS-1944) Bug various
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1944?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-1944. Resolution: Fixed > Bug various > --- > > Key: OPENMEETINGS-1944 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1944 > Project: Openmeetings > Issue Type: Bug > Components: Audio/Video >Affects Versions: 4.0.6 >Reporter: Alvaro >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > Attachments: Arrows blink.png, odt file upload error.png > > > Snapshot 451 OM 4.0.6 > 4.0.6-SNAPSHOT 870f381 2018-10-01T15:13:52Z > 1) > --- "Public Conference Room" --- > # When drop a video (recorded in OM or not) to > whiteboard, can't play (mp4 or avi). > # When upload a odt file give an error (attached picture). > 2) > --- "Public Presentation Room" --- > # When drop a video to whiteboard can't play. > # If press wheel configuration (cam and mic), the browser > become blocked and i must reboot the machine. > 3) > --- "Public Video and Whiteboard Room" --- > # When drop video to whiteboard only play once. The second > time do nothing. > 4) > --- "Public Video only Room" --- > # If drop video to whiteboard do nothing (maybe this is the right?) > 5) > In any room the arrows in the top-up center-left blink, > when i do nothing. (Attached picture). -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (OPENMEETINGS-1928) Library versions need to be updated (4.0.6)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1928?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16639460#comment-16639460 ] ASF subversion and git services commented on OPENMEETINGS-1928: --- Commit fb79206b7e172f4731a160d2e18270ae4c9cb02c in openmeetings's branch refs/heads/4.0.x from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=fb79206 ] [OPENMEETINGS-1928] pdfbox was updated > Library versions need to be updated (4.0.6) > --- > > Key: OPENMEETINGS-1928 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1928 > Project: Openmeetings > Issue Type: Task > Components: BuildsAndReleases >Affects Versions: 4.0.6 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 4.0.6 > > > Library versions need to be updated -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[openmeetings] branch master updated: [OPENMEETINGS-1859] redundant dependency is removed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 8de7fbd [OPENMEETINGS-1859] redundant dependency is removed
8de7fbd is described below
commit 8de7fbd4e5f076e4a2cea732b2eeea879fde5ee6
Author: Maxim Solodovnik
AuthorDate: Fri Oct 5 14:47:30 2018 +0700
[OPENMEETINGS-1859] redundant dependency is removed
---
openmeetings-web/pom.xml | 5 -
.../src/main/webapp/WEB-INF/classes/applicationContext.xml | 12 ++--
pom.xml | 1 -
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 1033e00..8ff7e9f 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -715,11 +715,6 @@
test
- org.apache.pdfbox
- pdfbox
- ${pdfbox.version}
-
-
org.apache.tomcat.embed
tomcat-embed-websocket
${tomcat.version}
diff --git
a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
index 8199493..b9b33cc 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
@@ -140,12 +140,12 @@
diff --git a/pom.xml b/pom.xml
index 898c89f..3e84b47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,6 @@
2.6
8.0.11
6.2.1.jre8
- 2.0.11
4.2
1.4.10
2.0.0.AM2
[openmeetings] branch master updated: [OPENMEETINGS-1649] test record/play seems to work
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 6f6f03f [OPENMEETINGS-1649] test record/play seems to work
6f6f03f is described below
commit 6f6f03ff24db05c4044093f1592e96622bfc84b0
Author: Maxim Solodovnik
AuthorDate: Fri Oct 5 14:13:16 2018 +0700
[OPENMEETINGS-1649] test record/play seems to work
---
.../openmeetings/core/remote/KTestStream.java | 48 +++---
.../openmeetings/core/remote/KurentoHandler.java | 191 +++--
.../apache/openmeetings/web/room/raw-settings.js | 18 +-
.../apache/openmeetings/web/room/raw-video-util.js | 6 +
4 files changed, 139 insertions(+), 124 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestStream.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestStream.java
index ab034ed..4e23dd5 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestStream.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestStream.java
@@ -25,6 +25,7 @@ import static
org.apache.openmeetings.util.OmFileHelper.getStreamsDir;
import java.io.File;
import java.io.IOException;
+import java.util.UUID;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
@@ -40,6 +41,7 @@ import org.kurento.client.IceCandidate;
import org.kurento.client.IceCandidateFoundEvent;
import org.kurento.client.MediaPipeline;
import org.kurento.client.MediaProfileSpecType;
+import org.kurento.client.MediaSessionStartedEvent;
import org.kurento.client.MediaType;
import org.kurento.client.PlayerEndpoint;
import org.kurento.client.RecorderEndpoint;
@@ -68,8 +70,7 @@ public class KTestStream implements IKStream {
webRtcEndpoint.connect(webRtcEndpoint);
MediaProfileSpecType profile = getProfile(msg);
- //FIXME TODO generated file uid
- initRecPath(_c.getUid());
+ initRecPath();
recorder = new RecorderEndpoint.Builder(pipeline, recPath)
.stopOnEndOfStream()
.withMediaProfile(profile).build();
@@ -110,11 +111,9 @@ public class KTestStream implements IKStream {
break;
}
- // 3. SDP negotiation
String sdpOffer = msg.getString("sdpOffer");
String sdpAnswer = webRtcEndpoint.processOffer(sdpOffer);
- // 4. Gather ICE candidates
addIceListener(_c);
WebSocketHelper.sendClient(_c, newTestKurentoMsg()
@@ -136,38 +135,37 @@ public class KTestStream implements IKStream {
}
public void play(final IWsClient _c, JSONObject msg, MediaPipeline
pipeline) {
- // 1. Media logic
this.pipeline = pipeline;
webRtcEndpoint = new WebRtcEndpoint.Builder(pipeline).build();
player = new PlayerEndpoint.Builder(pipeline, recPath).build();
player.connect(webRtcEndpoint);
-
- // Player listeners
- player.addErrorListener(new EventListener() {
+ webRtcEndpoint.addMediaSessionStartedListener(new
EventListener() {
@Override
- public void onEvent(ErrorEvent event) {
- log.info("ErrorEvent for player with uid '{}':
{}", _c.getUid(), event.getDescription());
- sendPlayEnd(_c);
- }
- });
- player.addEndOfStreamListener(new
EventListener() {
- @Override
- public void onEvent(EndOfStreamEvent event) {
- log.info("EndOfStreamEvent for player with uid
'{}'", _c.getUid());
- sendPlayEnd(_c);
+ public void onEvent(MediaSessionStartedEvent event) {
+ log.info("Media session started {}", event);
+ player.addErrorListener(new
EventListener() {
+ @Override
+ public void onEvent(ErrorEvent event) {
+ log.info("ErrorEvent for player
with uid '{}': {}", _c.getUid(), event.getDescription());
+ sendPlayEnd(_c);
+ }
+ });
+ player.addEndOfStreamListener(new
EventListener() {
+ @Override
+ public void
[jira] [Commented] (OPENMEETINGS-1649) HTML5 video need to be implemented
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1649?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16639366#comment-16639366 ] ASF subversion and git services commented on OPENMEETINGS-1649: --- Commit 6f6f03ff24db05c4044093f1592e96622bfc84b0 in openmeetings's branch refs/heads/master from [~solomax] [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=6f6f03f ] [OPENMEETINGS-1649] test record/play seems to work > HTML5 video need to be implemented > -- > > Key: OPENMEETINGS-1649 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1649 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Room >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 5.0.0 > > > Flex video in room should be replaced with HTML5 video -- This message was sent by Atlassian JIRA (v7.6.3#76005)
