Author: solomax
Date: Tue Aug 9 14:53:18 2016
New Revision: 1755611
URL: http://svn.apache.org/viewvc?rev=1755611&view=rev
Log:
[OPENMEETINGS-652] wb video is being converted to mp4
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1755611&r1=1755610&r2=1755611&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
Tue Aug 9 14:53:18 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/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java?rev=1755611&r1=1755610&r2=1755611&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ConferenceLibrary.java
Tue Aug 9 14:53:18 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/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx?rev=1755611&r1=1755610&r2=1755611&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
Tue Aug 9 14:53:18 2016
@@ -37,7 +37,7 @@
<handler name="oninit">
if ($debug) Debug.write("whiteboardVideoPlayer ::
",this.fileId);
- this.recordingName = "UPLOADFLV_" + this.fileId + ".flv";
+ this.recordingName = "UPLOADFLV_" + this.fileId + ".mp4";
calcVideoWidthHeight();
this.copyFileToCurrentRoom.doCall();
</handler>
