Author: michiel
Date: 2009-08-10 20:46:58 +0200 (Mon, 10 Aug 2009)
New Revision: 37655
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegAnalyzer.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegRecognizer.java
Log:
audio was not property recongnized at all
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
2009-08-10 18:28:49 UTC (rev 37654)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
2009-08-10 18:46:58 UTC (rev 37655)
@@ -96,7 +96,7 @@
log.service("Fixing mime type " + actualMimeType + "-> " +
newType) ;
} else {
- log.debug("MimType " + actualMimeType + " is correct");
+ log.debug("MimeType " + actualMimeType + " is correct");
}
}
@@ -182,9 +182,9 @@
private static final Pattern IMAGE = Pattern.compile(".*?\\sVideo: .*?,
.*?, ([0-9]+)x([0-9]+).*");
/*
use this in stead for image matching and do height and width in other
method ?
- private static final Pattern IMAGE = Pattern.compile("^Input #\\d+,
image.*");
+ private static final Pattern IMAGE = Pattern.compile("^Input #\\d+,
image.*");
*/
-
+
public boolean image(String l, Node source, Node dest) {
if (! source.isNull("bitrate")) {
// already has a bitrate
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegAnalyzer.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegAnalyzer.java
2009-08-10 18:28:49 UTC (rev 37654)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegAnalyzer.java
2009-08-10 18:46:58 UTC (rev 37655)
@@ -64,15 +64,15 @@
}
public void ready(Node sourceNode, Node destNode) {
- log.info("Ready " + sourceNode.getNumber() + (destNode == null ? "" :
(" -> " + destNode.getNumber())));
+ log.service("Ready() " + sourceNode.getNumber() + (destNode == null ?
"" : (" -> " + destNode.getNumber())));
if (sourceNode.isNull("bitrate")) {
- log.service("Node " + sourceNode.getNumber() + " " +
sourceNode.getStringValue("url") + " is an image");
+ log.info("Node " + sourceNode.getNumber() + " " +
sourceNode.getStringValue("url") + " is an image");
util.toImage(sourceNode, destNode);
- } else if (! sourceNode.getNodeManager().hasField("width")) {
- log.service("Node " + sourceNode.getNumber() + " " +
sourceNode.getStringValue("url") + " is an audio");
+ } else if (sourceNode.isNull("width")) {
+ log.info("Node " + sourceNode.getNumber() + " " +
sourceNode.getStringValue("url") + " is an audio");
util.toAudio(sourceNode, destNode);
} else {
- log.service("Node " + sourceNode.getNumber() + " " +
sourceNode.getStringValue("url") + " is an video");
+ log.info("Node " + sourceNode.getNumber() + " " +
sourceNode.getStringValue("url") + " is an video");
util.toVideo(sourceNode, destNode);
}
//
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegRecognizer.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegRecognizer.java
2009-08-10 18:28:49 UTC (rev 37654)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegRecognizer.java
2009-08-10 18:46:58 UTC (rev 37655)
@@ -71,7 +71,7 @@
public static void main(String[] argv) throws Exception {
Logger logger = Logging.getLoggerInstance("RECOGNIZER");
- logger.setLevel(Level.WARN);
+ logger.setLevel(Level.DEBUG);
Recognizer recognizer = new FFMpegRecognizer().clone();
Analyzer a = new FFMpegAnalyzer();
Node source = AnalyzerUtils.getTestNode();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
