Author: solomax
Date: Wed Dec 7 05:44:52 2016
New Revision: 1773012
URL: http://svn.apache.org/viewvc?rev=1773012&view=rev
Log:
[OPENMEETINGS-1518] ogg conversion is dropped
Removed:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/OggRecordingResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/OggRecordingResourceReference.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/OggRecordingResourceReference.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
openmeetings/application/branches/3.1.x/pom.xml
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
openmeetings/application/branches/3.2.x/pom.xml
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
openmeetings/application/trunk/pom.xml
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
Wed Dec 7 05:44:52 2016
@@ -22,7 +22,6 @@ import static org.apache.openmeetings.co
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
import static org.apache.openmeetings.util.OmFileHelper.FLV_EXTENSION;
import static org.apache.openmeetings.util.OmFileHelper.MP4_EXTENSION;
-import static org.apache.openmeetings.util.OmFileHelper.OGG_EXTENSION;
import static org.apache.openmeetings.util.OmFileHelper.getRecording;
import static org.apache.openmeetings.util.OmFileHelper.getRecordingMetaData;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsSubDir;
@@ -360,15 +359,5 @@ public abstract class BaseConverter {
mp4path
};
returnLog.add(ProcessHelper.executeScript("generate MP4",
argv));
-
- argv = new String[] {
- getPathToFFMPEG(), "-y",
- "-i", mp4path,
- "-vcodec", "libtheora",
- "-acodec", "libvorbis",
- path + OGG_EXTENSION
- };
-
- returnLog.add(ProcessHelper.executeScript("generate OGG",
argv));
}
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
Wed Dec 7 05:44:52 2016
@@ -22,7 +22,6 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.time.Duration;
@@ -289,9 +288,6 @@ public class RecordingDao {
if (r.exists(EXTENSION_MP4)) {
size += r.getFile(EXTENSION_MP4).length();
}
- if (r.exists(EXTENSION_OGG)) {
- size += r.getFile(EXTENSION_OGG).length();
- }
for (Recording rec : getByParent(r.getId())) {
size += getSize(rec);
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
Wed Dec 7 05:44:52 2016
@@ -20,7 +20,6 @@ package org.apache.openmeetings.db.entit
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
import static org.apache.openmeetings.util.OmFileHelper.getRecording;
import static org.apache.openmeetings.util.OmFileHelper.recordingFileName;
@@ -315,8 +314,6 @@ public class Recording extends FileItem
f = getRecording(String.format("%s%s.%s",
recordingFileName, id, EXTENSION_FLV));
} else if (EXTENSION_AVI.equals(ext)) {
f = getRecording(String.format("%s%s.%s",
recordingFileName, id, EXTENSION_AVI));
- } else if (EXTENSION_OGG.equals(ext)) {
- f = getRecording(String.format("%s%s.%s.%s",
recordingFileName, id, EXTENSION_FLV, EXTENSION_OGG));
}
}
return f;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
Wed Dec 7 05:44:52 2016
@@ -21,7 +21,6 @@ package org.apache.openmeetings.service.
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -113,7 +112,6 @@ public class CleanupJob extends Abstract
rec.getFile(EXTENSION_MP4).delete();
rec.getFile(EXTENSION_FLV).delete();
rec.getFile(EXTENSION_AVI).delete();
- rec.getFile(EXTENSION_OGG).delete();
recordingDao.delete(rec);
}
});
Modified:
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
Wed Dec 7 05:44:52 2016
@@ -80,13 +80,11 @@ public class OmFileHelper {
public static final String EXTENSION_FLV = "flv";
public static final String EXTENSION_MP4 = "mp4";
public static final String EXTENSION_AVI = "avi";
- public static final String EXTENSION_OGG = "ogg";
public static final String EXTENSION_JPG = "jpg";
public static final String EXTENSION_SWF = "swf";
public static final String WML_EXTENSION = "." + EXTENSION_WML;
public static final String FLV_EXTENSION = "." + EXTENSION_FLV;
public static final String MP4_EXTENSION = "." + EXTENSION_MP4;
- public static final String OGG_EXTENSION = "." + EXTENSION_OGG;
public static final String JPG_EXTENSION = "." + EXTENSION_JPG;
public static final String WB_VIDEO_FILE_PREFIX = "UPLOADFLV_";
public static final String FLV_MIME_TYPE = "video/" + EXTENSION_FLV;
@@ -218,11 +216,7 @@ public class OmFileHelper {
public static File getMp4Recording(String name) {
return getRecording(name + MP4_EXTENSION);
}
-
- public static File getOggRecording(String name) {
- return getRecording(name + OGG_EXTENSION);
- }
-
+
public static File getStreamsSubDir(Long id) {
return getDir(getStreamsDir(), id.toString());
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Wed Dec 7 05:44:52 2016
@@ -65,7 +65,6 @@ import org.apache.openmeetings.web.user.
import org.apache.openmeetings.web.user.record.FlvRecordingResourceReference;
import org.apache.openmeetings.web.user.record.JpgRecordingResourceReference;
import org.apache.openmeetings.web.user.record.Mp4RecordingResourceReference;
-import org.apache.openmeetings.web.user.record.OggRecordingResourceReference;
import org.apache.openmeetings.web.util.GroupLogoResourceReference;
import org.apache.openmeetings.web.util.ProfileImageResourceReference;
import org.apache.openmeetings.web.util.UserDashboardPersister;
@@ -152,7 +151,6 @@ public class Application extends Authent
mountResource("/recordings/avi/${id}", new
AviRecordingResourceReference());
mountResource("/recordings/flv/${id}", new
FlvRecordingResourceReference());
mountResource("/recordings/mp4/${id}", new
Mp4RecordingResourceReference());
- mountResource("/recordings/ogg/${id}", new
OggRecordingResourceReference());
mountResource("/recordings/jpg/${id}", new
JpgRecordingResourceReference()); //should be in sync with VideoPlayer
mountResource("/profile/${id}", new
ProfileImageResourceReference());
mountResource("/group/${id}", new GroupLogoResourceReference());
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
Wed Dec 7 05:44:52 2016
@@ -36,10 +36,8 @@ public class VideoPlayer extends Panel {
private final WebMarkupContainer wait = new WebMarkupContainer("wait");
//FIXME not used
private final WebMarkupContainer container = new
WebMarkupContainer("container");
private final Mp4RecordingResourceReference mp4res = new
Mp4RecordingResourceReference();
- private final OggRecordingResourceReference oggres = new
OggRecordingResourceReference();
private final OmVideo player = new OmVideo("player", null);
private final Source mp4 = new Source("mp4", mp4res);
- private final Source ogg = new Source("ogg", oggres);
public VideoPlayer(String id) {
this(id, null);
@@ -50,9 +48,7 @@ public class VideoPlayer extends Panel {
add(container.setOutputMarkupPlaceholderTag(true));
mp4.setDisplayType(true);
mp4.setType(MP4_MIME_TYPE);
- ogg.setDisplayType(true);
- ogg.setType("video/ogg");
- player.add(mp4, ogg);
+ player.add(mp4);
container.add(wait.setVisible(false), player);
update(null, r);
}
@@ -62,7 +58,6 @@ public class VideoPlayer extends Panel {
if (videoExists) {
PageParameters pp = new PageParameters().add("id",
r.getId());
mp4.setPageParameters(pp);
- ogg.setPageParameters(pp);
player.recId = r.getId();
}
container.setVisible(videoExists);
Modified: openmeetings/application/branches/3.1.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Wed Dec 7 05:44:52 2016
@@ -981,7 +981,7 @@
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
-
<versionRange>[3.4,)</versionRange>
+
<versionRange>[3.3,)</versionRange>
<goals>
<goal>site</goal>
</goals>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
Wed Dec 7 05:44:52 2016
@@ -20,7 +20,6 @@ package org.apache.openmeetings.core.con
import static
org.apache.openmeetings.core.data.record.listener.async.BaseStreamWriter.TIME_TO_WAIT_FOR_FRAME;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG;
import static org.apache.openmeetings.util.OmFileHelper.getRecordingMetaData;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsSubDir;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -355,15 +354,5 @@ public abstract class BaseConverter {
mp4.getCanonicalPath()
};
returnLog.add(ProcessHelper.executeScript("generate MP4",
argv));
-
- argv = new String[] {
- getPathToFFMPEG(), "-y"
- , "-i", mp4.getCanonicalPath()
- , "-vcodec", "libtheora"
- , "-acodec", "libvorbis"
- , r.getFile(EXTENSION_OGG).getCanonicalPath()
- };
-
- returnLog.add(ProcessHelper.executeScript("generate OGG",
argv));
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
Wed Dec 7 05:44:52 2016
@@ -18,9 +18,10 @@
*/
package org.apache.openmeetings.core.converter;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
-import static org.apache.openmeetings.util.OmFileHelper.recordingFileName;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -67,7 +68,6 @@ public class RecordingConverter extends
FFMPEG_MAP_PARAM = ".";
}
- String finalNamePrefix = recordingFileName + id;
log.debug("recording " + r.getId());
List<ConverterProcessResult> logs = new ArrayList<>();
@@ -159,7 +159,7 @@ public class RecordingConverter extends
// ffmpeg -i movie.flv -vcodec mjpeg -vframes 1 -an -f
rawvideo -s
// 320x240 movie.jpg
- File jpg = new File(getStreamsHibernateDir(),
finalNamePrefix + ".jpg");
+ File jpg = r.getFile(EXTENSION_JPG);
String[] cmdJpg = new String[] { //
getPathToFFMPEG(), "-y",//
@@ -172,7 +172,7 @@ public class RecordingConverter extends
logs.add(ProcessHelper.executeScript("previewFullFLV",
cmdJpg));
- File avi = new File(getStreamsHibernateDir(),
finalNamePrefix + ".avi");
+ File avi = r.getFile(EXTENSION_AVI);
String[] cmdAvi = new String[] { getPathToFFMPEG(),
"-y", "-i", flv.getCanonicalPath(), "-vcodec",
"copy", avi.getCanonicalPath() };
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
Wed Dec 7 05:44:52 2016
@@ -22,7 +22,6 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.time.Duration;
@@ -289,9 +288,6 @@ public class RecordingDao {
if (r.exists(EXTENSION_MP4)) {
size += r.getFile(EXTENSION_MP4).length();
}
- if (r.exists(EXTENSION_OGG)) {
- size += r.getFile(EXTENSION_OGG).length();
- }
for (Recording rec : getByParent(r.getId())) {
size += getSize(rec);
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Wed Dec 7 05:44:52 2016
@@ -28,7 +28,6 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG;
import static org.apache.openmeetings.util.OmFileHelper.FILES_DIR;
import static org.apache.openmeetings.util.OmFileHelper.PROFILES_DIR;
import static org.apache.openmeetings.util.OmFileHelper.getFileName;
@@ -560,7 +559,6 @@ public class BackupImport {
fileMap.put(String.format("%s.%s",
name, EXTENSION_AVI), String.format("%s.%s", r.getHash(), EXTENSION_AVI));
fileMap.put(String.format("%s.%s",
name, EXTENSION_JPG), String.format("%s.%s", r.getHash(), EXTENSION_JPG));
fileMap.put(String.format("%s.%s.%s",
name, EXTENSION_FLV, EXTENSION_MP4), String.format("%s.%s", r.getHash(),
EXTENSION_MP4));
- fileMap.put(String.format("%s.%s.%s",
name, EXTENSION_FLV, EXTENSION_OGG), String.format("%s.%s", r.getHash(),
EXTENSION_OGG));
}
recordingDao.update(r);
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
Wed Dec 7 05:44:52 2016
@@ -21,7 +21,6 @@ package org.apache.openmeetings.service.
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -113,7 +112,6 @@ public class CleanupJob extends Abstract
rec.getFile(EXTENSION_MP4).delete();
rec.getFile(EXTENSION_FLV).delete();
rec.getFile(EXTENSION_AVI).delete();
- rec.getFile(EXTENSION_OGG).delete();
recordingDao.delete(rec);
}
});
Modified:
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
Wed Dec 7 05:44:52 2016
@@ -64,7 +64,6 @@ public class OmFileHelper {
public static final String EXTENSION_FLV = "flv";
public static final String EXTENSION_MP4 = "mp4";
public static final String EXTENSION_AVI = "avi";
- public static final String EXTENSION_OGG = "ogg";
public static final String EXTENSION_JPG = "jpg";
public static final String EXTENSION_SWF = "swf";
public static final String EXTENSION_PDF = "pdf";
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Wed Dec 7 05:44:52 2016
@@ -69,7 +69,6 @@ import org.apache.openmeetings.web.user.
import org.apache.openmeetings.web.user.record.FlvRecordingResourceReference;
import org.apache.openmeetings.web.user.record.JpgRecordingResourceReference;
import org.apache.openmeetings.web.user.record.Mp4RecordingResourceReference;
-import org.apache.openmeetings.web.user.record.OggRecordingResourceReference;
import org.apache.openmeetings.web.util.GroupLogoResourceReference;
import org.apache.openmeetings.web.util.ProfileImageResourceReference;
import org.apache.openmeetings.web.util.UserDashboardPersister;
@@ -114,7 +113,8 @@ public class Application extends Authent
STRINGS_WITH_APP.addAll(Arrays.asList("499", "500", "506",
"511", "512", "513", "517", "532", "622", "804"
, "909", "952", "978", "981", "984", "989",
"990", "999", "1151", "1155", "1157", "1158", "1194"));
}
-
+ public static final String HASH_MAPPING = "/hash";
+
@Override
protected void init() {
wicketApplicationName = super.getName();
@@ -145,7 +145,7 @@ public class Application extends Authent
getRootRequestMapperAsCompound().add(new
NoVersionMapper(getHomePage()));
getRootRequestMapperAsCompound().add(new
NoVersionMapper("notinited", NotInitedPage.class));
- getRootRequestMapperAsCompound().add(new
NoVersionMapper("/hash", HashPage.class));
+ getRootRequestMapperAsCompound().add(new
NoVersionMapper(HASH_MAPPING, HashPage.class));
getRootRequestMapperAsCompound().add(new
NoVersionMapper("signin", getSignInPageClass()));
mountPage("install", InstallWizardPage.class);
mountPage("activate", ActivatePage.class);
@@ -153,7 +153,6 @@ public class Application extends Authent
mountResource("/recordings/avi/${id}", new
AviRecordingResourceReference());
mountResource("/recordings/flv/${id}", new
FlvRecordingResourceReference());
mountResource("/recordings/mp4/${id}", new
Mp4RecordingResourceReference());
- mountResource("/recordings/ogg/${id}", new
OggRecordingResourceReference());
mountResource("/recordings/jpg/${id}", new
JpgRecordingResourceReference()); //should be in sync with VideoPlayer
mountResource("/room/file/${id}", new RoomResourceReference());
mountResource("/profile/${id}", new
ProfileImageResourceReference());
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
Wed Dec 7 05:44:52 2016
@@ -24,7 +24,6 @@
<div wicket:id="wait"></div>
<video wicket:id="player">
<source wicket:id="mp4" />
- <source wicket:id="ogg" />
</video>
</div>
</wicket:panel>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
Wed Dec 7 05:44:52 2016
@@ -36,10 +36,8 @@ public class VideoPlayer extends Panel {
private final WebMarkupContainer wait = new WebMarkupContainer("wait");
//FIXME not used
private final WebMarkupContainer container = new
WebMarkupContainer("container");
private final Mp4RecordingResourceReference mp4res = new
Mp4RecordingResourceReference();
- private final OggRecordingResourceReference oggres = new
OggRecordingResourceReference();
private final OmVideo player = new OmVideo("player", null);
private final Source mp4 = new Source("mp4", mp4res);
- private final Source ogg = new Source("ogg", oggres);
public VideoPlayer(String id) {
this(id, null);
@@ -50,9 +48,7 @@ public class VideoPlayer extends Panel {
add(container.setOutputMarkupPlaceholderTag(true));
mp4.setDisplayType(true);
mp4.setType(MP4_MIME_TYPE);
- ogg.setDisplayType(true);
- ogg.setType("video/ogg");
- player.add(mp4, ogg);
+ player.add(mp4);
container.add(wait.setVisible(false), player);
update(null, r);
}
@@ -62,7 +58,6 @@ public class VideoPlayer extends Panel {
if (videoExists) {
PageParameters pp = new PageParameters().add("id",
r.getId());
mp4.setPageParameters(pp);
- ogg.setPageParameters(pp);
player.recId = r.getId();
}
container.setVisible(videoExists);
Modified: openmeetings/application/branches/3.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/pom.xml?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/pom.xml Wed Dec 7 05:44:52 2016
@@ -969,7 +969,7 @@
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
-
<versionRange>[3.4,)</versionRange>
+
<versionRange>[3.3,)</versionRange>
<goals>
<goal>site</goal>
</goals>
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java
Wed Dec 7 05:44:52 2016
@@ -20,7 +20,6 @@ package org.apache.openmeetings.core.con
import static
org.apache.openmeetings.core.data.record.listener.async.BaseStreamWriter.TIME_TO_WAIT_FOR_FRAME;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG;
import static org.apache.openmeetings.util.OmFileHelper.getRecordingMetaData;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsSubDir;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
@@ -355,15 +354,5 @@ public abstract class BaseConverter {
mp4.getCanonicalPath()
};
returnLog.add(ProcessHelper.executeScript("generate MP4",
argv));
-
- argv = new String[] {
- getPathToFFMPEG(), "-y"
- , "-i", mp4.getCanonicalPath()
- , "-vcodec", "libtheora"
- , "-acodec", "libvorbis"
- , r.getFile(EXTENSION_OGG).getCanonicalPath()
- };
-
- returnLog.add(ProcessHelper.executeScript("generate OGG",
argv));
}
}
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
Wed Dec 7 05:44:52 2016
@@ -18,9 +18,10 @@
*/
package org.apache.openmeetings.core.converter;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
+import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
-import static org.apache.openmeetings.util.OmFileHelper.recordingFileName;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -67,7 +68,6 @@ public class RecordingConverter extends
FFMPEG_MAP_PARAM = ".";
}
- String finalNamePrefix = recordingFileName + id;
log.debug("recording " + r.getId());
List<ConverterProcessResult> logs = new ArrayList<>();
@@ -159,7 +159,7 @@ public class RecordingConverter extends
// ffmpeg -i movie.flv -vcodec mjpeg -vframes 1 -an -f
rawvideo -s
// 320x240 movie.jpg
- File jpg = new File(getStreamsHibernateDir(),
finalNamePrefix + ".jpg");
+ File jpg = r.getFile(EXTENSION_JPG);
String[] cmdJpg = new String[] { //
getPathToFFMPEG(), "-y",//
@@ -172,7 +172,7 @@ public class RecordingConverter extends
logs.add(ProcessHelper.executeScript("previewFullFLV",
cmdJpg));
- File avi = new File(getStreamsHibernateDir(),
finalNamePrefix + ".avi");
+ File avi = r.getFile(EXTENSION_AVI);
String[] cmdAvi = new String[] { getPathToFFMPEG(),
"-y", "-i", flv.getCanonicalPath(), "-vcodec",
"copy", avi.getCanonicalPath() };
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java
Wed Dec 7 05:44:52 2016
@@ -22,7 +22,6 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.time.Duration;
@@ -289,9 +288,6 @@ public class RecordingDao {
if (r.exists(EXTENSION_MP4)) {
size += r.getFile(EXTENSION_MP4).length();
}
- if (r.exists(EXTENSION_OGG)) {
- size += r.getFile(EXTENSION_OGG).length();
- }
for (Recording rec : getByParent(r.getId())) {
size += getSize(rec);
}
Modified:
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
(original)
+++
openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
Wed Dec 7 05:44:52 2016
@@ -28,7 +28,6 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_JPG;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG;
import static org.apache.openmeetings.util.OmFileHelper.FILES_DIR;
import static org.apache.openmeetings.util.OmFileHelper.PROFILES_DIR;
import static org.apache.openmeetings.util.OmFileHelper.getFileName;
@@ -560,7 +559,6 @@ public class BackupImport {
fileMap.put(String.format("%s.%s",
name, EXTENSION_AVI), String.format("%s.%s", r.getHash(), EXTENSION_AVI));
fileMap.put(String.format("%s.%s",
name, EXTENSION_JPG), String.format("%s.%s", r.getHash(), EXTENSION_JPG));
fileMap.put(String.format("%s.%s.%s",
name, EXTENSION_FLV, EXTENSION_MP4), String.format("%s.%s", r.getHash(),
EXTENSION_MP4));
- fileMap.put(String.format("%s.%s.%s",
name, EXTENSION_FLV, EXTENSION_OGG), String.format("%s.%s", r.getHash(),
EXTENSION_OGG));
}
recordingDao.update(r);
}
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/CleanupJob.java
Wed Dec 7 05:44:52 2016
@@ -21,7 +21,6 @@ package org.apache.openmeetings.service.
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_AVI;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_FLV;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
-import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_OGG;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -113,7 +112,6 @@ public class CleanupJob extends Abstract
rec.getFile(EXTENSION_MP4).delete();
rec.getFile(EXTENSION_FLV).delete();
rec.getFile(EXTENSION_AVI).delete();
- rec.getFile(EXTENSION_OGG).delete();
recordingDao.delete(rec);
}
});
Modified:
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
(original)
+++
openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
Wed Dec 7 05:44:52 2016
@@ -64,7 +64,6 @@ public class OmFileHelper {
public static final String EXTENSION_FLV = "flv";
public static final String EXTENSION_MP4 = "mp4";
public static final String EXTENSION_AVI = "avi";
- public static final String EXTENSION_OGG = "ogg";
public static final String EXTENSION_JPG = "jpg";
public static final String EXTENSION_SWF = "swf";
public static final String EXTENSION_PDF = "pdf";
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Wed Dec 7 05:44:52 2016
@@ -69,7 +69,6 @@ import org.apache.openmeetings.web.user.
import org.apache.openmeetings.web.user.record.FlvRecordingResourceReference;
import org.apache.openmeetings.web.user.record.JpgRecordingResourceReference;
import org.apache.openmeetings.web.user.record.Mp4RecordingResourceReference;
-import org.apache.openmeetings.web.user.record.OggRecordingResourceReference;
import org.apache.openmeetings.web.util.GroupLogoResourceReference;
import org.apache.openmeetings.web.util.ProfileImageResourceReference;
import org.apache.openmeetings.web.util.UserDashboardPersister;
@@ -114,7 +113,8 @@ public class Application extends Authent
STRINGS_WITH_APP.addAll(Arrays.asList("499", "500", "506",
"511", "512", "513", "517", "532", "622", "804"
, "909", "952", "978", "981", "984", "989",
"990", "999", "1151", "1155", "1157", "1158", "1194"));
}
-
+ public static final String HASH_MAPPING = "/hash";
+
@Override
protected void init() {
wicketApplicationName = super.getName();
@@ -145,7 +145,7 @@ public class Application extends Authent
getRootRequestMapperAsCompound().add(new
NoVersionMapper(getHomePage()));
getRootRequestMapperAsCompound().add(new
NoVersionMapper("notinited", NotInitedPage.class));
- getRootRequestMapperAsCompound().add(new
NoVersionMapper("/hash", HashPage.class));
+ getRootRequestMapperAsCompound().add(new
NoVersionMapper(HASH_MAPPING, HashPage.class));
getRootRequestMapperAsCompound().add(new
NoVersionMapper("signin", getSignInPageClass()));
mountPage("install", InstallWizardPage.class);
mountPage("activate", ActivatePage.class);
@@ -153,7 +153,6 @@ public class Application extends Authent
mountResource("/recordings/avi/${id}", new
AviRecordingResourceReference());
mountResource("/recordings/flv/${id}", new
FlvRecordingResourceReference());
mountResource("/recordings/mp4/${id}", new
Mp4RecordingResourceReference());
- mountResource("/recordings/ogg/${id}", new
OggRecordingResourceReference());
mountResource("/recordings/jpg/${id}", new
JpgRecordingResourceReference()); //should be in sync with VideoPlayer
mountResource("/room/file/${id}", new RoomResourceReference());
mountResource("/profile/${id}", new
ProfileImageResourceReference());
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
Wed Dec 7 05:44:52 2016
@@ -24,7 +24,6 @@
<div wicket:id="wait"></div>
<video wicket:id="player">
<source wicket:id="mp4" />
- <source wicket:id="ogg" />
</video>
</div>
</wicket:panel>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
Wed Dec 7 05:44:52 2016
@@ -36,10 +36,8 @@ public class VideoPlayer extends Panel {
private final WebMarkupContainer wait = new WebMarkupContainer("wait");
//FIXME not used
private final WebMarkupContainer container = new
WebMarkupContainer("container");
private final Mp4RecordingResourceReference mp4res = new
Mp4RecordingResourceReference();
- private final OggRecordingResourceReference oggres = new
OggRecordingResourceReference();
private final OmVideo player = new OmVideo("player", null);
private final Source mp4 = new Source("mp4", mp4res);
- private final Source ogg = new Source("ogg", oggres);
public VideoPlayer(String id) {
this(id, null);
@@ -50,9 +48,7 @@ public class VideoPlayer extends Panel {
add(container.setOutputMarkupPlaceholderTag(true));
mp4.setDisplayType(true);
mp4.setType(MP4_MIME_TYPE);
- ogg.setDisplayType(true);
- ogg.setType("video/ogg");
- player.add(mp4, ogg);
+ player.add(mp4);
container.add(wait.setVisible(false), player);
update(null, r);
}
@@ -62,7 +58,6 @@ public class VideoPlayer extends Panel {
if (videoExists) {
PageParameters pp = new PageParameters().add("id",
r.getId());
mp4.setPageParameters(pp);
- ogg.setPageParameters(pp);
player.recId = r.getId();
}
container.setVisible(videoExists);
Modified: openmeetings/application/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1773012&r1=1773011&r2=1773012&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Wed Dec 7 05:44:52 2016
@@ -969,7 +969,7 @@
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
-
<versionRange>[3.4,)</versionRange>
+
<versionRange>[3.3,)</versionRange>
<goals>
<goal>site</goal>
</goals>
