Author: michiel
Date: 2009-05-01 15:46:45 +0200 (Fri, 01 May 2009)
New Revision: 34682
Modified:
speeltuin/mihxil/streams/config/builders/streams/streamsources.xml
speeltuin/mihxil/streams/src/org/mmbase/streams/CreateCachesProcessor.java
speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java
speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/FFMpegTranscoder.java
speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/Transcoder.java
Log:
Modified: speeltuin/mihxil/streams/config/builders/streams/streamsources.xml
===================================================================
--- speeltuin/mihxil/streams/config/builders/streams/streamsources.xml
2009-05-01 13:25:33 UTC (rev 34681)
+++ speeltuin/mihxil/streams/config/builders/streams/streamsources.xml
2009-05-01 13:46:45 UTC (rev 34682)
@@ -24,6 +24,11 @@
<field name="state" state="system">
<datatype xmlns="http://www.mmbase.org/xmlns/datatypes";>
<default value="SOURCE" />
+ <enumeration enforce="onchange">
+ <entry
+ javaconstants="org.mmbase.applications.media.State"
+
basename="org.mmbase.applications.media.builders.resources.states" />
+ </enumeration>
</datatype>
</field>
Modified:
speeltuin/mihxil/streams/src/org/mmbase/streams/CreateCachesProcessor.java
===================================================================
--- speeltuin/mihxil/streams/src/org/mmbase/streams/CreateCachesProcessor.java
2009-05-01 13:25:33 UTC (rev 34681)
+++ speeltuin/mihxil/streams/src/org/mmbase/streams/CreateCachesProcessor.java
2009-05-01 13:46:45 UTC (rev 34682)
@@ -24,12 +24,9 @@
/**
- * This class constains Setter and Getter method for 'binary' file fields. In
such field you can set
- * a FileItem, and it is stored as a file, using the FileServlet to produce an
URL. The (string)
- * field itself only contains a file name.
+ * This commit-processor is used on node of the type 'streamsources', and is
used to initiate
+ * conversions to other formats.
*
- * The file could (and currently is supposed to) be served with {...@link
org.mmbase.servlet.FileServlet}.
- *
* @author Michiel Meeuwissen
*/
@@ -108,7 +105,7 @@
try {
cacheNode.setIntValue("state",
State.BUSY.getValue());
cacheNode.commit();
- t.transcode(in, outFile.toURI(), logger);
+ t.transcode(in, outFile.toURI(),
t.getLogger());
cacheNode.setStringValue("url",
buf.toString());
cacheNode.setIntValue("state",
State.DONE.getValue());
cacheNode.commit();
Modified:
speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java
===================================================================
---
speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java
2009-05-01 13:25:33 UTC (rev 34681)
+++
speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java
2009-05-01 13:46:45 UTC (rev 34682)
@@ -26,6 +26,13 @@
public class FFMpeg2TheoraTranscoder extends CommandTranscoder {
+
+ private static final Logger log =
Logging.getLoggerInstance(FFMpeg2TheoraTranscoder.class);
+
+ public Logger getLogger() {
+ return log;
+ }
+
@Override
protected String getCommand() {
return "ffmpeg2theora";
@@ -43,13 +50,16 @@
return new String[] { "-o", outFile.toString(), inFile.toString() };
}
- private static final Pattern PROGRESS = Pattern.compile(".*time
elapsed.*");
+ long count = 0;
+
+ private static final Pattern PROGRESS = Pattern.compile(".*time
(elapsed|remaining).*");
@Override
- protected LoggerWriter getErrorWriter(Logger log) {
- LoggerWriter w = new LoggerWriter(log, Level.SERVICE) {
+ protected LoggerWriter getErrorWriter(Logger l) {
+ LoggerWriter w = new LoggerWriter(l, Level.SERVICE) {
@Override
public Level getLevel(String line) {
- if (PROGRESS.matcher(line).matches()) {
+ count ++;
+ if (count % 100 != 0 && PROGRESS.matcher(line).matches()) {
return Level.DEBUG;
}
return null;
Modified:
speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/FFMpegTranscoder.java
===================================================================
---
speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/FFMpegTranscoder.java
2009-05-01 13:25:33 UTC (rev 34681)
+++
speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/FFMpegTranscoder.java
2009-05-01 13:46:45 UTC (rev 34682)
@@ -13,6 +13,7 @@
import java.net.*;
import java.io.*;
import org.mmbase.util.logging.*;
+import java.util.regex.*;
/**
@@ -22,6 +23,12 @@
public class FFMpegTranscoder extends CommandTranscoder {
+ private static final Logger log =
Logging.getLoggerInstance(FFMpegTranscoder.class);
+
+ public Logger getLogger() {
+ return log;
+ }
+
@Override
protected String getCommand() {
return "ffmpeg";
@@ -38,7 +45,26 @@
return new String[] { "-i", inFile.toString(), outFile.toString() };
}
+ private static final Pattern PROGRESS = Pattern.compile(".*time
remaining.*");
+
@Override
+ protected LoggerWriter getOutputWriter(final Logger log) {
+ LoggerWriter w = new LoggerWriter(log, Level.SERVICE) {
+ @Override
+ public Level getLevel(String line) {
+ if (PROGRESS.matcher(line).matches()) {
+ return Level.DEBUG;
+ }
+ log.info("Not matching " + PROGRESS);
+ return null;
+ }
+ };
+
+ log.info("Returning " + w);
+ return w;
+ }
+
+ @Override
public String getExtension() {
return "avi";
}
Modified:
speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/Transcoder.java
===================================================================
--- speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/Transcoder.java
2009-05-01 13:25:33 UTC (rev 34681)
+++ speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/Transcoder.java
2009-05-01 13:46:45 UTC (rev 34682)
@@ -19,6 +19,8 @@
public interface Transcoder {
+ Logger getLogger();
+
String getKey();
String getExtension();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
