Author: michiel
Date: 2009-06-25 16:54:59 +0200 (Thu, 25 Jun 2009)
New Revision: 36412
Modified:
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraAnalyzer.java
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java
speeltuin/mihxil/streams/src/main/webapp/mmbase/components/streams/fragment.trs.jspx
Log:
Modified:
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraAnalyzer.java
===================================================================
---
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraAnalyzer.java
2009-06-25 13:56:51 UTC (rev 36411)
+++
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraAnalyzer.java
2009-06-25 14:54:59 UTC (rev 36412)
@@ -32,7 +32,8 @@
}
- private static final Pattern RESIZE = Pattern.compile("\\s*Resize:
([0-9]+)x([0-9]+).*");
+ private static final Pattern NORESIZE = Pattern.compile("\\s*Resize:
([0-9]+)x([0-9]+).*");
+ private static final Pattern RESIZE = Pattern.compile("\\s*Resize:
([0-9]+)x([0-9]+) => ([0-9]+)x([0-9]+).*");
private static final Pattern PROGRESS = Pattern.compile("\\s*(.*?) audio:
([0-9]+)kbps video: ([0-9]+)kbps, time remaining: .*");
private long length = 0;
@@ -56,9 +57,27 @@
Matcher m = RESIZE.matcher(l);
if (m.matches()) {
AnalyzerUtils.toVideo(source, des);
- des.setIntValue("width", Integer.parseInt(m.group(1)));
- des.setIntValue("height", Integer.parseInt(m.group(2)));
+ log.info("Found " + m);
+ source.setIntValue("width", Integer.parseInt(m.group(1)));
+ source.setIntValue("height", Integer.parseInt(m.group(2)));
+ source.commit();
+ des.setIntValue("width", Integer.parseInt(m.group(3)));
+ des.setIntValue("height", Integer.parseInt(m.group(4)));
+ des.commit();
+ } else {
+ Matcher n = NORESIZE.matcher(l);
+ if (n.matches()) {
+ log.info("Found " + m);
+ AnalyzerUtils.toVideo(source, des);
+ source.setIntValue("width", Integer.parseInt(n.group(1)));
+ source.setIntValue("height", Integer.parseInt(n.group(2)));
+ source.commit();
+ des.setIntValue("width", Integer.parseInt(n.group(1)));
+ des.setIntValue("height", Integer.parseInt(n.group(2)));
+ des.commit();
+
+ }
}
}
{
Modified:
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java
===================================================================
---
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java
2009-06-25 13:56:51 UTC (rev 36411)
+++
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraTranscoder.java
2009-06-25 14:54:59 UTC (rev 36412)
@@ -117,7 +117,10 @@
public static void main(String[] argv) throws Exception {
- CommandTranscoder transcoder = new FFMpeg2TheoraTranscoder().clone();
+ FFMpeg2TheoraTranscoder ff = new FFMpeg2TheoraTranscoder();
+ ff.setHeight(100);
+ //ff.setWidth(100);
+ CommandTranscoder transcoder = ff.clone();
Logger logger = Logging.getLoggerInstance("FFMPEG2THEORA");
ChainedLogger chain = new ChainedLogger(logger);
Node source = AnalyzerUtils.getTestNode();
Modified:
speeltuin/mihxil/streams/src/main/webapp/mmbase/components/streams/fragment.trs.jspx
===================================================================
---
speeltuin/mihxil/streams/src/main/webapp/mmbase/components/streams/fragment.trs.jspx
2009-06-25 13:56:51 UTC (rev 36411)
+++
speeltuin/mihxil/streams/src/main/webapp/mmbase/components/streams/fragment.trs.jspx
2009-06-25 14:54:59 UTC (rev 36412)
@@ -20,6 +20,7 @@
<th>${_.source.builder.tableName} ${_.source.number}</th>
<td>
<jsp:text>${_.state}</jsp:text>
+ ${_.dimension}
</td>
<td><a href="${_.URL}">${_.URL}</a></td>
<c:choose>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
