Author: solomax
Date: Tue Aug 9 14:56:01 2016
New Revision: 1755613
URL: http://svn.apache.org/viewvc?rev=1755613&view=rev
Log:
[OPENMEETINGS-652] wb video is being converted to mp4
Modified:
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/room/RoomResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.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/room/RoomResourceReference.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.java
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=1755613&r1=1755612&r2=1755613&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
Tue Aug 9 14:56:01 2016
@@ -77,6 +77,7 @@ public class OmFileHelper {
public static final String JPG_EXTENSION = ".jpg";
public static final String WB_VIDEO_FILE_PREFIX = "UPLOADFLV_";
public static final String FLV_MIME_TYPE = "video/flv";
+ public static final String MP4_MIME_TYPE = "video/mp4";
public static final String JPG_MIME_TYPE = "image/jpeg";
public static void setOmHome(File omHome) {
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java?rev=1755613&r1=1755612&r2=1755613&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
Tue Aug 9 14:56:01 2016
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.web.room;
-import static org.apache.openmeetings.util.OmFileHelper.FLV_MIME_TYPE;
-import static org.apache.openmeetings.util.OmFileHelper.FLV_EXTENSION;
+import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE;
+import static org.apache.openmeetings.util.OmFileHelper.MP4_EXTENSION;
import static org.apache.openmeetings.util.OmFileHelper.JPG_EXTENSION;
import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.WB_VIDEO_FILE_PREFIX;
@@ -65,7 +65,7 @@ public class RoomResourceReference exten
mime = "application/x-shockwave-flash";
break;
case Video:
- mime = preview ? JPG_MIME_TYPE : FLV_MIME_TYPE;
+ mime = preview ? JPG_MIME_TYPE : MP4_MIME_TYPE;
break;
default:
throw new RuntimeException("Not supported");
@@ -106,7 +106,7 @@ public class RoomResourceReference exten
}
break;
case Video: {
- result = new
File(OmFileHelper.getStreamsHibernateDir(), String.format("%s%s%s",
WB_VIDEO_FILE_PREFIX, r.getId(), preview ? JPG_EXTENSION : FLV_EXTENSION));
+ result = new
File(OmFileHelper.getStreamsHibernateDir(), String.format("%s%s%s",
WB_VIDEO_FILE_PREFIX, r.getId(), preview ? JPG_EXTENSION : MP4_EXTENSION));
break;
}
case Presentation: {
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java?rev=1755613&r1=1755612&r2=1755613&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java
Tue Aug 9 14:56:01 2016
@@ -19,6 +19,7 @@
package org.apache.openmeetings.web.user.record;
import static org.apache.openmeetings.util.OmFileHelper.MP4_EXTENSION;
+import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.getMp4Recording;
import java.io.File;
@@ -34,7 +35,7 @@ public class Mp4RecordingResourceReferen
@Override
public String getMimeType() {
- return "video/mp4";
+ return MP4_MIME_TYPE;
}
@Override
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=1755613&r1=1755612&r2=1755613&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
Tue Aug 9 14:56:01 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.user.record;
+import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.getMp4Recording;
import org.apache.openmeetings.db.entity.record.Recording;
@@ -49,7 +50,7 @@ public class VideoPlayer extends Panel {
super(id);
add(container.setOutputMarkupPlaceholderTag(true));
mp4.setDisplayType(true);
- mp4.setType("video/mp4");
+ mp4.setType(MP4_MIME_TYPE);
ogg.setDisplayType(true);
ogg.setType("video/ogg");
player.add(mp4, ogg);
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1755613&r1=1755612&r2=1755613&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
Tue Aug 9 14:56:01 2016
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.core.converter;
-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.JPG_EXTENSION;
import static org.apache.openmeetings.util.OmFileHelper.WB_VIDEO_FILE_PREFIX;
import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
@@ -80,15 +80,12 @@ public class FlvExplorerConverter extend
List<ConverterProcessResult> returnLog = new
ArrayList<ConverterProcessResult>();
try {
String name = WB_VIDEO_FILE_PREFIX +
fileExplorerItem.getId();
- File outputFullFlv = new File(getStreamsHibernateDir(),
name + FLV_EXTENSION);
+ File outputFullFlv = new File(getStreamsHibernateDir(),
name + MP4_EXTENSION);
fileExplorerItem.setType(Type.Video);
String[] argv_fullFLV = new String[] {
getPathToFFMPEG(), "-y", "-i", moviePath,
- "-ar", "22050", "-acodec",
"libmp3lame", "-ab", "32k",
- "-vcodec", "flv",
- outputFullFlv.getCanonicalPath() };
- // "-s", flvWidth + "x" + flvHeight,
+ "-codec:a", "mp3", "-codec:v", "mpeg4",
outputFullFlv.getCanonicalPath() };
ConverterProcessResult returnMapConvertFLV =
ProcessHelper.executeScript("uploadFLV ID :: "
+ fileExplorerItem.getId(),
argv_fullFLV);
@@ -110,7 +107,7 @@ public class FlvExplorerConverter extend
fileExplorerItem.setPreviewImage(hashFileFullNameJPEG);
String[] argv_previewFLV = new String[] {
getPathToFFMPEG(), "-y", "-i",
- outputFullFlv.getCanonicalPath(),
"-vcodec", "mjpeg", "-vframes", "1", "-an",
+ outputFullFlv.getCanonicalPath(),
"-codec:v", "mjpeg", "-vframes", "1", "-an",
"-f", "rawvideo", "-s", flvWidth + "x"
+ flvHeight,
outPutJpeg.getCanonicalPath() };
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1755613&r1=1755612&r2=1755613&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
Tue Aug 9 14:56:01 2016
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.core.remote;
-import static org.apache.openmeetings.util.OmFileHelper.FLV_EXTENSION;
+import static org.apache.openmeetings.util.OmFileHelper.MP4_EXTENSION;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -224,11 +224,11 @@ public class ConferenceLibrary implement
Long room_id = currentClient.getRoomId();
if (room_id != null) {
- File outputFullFlvFile = new
File(OmFileHelper.getStreamsHibernateDir(), "UPLOADFLV_" + flvFileExplorerId +
FLV_EXTENSION);
+ File outputFullFlvFile = new
File(OmFileHelper.getStreamsHibernateDir(), "UPLOADFLV_" + flvFileExplorerId +
MP4_EXTENSION);
File targetFolder =
OmFileHelper.getStreamsSubDir(room_id);
- File targetFullFlvFile = new
File(targetFolder, "UPLOADFLV_" + flvFileExplorerId + FLV_EXTENSION);
+ File targetFullFlvFile = new
File(targetFolder, "UPLOADFLV_" + flvFileExplorerId + MP4_EXTENSION);
if (outputFullFlvFile.exists() &&
!targetFullFlvFile.exists()) {
FileHelper.copy(outputFullFlvFile, targetFullFlvFile);
}
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=1755613&r1=1755612&r2=1755613&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
Tue Aug 9 14:56:01 2016
@@ -77,6 +77,7 @@ public class OmFileHelper {
public static final String JPG_EXTENSION = ".jpg";
public static final String WB_VIDEO_FILE_PREFIX = "UPLOADFLV_";
public static final String FLV_MIME_TYPE = "video/flv";
+ public static final String MP4_MIME_TYPE = "video/mp4";
public static final String JPG_MIME_TYPE = "image/jpeg";
public static void setOmHome(File omHome) {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java?rev=1755613&r1=1755612&r2=1755613&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
Tue Aug 9 14:56:01 2016
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.web.room;
-import static org.apache.openmeetings.util.OmFileHelper.FLV_MIME_TYPE;
-import static org.apache.openmeetings.util.OmFileHelper.FLV_EXTENSION;
+import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE;
+import static org.apache.openmeetings.util.OmFileHelper.MP4_EXTENSION;
import static org.apache.openmeetings.util.OmFileHelper.JPG_EXTENSION;
import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.WB_VIDEO_FILE_PREFIX;
@@ -65,7 +65,7 @@ public class RoomResourceReference exten
mime = "application/x-shockwave-flash";
break;
case Video:
- mime = preview ? JPG_MIME_TYPE : FLV_MIME_TYPE;
+ mime = preview ? JPG_MIME_TYPE : MP4_MIME_TYPE;
break;
default:
throw new RuntimeException("Not supported");
@@ -106,7 +106,7 @@ public class RoomResourceReference exten
}
break;
case Video: {
- result = new
File(OmFileHelper.getStreamsHibernateDir(), String.format("%s%s%s",
WB_VIDEO_FILE_PREFIX, r.getId(), preview ? JPG_EXTENSION : FLV_EXTENSION));
+ result = new
File(OmFileHelper.getStreamsHibernateDir(), String.format("%s%s%s",
WB_VIDEO_FILE_PREFIX, r.getId(), preview ? JPG_EXTENSION : MP4_EXTENSION));
break;
}
case Presentation: {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java?rev=1755613&r1=1755612&r2=1755613&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java
Tue Aug 9 14:56:01 2016
@@ -19,6 +19,7 @@
package org.apache.openmeetings.web.user.record;
import static org.apache.openmeetings.util.OmFileHelper.MP4_EXTENSION;
+import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.getMp4Recording;
import java.io.File;
@@ -34,7 +35,7 @@ public class Mp4RecordingResourceReferen
@Override
public String getMimeType() {
- return "video/mp4";
+ return MP4_MIME_TYPE;
}
@Override
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=1755613&r1=1755612&r2=1755613&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
Tue Aug 9 14:56:01 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.user.record;
+import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE;
import static org.apache.openmeetings.util.OmFileHelper.getMp4Recording;
import org.apache.openmeetings.db.entity.record.Recording;
@@ -49,7 +50,7 @@ public class VideoPlayer extends Panel {
super(id);
add(container.setOutputMarkupPlaceholderTag(true));
mp4.setDisplayType(true);
- mp4.setType("video/mp4");
+ mp4.setType(MP4_MIME_TYPE);
ogg.setDisplayType(true);
ogg.setType("video/ogg");
player.add(mp4, ogg);
