r46710 - mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders

[andre]

Author: andre
Date: 2014-09-05 15:13:20 +0200 (Fri, 05 Sep 2014)
New Revision: 46710

Modified:
mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
Log:
doing some extra processing on codecs since newer version of ffmpeg don't use lib before codec

Modified: mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java
===================================================================
--- mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java 2014-09-03 06:21:37 UTC (rev 46709)
+++ mmbase/branches/MMBase-1_9/applications/streams/src/main/java/org/mmbase/streams/transcoders/AnalyzerUtils.java 2014-09-05 13:13:20 UTC (rev 46710)
@@ -21,21 +21,21 @@

package org.mmbase.streams.transcoders;

-import java.io.File;
-import java.util.Date;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
import org.mmbase.applications.media.Codec;
import org.mmbase.applications.media.State;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
import org.mmbase.servlet.FileServlet;
import org.mmbase.util.MimeType;
+import org.mmbase.util.logging.ChainedLogger;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;

+import java.io.File;
+import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;

-import org.mmbase.util.logging.*;
-
/**
* Utility methods common for the analyzers that look for several media audio, video and images,
* that try to extract information, convert nodetypes to the matching kind etc.
@@ -529,8 +529,12 @@
if (str.equals("libmp3lame")) str = "mp3";
if (str.equals("mpeg1video")) str = "mpeg";
if (str.equals("mpeg2video")) str = "mpeg2";
- if (str.startsWith("lib")) str = str.substring(3, str.length());
-
+ if (str.startsWith("lib")) {
+ int pos = str.indexOf(" ");
+ str = str.substring(3, pos);
+ } else if (str.indexOf(" ") > -1) {
+ str = str.substring(0, str.indexOf(" "));
+ }
return Codec.get(str);
}