Author: solomax
Date: Tue Jan 28 06:50:17 2014
New Revision: 1561954
URL: http://svn.apache.org/r1561954
Log:
Interview conversion is fixed (was infinite loop while conversion)
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java?rev=1561954&r1=1561953&r2=1561954&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
Tue Jan 28 06:50:17 2014
@@ -225,11 +225,14 @@ public class FlvInterviewConverter exten
args.add("-ar"); args.add("22050");
args.add("-ab"); args.add("32k");
args.add("-filter_complex");
-
args.add(String.format("[0:v]scale=%1$d:%2$d,pad=2*%1$d:%2$d[left];[1:v]scale=%1$d:%2$d[right];[left][right]overlay=main_w/2:0",
flvWidth, flvHeight));
+
args.add(String.format("[0:v]scale=%1$d:%2$d,pad=2*%1$d:%2$d[left];[1:v]scale=%1$d:%2$d[right];[left][right]overlay=main_w/2:0%3$s"
+ , flvWidth, flvHeight, shortest ?
":shortest=1" : ""));
if (shortest) {
args.add("-shortest");
}
- args.add("-vcodec"); args.add("flv");
+ args.add("-map"); args.add("0:0");
+ args.add("-map"); args.add("1:0");
+ args.add("-map"); args.add("2:0");
args.add("-r"); args.add("" + frameRate);
args.add("-qmax"); args.add("1");
args.add("-qmin"); args.add("1");
Modified:
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java?rev=1561954&r1=1561953&r2=1561954&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java
(original)
+++
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java
Tue Jan 28 06:50:17 2014
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeoutException;
@@ -92,14 +91,18 @@ public class ProcessHelper {
}
}
+ private static String getCommand(String[] argv) {
+ String tString = "";
+ for (int i = 0; i < argv.length; i++) {
+ tString += argv[i] + " ";
+ }
+ return tString;
+ }
+
private static void debugCommand(String desc, String[] argv) {
if (log.isDebugEnabled()) {
log.debug("START " + desc + " ################# ");
- String tString = "";
- for (int i = 0; i < argv.length; i++) {
- tString += argv[i] + " ";
- }
- log.debug(tString);
+ log.debug(getCommand(argv));
log.debug("END " + desc + " ################# ");
}
}
@@ -109,14 +112,13 @@ public class ProcessHelper {
return executeScript(process, argv, env);
}
- public static ConverterProcessResult executeScript(String process,
- String[] argv, Map<? extends String, ? extends String>
env) {
+ public static ConverterProcessResult executeScript(String process,
String[] argv, Map<? extends String, ? extends String> env) {
ConverterProcessResult returnMap = new ConverterProcessResult();
returnMap.setProcess(process);
debugCommand(process, argv);
try {
- returnMap.setCommand(Arrays.toString(argv));
+ returnMap.setCommand(getCommand(argv));
returnMap.setOut("");
// By using the process Builder we have access to
modify the
