svn commit: r1760470 - in /openmeetings/application: branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ trunk/openmeetings-core/s...

[solomax]

Author: solomax
Date: Tue Sep 13 03:00:06 2016
New Revision: 1760470

URL: http://svn.apache.org/viewvc?rev=1760470&view=rev
Log:
[OPENMEETINGS-1470] WB video is fixed

Modified:
    
openmeetings/application/branches/3.1.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/converter/FlvExplorerConverter.java
    
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1760470&r1=1760469&r2=1760470&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java
 Tue Sep 13 03:00:06 2016
@@ -86,7 +86,7 @@ public class FlvExplorerConverter extend
                        fileExplorerItem.setType(Type.Video);
 
                        String[] argv_fullFLV = new String[] { 
getPathToFFMPEG(), "-y", "-i", moviePath,
-                                       "-codec:a", "mp3", "-codec:v", "mpeg4", 
outputFullFlv.getCanonicalPath() };
+                                       "-c:a", "aac", "-c:v", "h264", 
outputFullFlv.getCanonicalPath() };
 
                        ConverterProcessResult returnMapConvertFLV = 
ProcessHelper.executeScript("uploadFLV ID :: "
                                        + fileExplorerItem.getId(), 
argv_fullFLV);

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=1760470&r1=1760469&r2=1760470&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 Sep 13 03:00:06 2016
@@ -65,7 +65,7 @@ public class FlvExplorerConverter extend
                        f.setType(Type.Video);
 
                        String[] argv_fullFLV = new String[] { 
getPathToFFMPEG(), "-y", "-i", f.getFile(ext).getCanonicalPath(),
-                                       "-codec:a", "mp3", "-codec:v", "mpeg4", 
mp4.getCanonicalPath() };
+                                       "-c:a", "aac", "-c:v", "h264", 
mp4.getCanonicalPath() };
 
                        ConverterProcessResult returnMapConvertFLV = 
ProcessHelper.executeScript("uploadFLV ID :: " + f.getId(), argv_fullFLV);
                        

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=1760470&r1=1760469&r2=1760470&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 Sep 13 03:00:06 2016
@@ -65,7 +65,7 @@ public class FlvExplorerConverter extend
                        f.setType(Type.Video);
 
                        String[] argv_fullFLV = new String[] { 
getPathToFFMPEG(), "-y", "-i", f.getFile(ext).getCanonicalPath(),
-                                       "-codec:a", "mp3", "-codec:v", "mpeg4", 
mp4.getCanonicalPath() };
+                                       "-c:a", "aac", "-c:v", "h264", 
mp4.getCanonicalPath() };
 
                        ConverterProcessResult returnMapConvertFLV = 
ProcessHelper.executeScript("uploadFLV ID :: " + f.getId(), argv_fullFLV);