Author: andre
Date: 2010-06-08 13:19:01 +0200 (Tue, 08 Jun 2010)
New Revision: 42454
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/SegmenterTranscoder.java
Log:
porting from HEAD
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-06-08 11:18:36 UTC (rev 42453)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java
2010-06-08 11:19:01 UTC (rev 42454)
@@ -73,7 +73,10 @@
width = x;
}
- /* Saving values codec, acodec */
+ /**
+ * Saves values video codec in codec (Theora)) and audio codec in acodec
(Vorbis) in destination node.
+ * @param dest destination node (streamsourcescaches)
+ */
public void init(Node dest) {
dest.setIntValue("codec", Codec.THEORA.toInt() );
if (dest.getNodeManager().hasField("acodec")) {
Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/SegmenterTranscoder.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/SegmenterTranscoder.java
2010-06-08 11:18:36 UTC (rev 42453)
+++
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/SegmenterTranscoder.java
2010-06-08 11:19:01 UTC (rev 42454)
@@ -65,8 +65,7 @@
String httpPrefix = "http://localhost:8080/";;
public SegmenterTranscoder() {
- format = Format.TS;
- codec = Codec.H264;
+ format = Format.M3U8;
}
public void setDuration(int d) {
@@ -82,6 +81,17 @@
return "segmenter";
}
+ /**
+ * Saves mimetype (video/*) in destination node when not set.
+ * @param dest destination node (streamsourcescaches)
+ */
+ public void init(Node dest) {
+ String mt = dest.getStringValue("mimetype");
+ if (mt == null || "".equals(mt)) {
+ dest.setStringValue("mimetype", "video/*");
+ }
+ }
+
@Override
protected String[] getArguments() {
if (! in.getScheme().equals("file")) throw new
UnsupportedOperationException();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
