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 e2200fa [OPENMEETINGS-1854] test recordings are created with webm
codec
e2200fa is described below
commit e2200faa6195d9036007ddecdae8e777117babb9
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Thu Mar 22 12:05:10 2018 +0700
[OPENMEETINGS-1854] test recordings are created with webm codec
---
.../org/apache/openmeetings/core/remote/KTestUser.java | 16 ++++++++--------
openmeetings-server/src/site/xdoc/BuildInstructions.xml | 7 ++++---
.../java/org/apache/openmeetings/util/OmFileHelper.java | 3 ++-
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestUser.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestUser.java
index 7eb22cb..d371864 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestUser.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KTestUser.java
@@ -20,6 +20,7 @@ package org.apache.openmeetings.core.remote;
import static
org.apache.openmeetings.core.remote.KurentoHandler.newTestKurentoMsg;
import static org.apache.openmeetings.util.OmFileHelper.TEST_SETUP_PREFIX;
+import static org.apache.openmeetings.util.OmFileHelper.getStreamsDir;
import java.io.File;
import java.io.IOException;
@@ -85,14 +86,14 @@ public class KTestUser {
}
});
switch (profile) {
- case MP4:
+ case WEBM:
webRtcEndpoint.connect(recorder,
MediaType.AUDIO);
webRtcEndpoint.connect(recorder,
MediaType.VIDEO);
break;
- case MP4_AUDIO_ONLY:
+ case WEBM_AUDIO_ONLY:
webRtcEndpoint.connect(recorder,
MediaType.AUDIO);
break;
- case MP4_VIDEO_ONLY:
+ case WEBM_VIDEO_ONLY:
webRtcEndpoint.connect(recorder,
MediaType.VIDEO);
break;
default:
@@ -142,18 +143,17 @@ public class KTestUser {
private static MediaProfileSpecType getProfile(JSONObject msg) {
boolean a = msg.getBoolean("audio"), v =
msg.getBoolean("video");
if (a && v) {
- return MediaProfileSpecType.MP4;
+ return MediaProfileSpecType.WEBM;
} else if (v) {
- return MediaProfileSpecType.MP4_VIDEO_ONLY;
+ return MediaProfileSpecType.WEBM_VIDEO_ONLY;
} else {
- return MediaProfileSpecType.MP4_AUDIO_ONLY;
+ return MediaProfileSpecType.WEBM_AUDIO_ONLY;
}
}
private void initRecPath(String uid) {
try {
- //File f = new File(getStreamsDir(),
String.format("%s%s.mp4", TEST_SETUP_PREFIX, uid));
- File f = new File("/tmp/", String.format("%s%s.mp4",
TEST_SETUP_PREFIX, uid));
+ File f = new File(getStreamsDir(),
String.format("%s%s.webm", TEST_SETUP_PREFIX, uid));
recPath = String.format("file://%s",
f.getCanonicalPath());
log.info("Configured to record to {}", recPath);
} catch (IOException e) {
diff --git a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
index 672c5fe..d40dd6c 100644
--- a/openmeetings-server/src/site/xdoc/BuildInstructions.xml
+++ b/openmeetings-server/src/site/xdoc/BuildInstructions.xml
@@ -62,7 +62,8 @@
<source><![CDATA[
MAVEN_OPTS='-Xdebug
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n' mvn clean -P
allModules,quick,mysql jetty:run-exploded
-cd ..; mvn clean install -pl openmeetings-util -P allModules,quick; cd
openmeetings-web;
+#Quick rebuild and run
+cd ..; mvn clean install -PallModules,quick,mysql -pl
openmeetings-util,openmeetings-core; cd openmeetings-web; MAVEN_OPTS='-Xdebug
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n' mvn clean -P
allModules,quick,mysql jetty:run-exploded
]]></source>
<p>To compile only client you can run following
command: </p>
@@ -80,13 +81,13 @@ mvn clean install -P allModules,unpacked,mysql
-DskipTests=true -Dwicket.configu
<p>After modifications are made you can run
<i>"quick"</i> build: </p>
<source>
<![CDATA[
-mvn install -P allModules,quick,mysql -pl openmeetings-web -pl
openmeetings-server -Dwicket.configuration=DEVELOPMENT
+mvn install -P allModules,quick,mysql -pl openmeetings-web,openmeetings-server
-Dwicket.configuration=DEVELOPMENT
]]>
</source>
<p>Any number of projects can be specified during
build: </p>
<source>
<![CDATA[
-mvn install -P allModules,quick,mysql -pl openmeetings-util -pl
openmeetings-db -pl openmeetings-core -pl openmeetings-install -pl
openmeetings-service -pl openmeetings-web -pl openmeetings-server -pl
openmeetings-webservice -Dwicket.configuration=DEVELOPMENT
+mvn install -P allModules,quick,mysql -pl
openmeetings-util,openmeetings-db,openmeetings-core,openmeetings-install,openmeetings-service,openmeetings-web,openmeetings-server,openmeetings-webservice
-Dwicket.configuration=DEVELOPMENT
]]>
</source>
<div>
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 458ff51..00fd05f 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
@@ -176,7 +176,8 @@ public class OmFileHelper {
}
public static File getStreamsDir() {
- return getDir(OmFileHelper.omHome, STREAMS_DIR);
+ //FIXME TODO return getDir(OmFileHelper.omHome, STREAMS_DIR);
+ return new File(System.getProperty("java.io.tmpdir"),
STREAMS_DIR);
}
public static File getStreamsHibernateDir() {
--
To stop receiving notification emails like this one, please contact
[email protected].
