[MMBASE SCM] r38598 - in mmbase/trunk/applications/streams/src: main/java/org/mmbase/streams main/java/org/mmbase/streams/transcoders test/java/org/mmbase/streams test/java/org/mmbase/streams/transcoders

[michiel]

Author: michiel
Date: 2009-09-14 14:12:58 +0200 (Mon, 14 Sep 2009)
New Revision: 38598

Modified:
   
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/CreateCachesProcessor.java
   
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegTranscoder.java
   
mmbase/trunk/applications/streams/src/test/java/org/mmbase/streams/CreateCachesTest.java
   
mmbase/trunk/applications/streams/src/test/java/org/mmbase/streams/transcoders/RecognizerTest.java
Log:
various details

Modified: 
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/CreateCachesProcessor.java
===================================================================
--- 
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/CreateCachesProcessor.java
       2009-09-14 11:36:02 UTC (rev 38597)
+++ 
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/CreateCachesProcessor.java
       2009-09-14 12:12:58 UTC (rev 38598)
@@ -814,8 +814,10 @@
                     throw new UnsupportedOperationException();
                 }
                 public Result next() {
-                    i++;
-                    current = results.get(i);
+                    while(current == null || current.isReady()) {
+                        i++;
+                        current = results.get(i);
+                    }
                     if (current.definition.transcoder instanceof 
CommandTranscoder) {
                         // Get free method
                         CommandExecutor.Method m = null;

Modified: 
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegTranscoder.java
===================================================================
--- 
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegTranscoder.java
        2009-09-14 11:36:02 UTC (rev 38597)
+++ 
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/transcoders/FFMpegTranscoder.java
        2009-09-14 12:12:58 UTC (rev 38598)
@@ -39,8 +39,8 @@
     String r = null;
     String ac = null;
 
-    int width = -1;
-    int height = -1;
+    Integer width = null;
+    Integer height = null;
 
     /* Audio codec to use -acodec */
     public void setAcodec(String a) {
@@ -163,7 +163,7 @@
             args.add("-ac");
             args.add(ac);
         }
-        if (width > 0 && height > 0) {
+        if (width != null && height != null) {
             args.add("-s");
             args.add(width + "x" + height);
         }

Modified: 
mmbase/trunk/applications/streams/src/test/java/org/mmbase/streams/CreateCachesTest.java
===================================================================
--- 
mmbase/trunk/applications/streams/src/test/java/org/mmbase/streams/CreateCachesTest.java
    2009-09-14 11:36:02 UTC (rev 38597)
+++ 
mmbase/trunk/applications/streams/src/test/java/org/mmbase/streams/CreateCachesTest.java
    2009-09-14 12:12:58 UTC (rev 38598)
@@ -186,7 +186,7 @@
 
     @Test
     public void recognizerOnly() throws Exception  {
-        for (int i = 0; i < 300; i++) {
+        for (int i = 0; i < 3; i++) {
             CreateCachesProcessor proc = get("dummycreatecaches_0.xml");
             Node source = getNode(proc.getDirectory());
             CreateCachesProcessor.Job job = 
proc.createCaches(source.getCloud(), source.getNumber());

Modified: 
mmbase/trunk/applications/streams/src/test/java/org/mmbase/streams/transcoders/RecognizerTest.java
===================================================================
--- 
mmbase/trunk/applications/streams/src/test/java/org/mmbase/streams/transcoders/RecognizerTest.java
  2009-09-14 11:36:02 UTC (rev 38597)
+++ 
mmbase/trunk/applications/streams/src/test/java/org/mmbase/streams/transcoders/RecognizerTest.java
  2009-09-14 12:12:58 UTC (rev 38598)
@@ -61,6 +61,8 @@
         return  Arrays.asList(new Object[][] {
                 {new Case("basic.mpg", VIDEO, 320, 240)}
                 ,
+                {new Case("basic2.mpg", VIDEO, 352, 288)}
+                ,
                 {new Case("basic.mov", VIDEO, 640, 480)}
                 ,
                 {new Case("basic.mp3", AUDIO, -1, -1)}

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