Author: solomax
Date: Sat Jan 4 05:48:59 2014
New Revision: 1555323
URL: http://svn.apache.org/r1555323
Log:
Debug is enhanced
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvExplorerConverter.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvInterviewConverter.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/GenerateImage.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/GenerateThumbs.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/BaseConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java?rev=1555323&r1=1555322&r2=1555323&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/BaseConverter.java
Sat Jan 4 05:48:59 2014
@@ -20,6 +20,9 @@ package org.apache.openmeetings.converte
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.getStreamsSubDir;
+import static org.apache.openmeetings.util.OmFileHelper.isRecordingExists;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -32,7 +35,6 @@ import org.apache.openmeetings.db.dao.re
import org.apache.openmeetings.db.entity.record.FlvRecording;
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData;
import org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta;
-import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.process.ConverterProcessResult;
import org.apache.openmeetings.util.process.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
@@ -75,12 +77,8 @@ public abstract class BaseConverter {
"use.old.style.ffmpeg.map.option",
String.class, "0"));
}
- protected File getStreamFolder() {
- return OmFileHelper.getStreamsHibernateDir();
- }
-
protected File getStreamFolder(FlvRecording flvRecording) {
- return OmFileHelper.getStreamsSubDir(flvRecording.getRoom_id());
+ return getStreamsSubDir(flvRecording.getRoom_id());
}
protected void deleteFileIfExists(String name) {
@@ -122,21 +120,12 @@ public abstract class BaseConverter {
private String[] addSoxPad(List<ConverterProcessResult> returnLog,
String job, double length, double position, String inFile, String outFile) {
if (length >= 0 && position >= 0 && (length > 0 || position >
0)) {
- String[] argv_sox = new String[] { getPathToSoX(),
+ String[] argv = new String[] { getPathToSoX(),
inFile, outFile, "pad",
"" + length, "" + position };
- if (log.isDebugEnabled()) {
- log.debug("START " + job + " #################
");
- String padString = "";
- for (int i = 0; i < argv_sox.length; i++) {
- padString += " " + argv_sox[i];
- }
- log.debug("padString :: " + padString);
- log.debug("END " + job + " ################# ");
- }
- returnLog.add(ProcessHelper.executeScript(job,
argv_sox));
- return argv_sox;
+ returnLog.add(ProcessHelper.executeScript(job, argv));
+ return argv;
} else {
log.debug("::addSoxPad " + job + " Invalid parameters: "
+ " length = " + length + "; position = " +
position + "; inFile = " + inFile);
@@ -191,17 +180,10 @@ public abstract class BaseConverter {
metaData.setAudioIsValid(false);
if (inputFlvFile.exists()) {
- String[] argv = new String[] {
this.getPathToFFMPEG(),
- "-async", "1", "-i",
inputFlvFile.getCanonicalPath(), outputWav };
-
- log.debug("START stripAudioFromFLVs
################# ");
- for (int i = 0; i < argv.length; i++) {
- log.debug(" i " + i + " argv-i
" + argv[i]);
- }
- log.debug("END stripAudioFromFLVs
################# ");
+ String[] argv = new String[]
{getPathToFFMPEG(),
+ "-async", "1", "-i",
inputFlvFile.getCanonicalPath(), outputWav};
-
returnLog.add(ProcessHelper.executeScript("generateFFMPEG",
- argv));
+
returnLog.add(ProcessHelper.executeScript("stripAudioFromFLVs", argv));
// check if the resulting Audio is valid
File output_wav = new File(outputWav);
@@ -299,16 +281,16 @@ public abstract class BaseConverter {
flvRecordingMetaDataDaoImpl.update(metaData);
}
} catch (Exception err) {
- log.error("[stripAudioFromFLVs]", err);
+ log.error("[stripAudioFirstPass]", err);
}
}
public void convertToMp4(FlvRecording r, List<ConverterProcessResult>
returnLog) throws IOException {
//TODO add faststart, move filepaths to helpers
- File file = OmFileHelper.getRecording(r.getFileHash());
- if (!file.exists()) {
+ if (!isRecordingExists(r.getFileHash())) {
return;
}
+ File file = getRecording(r.getFileHash());
String path = file.getCanonicalPath();
String mp4path = path + MP4_EXTENSION;
// ffmpeg -i video_source_file.ext -vcodec libx264 -b 250k -bt
50k -acodec libfaac -ab 56k -ac 2 -s 480x320 video_out_file.mp4
@@ -324,17 +306,6 @@ public abstract class BaseConverter {
"-s", r.getFlvWidth() + "x" + r.getFlvHeight(),
//
mp4path
};
-
- if (log.isDebugEnabled()) {
- log.debug("START generate MP4 ################# ");
- String tString = "";
- for (int i = 0; i < argv.length; i++) {
- tString += argv[i] + " ";
- // log.debug(" i " + i + " argv-i " +
argv_fullFLV[i]);
- }
- log.debug(tString);
- log.debug("END generate MP4 ################# ");
- }
returnLog.add(ProcessHelper.executeScript("generate MP4",
argv));
argv = new String[] {
@@ -345,16 +316,6 @@ public abstract class BaseConverter {
path + OGG_EXTENSION
};
- if (log.isDebugEnabled()) {
- log.debug("START generate MP4 ################# ");
- String tString = "";
- for (int i = 0; i < argv.length; i++) {
- tString += argv[i] + " ";
- // log.debug(" i " + i + " argv-i " +
argv_fullFLV[i]);
- }
- log.debug(tString);
- log.debug("END generate MP4 ################# ");
- }
- returnLog.add(ProcessHelper.executeScript("generate MP4",
argv));
+ returnLog.add(ProcessHelper.executeScript("generate OGG",
argv));
}
}
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvExplorerConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvExplorerConverter.java?rev=1555323&r1=1555322&r2=1555323&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvExplorerConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvExplorerConverter.java
Sat Jan 4 05:48:59 2014
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.converter;
+import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -57,15 +59,12 @@ public class FlvExplorerConverter extend
public List<ConverterProcessResult> startConversion(Long
fileExplorerItemId, String moviePath) {
List<ConverterProcessResult> returnLog = new
ArrayList<ConverterProcessResult>();
try {
+ FileExplorerItem fileExplorerItem =
fileExplorerItemDaoImpl.getFileExplorerItemsById(fileExplorerItemId);
- FileExplorerItem fileExplorerItem =
this.fileExplorerItemDaoImpl
-
.getFileExplorerItemsById(fileExplorerItemId);
-
- log.debug("fileExplorerItem "
- +
fileExplorerItem.getFileExplorerItemId());
+ log.debug("fileExplorerItem " +
fileExplorerItem.getFileExplorerItemId());
// Convert to FLV
- return this.convertToFLV(fileExplorerItem, moviePath);
+ return convertToFLV(fileExplorerItem, moviePath);
// Add empty pieces at the beginning and end of the wav
// FIXME: Is this really needed anymore?!
@@ -76,35 +75,22 @@ public class FlvExplorerConverter extend
}
return returnLog;
-
}
- private List<ConverterProcessResult> convertToFLV(FileExplorerItem
fileExplorerItem,
- String moviePath) {
+ private List<ConverterProcessResult> convertToFLV(FileExplorerItem
fileExplorerItem, String moviePath) {
List<ConverterProcessResult> returnLog = new
ArrayList<ConverterProcessResult>();
try {
String name = "UPLOADFLV_" +
fileExplorerItem.getFileExplorerItemId();
- File outputFullFlv = new File(getStreamFolder(), name +
".flv");
+ File outputFullFlv = new File(getStreamsHibernateDir(),
name + ".flv");
fileExplorerItem.setIsVideo(true);
- String[] argv_fullFLV = null;
-
- argv_fullFLV = new String[] { getPathToFFMPEG(), "-i",
moviePath,
+ String[] argv_fullFLV = new String[] {
getPathToFFMPEG(), "-i", moviePath,
"-ar", "22050", "-acodec",
"libmp3lame", "-ab", "32k",
"-vcodec", "flv",
outputFullFlv.getCanonicalPath() };
// "-s", flvWidth + "x" + flvHeight,
- log.debug("START generateFullFLV ################# ");
- String tString = "";
- for (int i = 0; i < argv_fullFLV.length; i++) {
- tString += argv_fullFLV[i] + " ";
- // log.debug(" i " + i + " argv-i " +
argv_fullFLV[i]);
- }
- log.debug(tString);
- log.debug("END generateFullFLV ################# ");
-
ConverterProcessResult returnMapConvertFLV =
ProcessHelper.executeScript("uploadFLV ID :: "
+
fileExplorerItem.getFileExplorerItemId(), argv_fullFLV);
@@ -119,9 +105,8 @@ public class FlvExplorerConverter extend
returnLog.add(returnMapConvertFLV);
- String hashFileFullNameJPEG = "UPLOADFLV_"
- +
fileExplorerItem.getFileExplorerItemId() + ".jpg";
- File outPutJpeg = new File(getStreamFolder(), name +
".jpg");
+ String hashFileFullNameJPEG = "UPLOADFLV_" +
fileExplorerItem.getFileExplorerItemId() + ".jpg";
+ File outPutJpeg = new File(getStreamsHibernateDir(),
name + ".jpg");
fileExplorerItem.setPreviewImage(hashFileFullNameJPEG);
@@ -130,29 +115,15 @@ public class FlvExplorerConverter extend
"-f", "rawvideo", "-s", flvWidth + "x"
+ flvHeight,
outPutJpeg.getCanonicalPath() };
- log.debug("START previewFullFLV ################# ");
- log.debug(argv_previewFLV.toString());
- String kString = "";
- for (int i = 0; i < argv_previewFLV.length; i++) {
- kString += argv_previewFLV[i] + " ";
- // log.debug(" i " + i + " argv-i " +
argv_previewFLV[i]);
- }
- log.debug(kString);
- log.debug("END previewFullFLV ################# ");
-
returnLog.add(ProcessHelper.executeScript("previewUpload ID :: "
+
fileExplorerItem.getFileExplorerItemId(),
argv_previewFLV));
-
this.fileExplorerItemDaoImpl.updateFileOrFolder(fileExplorerItem);
+
fileExplorerItemDaoImpl.updateFileOrFolder(fileExplorerItem);
for (ConverterProcessResult returnMap : returnLog) {
- this.flvRecordingLogDaoImpl.addFLVRecordingLog(
- "generateFFMPEG", null,
returnMap);
+
flvRecordingLogDaoImpl.addFLVRecordingLog("generateFFMPEG", null, returnMap);
}
-
-
-
} catch (Exception err) {
log.error("[convertToFLV]", err);
returnLog.add(new
ConverterProcessResult("convertToFLV", err.getMessage(), err));
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=1555323&r1=1555322&r2=1555323&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
Sat Jan 4 05:48:59 2014
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.converter;
+import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -127,7 +128,7 @@ public class FlvInterviewConverter exten
stripAudioFirstPass(flvRecording, returnLog,
listOfFullWaveFiles, streamFolder, metaDataList);
// Merge Wave to Full Length
- File streamFolderGeneral = getStreamFolder();
+ File streamFolderGeneral = getStreamsHibernateDir();
String hashFileFullName = "INTERVIEW_" +
flvRecording.getFlvRecordingId() + "_FINAL_WAVE.wav";
String outputFullWav = streamFolder.getAbsolutePath() +
File.separatorChar + hashFileFullName;
@@ -145,16 +146,7 @@ public class FlvInterviewConverter exten
argv_full_sox =
mergeAudioToWaves(listOfFullWaveFiles, outputFullWav);
}
- log.debug("START mergeAudioToWaves
################# ");
- log.debug(argv_full_sox.toString());
- String iString = "";
- for (int i = 0; i < argv_full_sox.length; i++) {
- iString += argv_full_sox[i] + " ";
- }
- log.debug(iString);
- log.debug("END mergeAudioToWaves
################# ");
-
-
returnLog.add(ProcessHelper.executeScript("mergeWave", argv_full_sox));
+
returnLog.add(ProcessHelper.executeScript("mergeAudioToWaves", argv_full_sox));
} else {
// create default Audio to merge it.
@@ -169,15 +161,7 @@ public class FlvInterviewConverter exten
String[] argv_full_sox = new String[] {
getPathToSoX(), outputWav.getCanonicalPath(),
outputFullWav, "pad", "0",
deltaPadding.toString() };
- log.debug("START generateSampleAudio
################# ");
- String tString = "";
- for (int i = 0; i < argv_full_sox.length; i++) {
- tString += argv_full_sox[i] + " ";
- }
- log.debug(tString);
- log.debug("END generateSampleAudio
################# ");
-
-
returnLog.add(ProcessHelper.executeScript("mergeWave", argv_full_sox));
+
returnLog.add(ProcessHelper.executeScript("generateSampleAudio",
argv_full_sox));
}
// Default Image for empty interview video pods
@@ -269,15 +253,6 @@ public class FlvInterviewConverter exten
"-vcodec", "flv", //
"-r", "" + frameRate, "-qmax", "1",
"-qmin", "1", "-y", outputFullFlv};
- log.debug("START generateFullFLV ################# ");
- String tString = "";
- for (int i = 0; i < argv_fullFLV.length; i++) {
- tString += argv_fullFLV[i] + " ";
- // log.debug(" i " + i + " argv-i " +
argv_fullFLV[i]);
- }
- log.debug(tString);
- log.debug("END generateFullFLV ################# ");
-
returnLog.add(ProcessHelper.executeScript("generateFullFLV", argv_fullFLV));
flvRecording.setFileHash(hashFileFullNameFlv);
@@ -353,13 +328,6 @@ public class FlvInterviewConverter exten
}
}
- public ConverterProcessResult thumbProcessImageWindows(String file1,
String file2, String file3) {
- // Init variables
- String[] cmd = { getPathToImageMagick(), file1, file2,
"+append", file3 };
-
- return generateThumbs.processImageWindows(cmd);
- }
-
public ConverterProcessResult processImageWindows(String file1, String
file2, String file3) {
return
ProcessHelper.executeScriptWindows("processImageWindows", new String[] {
getPathToImageMagick(), file1,
file2, "+append", file3 });
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java?rev=1555323&r1=1555322&r2=1555323&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/FlvRecorderConverter.java
Sat Jan 4 05:48:59 2014
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.converter;
+import static org.apache.openmeetings.util.OmFileHelper.getStreamsHibernateDir;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.File;
@@ -77,7 +78,7 @@ public class FlvRecorderConverter extend
stripAudioFirstPass(flvRecording, returnLog,
listOfFullWaveFiles, streamFolder);
// Merge Wave to Full Length
- String streamFolderGeneralName =
getStreamFolder().getCanonicalPath() + File.separator; // FIXME
+ String streamFolderGeneralName =
getStreamsHibernateDir().getCanonicalPath() + File.separator; // FIXME
FlvRecordingMetaData flvRecordingMetaDataOfScreen =
flvRecordingMetaDataDaoImpl
.getFlvRecordingMetaDataScreenFlvByRecording(flvRecording.getFlvRecordingId());
@@ -125,20 +126,11 @@ public class FlvRecorderConverter extend
String[] argv_full_sox =
mergeAudioToWaves(listOfFullWaveFiles, outputFullWav);
- log.debug("START mergeAudioToWaves
################# ");
- log.debug(argv_full_sox.toString());
- String iString = "";
- for (int i = 0; i < argv_full_sox.length; i++) {
- iString += argv_full_sox[i] + " ";
- }
- log.debug(iString);
- log.debug("END mergeAudioToWaves
################# ");
-
flvRecordingMetaDataOfScreen.setFullWavAudioData(hashFileFullName);
flvRecordingMetaDataDaoImpl.update(flvRecordingMetaDataOfScreen);
-
returnLog.add(ProcessHelper.executeScript("mergeWave", argv_full_sox));
+
returnLog.add(ProcessHelper.executeScript("mergeAudioToWaves", argv_full_sox));
} else {
// create default Audio to merge it.
@@ -153,20 +145,9 @@ public class FlvRecorderConverter extend
String[] argv_full_sox = new String[] {
getPathToSoX(), outputWav, outputFullWav, "pad", "0",
deltaPadding.toString() };
- log.debug("START generateSampleAudio
################# ");
- String tString = "";
- for (int i = 0; i < argv_full_sox.length; i++) {
- tString += argv_full_sox[i] + " ";
- }
- log.debug(tString);
- log.debug("END generateSampleAudio
################# ");
-
flvRecordingMetaDataOfScreen.setFullWavAudioData(hashFileFullName);
-
flvRecordingMetaDataDaoImpl.update(flvRecordingMetaDataOfScreen);
-
-
returnLog.add(ProcessHelper.executeScript("mergeWave", argv_full_sox));
-
+
returnLog.add(ProcessHelper.executeScript("generateSampleAudio",
argv_full_sox));
}
// Merge Audio with Video / Calculate resulting FLV
@@ -207,15 +188,6 @@ public class FlvRecorderConverter extend
"-map", "1" + FFMPEG_MAP_PARAM + "0", //
outputFullFlv };
- log.debug("START generateFullFLV ################# ");
- String tString = "";
- for (int i = 0; i < argv_fullFLV.length; i++) {
- tString += argv_fullFLV[i] + " ";
- // log.debug(" i " + i + " argv-i " +
argv_fullFLV[i]);
- }
- log.debug(tString);
- log.debug("END generateFullFLV ################# ");
-
returnLog.add(ProcessHelper.executeScript("generateFullFLV", argv_fullFLV));
flvRecording.setFileHash(hashFileFullNameFlv);
@@ -238,16 +210,7 @@ public class FlvRecorderConverter extend
"-s", flvWidth + "x" + flvHeight, //
outPutJpeg };
- log.debug("START previewFullFLV ################# ");
- log.debug(argv_previewFLV.toString());
- String kString = "";
- for (int i = 0; i < argv_previewFLV.length; i++) {
- kString += argv_previewFLV[i] + " ";
- }
- log.debug(kString);
- log.debug("END previewFullFLV ################# ");
-
-
returnLog.add(ProcessHelper.executeScript("generateFullFLV", argv_previewFLV));
+
returnLog.add(ProcessHelper.executeScript("previewFullFLV", argv_previewFLV));
String alternateDownloadName = "flvRecording_" +
flvRecording.getFlvRecordingId() + ".avi";
String alternateDownloadFullName =
streamFolderGeneralName + alternateDownloadName;
@@ -255,15 +218,6 @@ public class FlvRecorderConverter extend
String[] argv_alternateDownload = new String[] {
getPathToFFMPEG(), "-i", outputFullFlv, "-vcodec",
"copy", alternateDownloadFullName };
- log.debug("START alternateDownLoad ################# ");
- log.debug(argv_previewFLV.toString());
- String sString = "";
- for (int i = 0; i < argv_alternateDownload.length; i++)
{
- sString += argv_alternateDownload[i] + " ";
- }
- log.debug(sString);
- log.debug("END alternateDownLoad ################# ");
-
returnLog.add(ProcessHelper.executeScript("alternateDownload",
argv_alternateDownload));
flvRecording.setAlternateDownload(alternateDownloadName);
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/GenerateImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/GenerateImage.java?rev=1555323&r1=1555322&r2=1555323&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/GenerateImage.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/GenerateImage.java
Sat Jan 4 05:48:59 2014
@@ -63,10 +63,8 @@ public class GenerateImage extends BaseC
log.debug("##### convertImage destinationFile: " +
destinationFile);
- ConverterProcessResult processJPG = this.convertSingleJpg(
- fileFullPath.getCanonicalPath(),
destinationFile);
- ConverterProcessResult processThumb =
generateThumbs.generateThumb(
- thumbImagePrefix, destinationFile, 50);
+ ConverterProcessResult processJPG =
convertSingleJpg(fileFullPath.getCanonicalPath(), destinationFile);
+ ConverterProcessResult processThumb =
generateThumbs.generateThumb(thumbImagePrefix, destinationFile, 50);
returnMap.addItem("processJPG", processJPG);
returnMap.addItem("processThumb", processThumb);
@@ -124,22 +122,14 @@ public class GenerateImage extends BaseC
private ConverterProcessResult convertSingleJpg(String inputFile, File
outputfile) throws IOException {
String[] argv = new String[] { getPathToImageMagick(),
inputFile, outputfile.getCanonicalPath() };
- // return GenerateSWF.executeScript("convertSingleJpg", argv);
-
- if
(System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) {
- return
ProcessHelper.executeScript("generateBatchThumbByWidth", argv);
- } else {
- return generateThumbs.processImageWindows(argv);
- }
-
+ return ProcessHelper.executeScript("generateBatchThumbByWidth",
argv);
}
public ConverterProcessResult convertImageByTypeAndSize(String
inputFile,
String outputfile, int width, int height) {
String[] argv = new String[] { getPathToImageMagick(), "-size",
width + "x" + height, inputFile, outputfile };
- return
ProcessHelper.executeScript("convertImageByTypeAndSizeAndDepth",
- argv);
+ return
ProcessHelper.executeScript("convertImageByTypeAndSizeAndDepth", argv);
}
public ConverterProcessResult convertImageByTypeAndSizeAndDepth(
@@ -148,8 +138,7 @@ public class GenerateImage extends BaseC
String[] argv = new String[] { getPathToImageMagick(), "-size",
width + "x" + height, "-depth",
Integer.toString(depth),
inputFile, outputfile };
- return
ProcessHelper.executeScript("convertImageByTypeAndSizeAndDepth",
- argv);
+ return
ProcessHelper.executeScript("convertImageByTypeAndSizeAndDepth", argv);
}
}
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/GenerateThumbs.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/GenerateThumbs.java?rev=1555323&r1=1555322&r2=1555323&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/GenerateThumbs.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/converter/GenerateThumbs.java
Sat Jan 4 05:48:59 2014
@@ -18,21 +18,21 @@
*/
package org.apache.openmeetings.converter;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.File;
import java.io.IOException;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.process.ConverterProcessResult;
import org.apache.openmeetings.util.process.ProcessHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
public class GenerateThumbs extends BaseConverter {
-
- private static final Logger log = Red5LoggerFactory
- .getLogger(GenerateThumbs.class,
OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log =
Red5LoggerFactory.getLogger(GenerateThumbs.class, webAppRootKey);
public ConverterProcessResult generateThumb(String pre, File f, Integer
thumbSize) throws IOException {
+ log.debug("generateThumb");
// Init variables
String name = f.getName();
File parent = f.getParentFile();
@@ -45,76 +45,38 @@ public class GenerateThumbs extends Base
, new File(parent, pre + name).getCanonicalPath()
};
- log.debug("START generateThumb ################# ");
- for (int i = 0; i < argv.length; i++) {
- log.debug(" i " + i + " argv-i " + argv[i]);
- }
- log.debug("END generateThumb ################# ");
-
- if
(System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) {
- return
ProcessHelper.executeScript("generateBatchThumbByWidth", argv);
- } else {
- return this.processImageWindows(argv);
- }
+ return ProcessHelper.executeScript("generateBatchThumbByWidth",
argv);
}
public ConverterProcessResult decodePDF(String inputfile, String
outputfile) {
+ log.debug("decodePDF");
+ String[] argv = new String[] { getPathToImageMagick(),
inputfile, outputfile };
- String[] argv = new String[] { getPathToImageMagick(),
- inputfile, outputfile };
-
- if
(System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) {
- return
ProcessHelper.executeScript("generateBatchThumbByWidth", argv);
- } else {
- return this.processImageWindows(argv);
- }
-
+ return ProcessHelper.executeScript("generateBatchThumbByWidth",
argv);
}
public ConverterProcessResult generateBatchThumb(File inputfile, File
outputpath, Integer thumbSize, String pre) throws IOException {
+ log.debug("generateBatchThumbByWidth");
+ String[] argv = new String[] {
+ getPathToImageMagick()
+ , "-thumbnail" // FIXME
+ , Integer.toString(thumbSize)
+ , inputfile.getCanonicalPath()
+ , new File(outputpath, "_" + pre +
"_page-%04d.jpg").getCanonicalPath()
+ };
- if
(System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) {
- String[] argv = new String[] {
- getPathToImageMagick()
- , "-thumbnail" // FIXME
- , Integer.toString(thumbSize)
- , inputfile.getCanonicalPath()
- , new File(outputpath, "_" + pre +
"_page-%04d.jpg").getCanonicalPath()
- };
-
- return
ProcessHelper.executeScript("generateBatchThumbByWidth", argv);
- } else {
-
- String[] argv = new String[] {
- getPathToImageMagick()
- , "-thumbnail" // FIXME
- , Integer.toString(thumbSize)
- , inputfile.getCanonicalPath()
- , new File(outputpath, "_" + pre +
"_page-%04d.jpg").getCanonicalPath()
- };
-
- // return
GenerateSWF.executeScript("generateBatchThumbByWidth",
- // argv);
- return this.processImageWindows(argv);
- }
+ return ProcessHelper.executeScript("generateBatchThumbByWidth",
argv);
}
public ConverterProcessResult generateImageBatchByWidth(
String current_dir, String inputfile, String outputpath,
Integer thumbWidth, String pre) {
+ log.debug("generateImageBatchByWidth");
String[] argv = new String[] { getPathToImageMagick(),
"-resize", Integer.toString(thumbWidth),
inputfile,
outputpath + "_" + pre + "_page.png" };
- if
(System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1) {
- return
ProcessHelper.executeScript("generateBatchThumbByWidth", argv);
- } else {
- return this.processImageWindows(argv);
- }
- }
-
- public ConverterProcessResult processImageWindows(String[] args) {
- return
ProcessHelper.executeScriptWindows("processImageWindows", args);
+ return ProcessHelper.executeScript("generateImageBatchByWidth",
argv);
}
}
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=1555323&r1=1555322&r2=1555323&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
Sat Jan 4 05:48:59 2014
@@ -92,6 +92,18 @@ public class ProcessHelper {
}
}
+ 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("END " + desc + " ################# ");
+ }
+ }
+
public static ConverterProcessResult executeScript(String process,
String[] argv) {
Map<String, String> env = new HashMap<String, String>();
return executeScript(process, argv, env);
@@ -101,8 +113,7 @@ public class ProcessHelper {
String[] argv, Map<? extends String, ? extends String>
env) {
ConverterProcessResult returnMap = new ConverterProcessResult();
returnMap.setProcess(process);
- log.debug("process: " + process);
- log.debug("args: " + Arrays.toString(argv));
+ debugCommand(process, argv);
try {
returnMap.setCommand(Arrays.toString(argv));
