Author: andre
Date: 2010-03-22 15:34:18 +0100 (Mon, 22 Mar 2010)
New Revision: 41558
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegTranscoder.java
Log:
javadoc
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java
2010-03-22 12:59:40 UTC (rev 41557)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java
2010-03-22 14:34:18 UTC (rev 41558)
@@ -35,7 +35,9 @@
/**
- * A trancoder base on an external command, like <code>ffmpeg</code> or
<code>ffmpeg2theora</code>
+ * This transcoder uses the command <code>ffmpeg2theora</code>. Possible
parameters to be set in
+ * 'createcaches.xml' are: videoQuality, keyInt, height and width.
+ * Other can be added but will be at the end of the commands parameters.
*
* @author Michiel Meeuwissen
* @version $Id$
@@ -102,8 +104,7 @@
if (height != null) {
args.add("-y"); args.add("" + height);
}
-
-
+
args.add(inFile.toString());
return args.toArray(new String[args.size()]);
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegTranscoder.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegTranscoder.java
2010-03-22 12:59:40 UTC (rev 41557)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegTranscoder.java
2010-03-22 14:34:18 UTC (rev 41558)
@@ -33,7 +33,9 @@
/**
- * The transcoder that uses FFmpeg to transcode media.
+ * The transcoder that uses <code>ffmpeg</code> to transcode media. Possible
parameters to be set in
+ * 'createcaches.xml' are: format, acodec, vcodec, vpre, aq, ab, b, async, r,
ac, width, height.
+ * Other can be added as extra parameters but will be at the end of the
commands parameters.
*
* @author Michiel Meeuwissen
* @version $Id$
@@ -192,9 +194,10 @@
args.add("-s");
args.add(width + "x" + height);
}
-
+
+ args.add("-y"); // overwrite
+
args.add(outFile.toString());
- args.add("-y"); // overwrite
return args.toArray(new String[args.size()]);
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
