Update of /var/cvs/speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders
In directory
james.mmbase.org:/tmp/cvs-serv18046/src/org/mmbase/streams/transcoders
Modified Files:
CommandTranscoder.java FFMpeg2TheoraTranscoder.java
Transcoder.java
Removed Files:
ChainedTranscoder.java
Log Message:
Automaticly trigger creation of streamsourcescaches on creation of a
streamsources
See also:
http://cvs.mmbase.org/viewcvs/speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders
Index: CommandTranscoder.java
===================================================================
RCS file:
/var/cvs/speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/CommandTranscoder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CommandTranscoder.java 24 Apr 2009 16:29:56 -0000 1.2
+++ CommandTranscoder.java 24 Apr 2009 18:26:05 -0000 1.3
@@ -24,13 +24,7 @@
* @author Michiel Meeuwissen
*/
-public abstract class CommandTranscoder implements Transcoder, LoggerAccepter {
-
- private final ChainedLogger log = new ChainedLogger();
-
- public void addLogger(Logger l) {
- log.addLogger(l);
- }
+public abstract class CommandTranscoder implements Transcoder {
protected abstract String getCommand();
@@ -46,7 +40,11 @@
return Level.ERROR;
}
- public void transcode(final URI in, final URI out) throws Exception {
+ public String getKey() {
+ return getClass().getName();
+ }
+
+ public void transcode(final URI in, final URI out, Logger log) throws
Exception {
CommandLauncher cl = new CommandLauncher("Transcoding " + in + " to "
+ out);
cl.execute(getCommand(), getArguments(in, out), getEnvironment());
OutputStream outStream = new WriterOutputStream(new LoggerWriter(log,
getOutputLevel()), System.getProperty("file.encoding"));
Index: FFMpeg2TheoraTranscoder.java
===================================================================
RCS file:
/var/cvs/speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- FFMpeg2TheoraTranscoder.java 24 Apr 2009 16:29:56 -0000 1.2
+++ FFMpeg2TheoraTranscoder.java 24 Apr 2009 18:26:05 -0000 1.3
@@ -24,10 +24,13 @@
public class FFMpeg2TheoraTranscoder extends CommandTranscoder {
+ @Override
protected String getCommand() {
return "ffmpeg2theora";
}
+
+ @Override
protected String[] getArguments(URI in, URI out) {
if (! in.getScheme().equals("file")) throw new
UnsupportedOperationException();
if (! out.getScheme().equals("file")) throw new
UnsupportedOperationException();
@@ -42,11 +45,15 @@
return Level.SERVICE;
}
+ @Override
+ public String getExtension() {
+ return "ogv";
+ }
public static void main(String[] argv) throws Exception {
CommandTranscoder transcoder = new FFMpeg2TheoraTranscoder();
- Logging.getLoggerInstance("FFMPEG2THEORA").setLevel(Level.SERVICE);
- transcoder.addLogger(Logging.getLoggerInstance("FFMPEG2THEORA"));
- transcoder.transcode(new File(argv[0]).toURI(), new
File(argv[1]).toURI());
+ Logger logger = Logging.getLoggerInstance("FFMPEG2THEORA");
+ logger.setLevel(Level.SERVICE);
+ transcoder.transcode(new File(argv[0]).toURI(), new
File(argv[1]).toURI(), logger);
}
}
Index: Transcoder.java
===================================================================
RCS file:
/var/cvs/speeltuin/mihxil/streams/src/org/mmbase/streams/transcoders/Transcoder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Transcoder.java 17 Apr 2009 10:06:18 -0000 1.1
+++ Transcoder.java 24 Apr 2009 18:26:05 -0000 1.2
@@ -11,16 +11,21 @@
import java.net.*;
+
+import org.mmbase.util.logging.*;
/**
* @author Michiel Meeuwissen
*/
public interface Transcoder {
+ String getKey();
+
+ String getExtension();
/**
*
*/
- public void transcode(URI in, URI out) throws Exception;
+ void transcode(URI in, URI out, Logger logger) throws Exception;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
