[MMBASE SCM] r35499 - in speeltuin/mihxil/streams/src/main/java/org/mmbase/streams: . transcoders

[michiel]

Author: michiel
Date: 2009-05-29 13:28:06 +0200 (Fri, 29 May 2009)
New Revision: 35499

Modified:
   
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/CreateCachesProcessor.java
   
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraAnalyzer.java
Log:


Modified: 
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/CreateCachesProcessor.java
===================================================================
--- 
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/CreateCachesProcessor.java
        2009-05-29 09:27:38 UTC (rev 35498)
+++ 
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/CreateCachesProcessor.java
        2009-05-29 11:28:06 UTC (rev 35499)
@@ -259,10 +259,10 @@
                                     if (node.isChanged()) {
                                         node.commit();
                                     }
-
                                     cacheNode.setIntValue("state", 
State.DONE.getValue());
                                     cacheNode.commit();
                                     result++;
+                                    logger.service("READY " + jd);
                                     if 
(Thread.currentThread().isInterrupted()){
                                         logger.service("Interrupted");
                                         break;
@@ -339,6 +339,10 @@
             analyzers  = jd.analyzers;
 
         }
+        @Override
+        public String toString() {
+            return "" + transcoder + analyzers;
+        }
     }
 
     public class Job {
@@ -377,6 +381,11 @@
         public String getProgress() {
             return "" + busy + "/" + size;
         }
+
+        @Override
+        public String toString() {
+            return user + ":" + transcoder + ":" + getProgress();
+        }
     }
 
 }

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-05-29 09:27:38 UTC (rev 35498)
+++ 
speeltuin/mihxil/streams/src/main/java/org/mmbase/streams/transcoders/FFMpeg2TheoraAnalyzer.java
    2009-05-29 11:28:06 UTC (rev 35499)
@@ -36,7 +36,7 @@
     private static final Pattern PROGRESS = Pattern.compile("\\s*(.*?) audio: 
([0-9]+)kbps video: ([0-9]+)kbps, time remaining: .*");
 
     private long length = 0;
-    private double bits = 0;
+    private double bits = -1;
     private long prevPos = 0;
 
 
@@ -78,7 +78,9 @@
 
     public void ready(Node sourceNode, Node destNode) {
         System.out.println("length: " + length + " prevPos " + prevPos);
-        destNode.setIntValue("bitrate", (int) (bits / length));
+        if (bits > 0 && length > 0) {
+            destNode.setIntValue("bitrate", (int) (bits / length));
+        }
     }
 
     public FFMpeg2TheoraAnalyzer clone() {

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs