Changeset 3578

Timestamp:

Mar 25, 2013 2:38:21 PM (11 years ago)

Author:

ldelgass

Message:

Send error if ffmpeg doesn't return any data. This should be a user-visible
error, but we haven't set up to send those from nanovis yet.

File:

• trunk/packages/vizservers/nanovis/FlowCmd.cpp (modified) (4 diffs)

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -1813 +1813 @@
             FFMPEG, tmpFileName, Tcl_GetString(switchesPtr->formatObjPtr), 
             switchesPtr->bitRate, switchesPtr->frameRate);
-    TRACE("MakeMovie %s", cmd);
+    TRACE("Enter: %s", cmd);
     FILE *f;
     f = popen(cmd, "r");
@@ -1833 +1833 @@
         }
         if (numRead < 0) {              // Error
-            ERROR("MakeMovie: can't read movie data: %s",
+            ERROR("Can't read movie data: %s",
                   Tcl_PosixError(interp));
             Tcl_AppendResult(interp, "can't read movie data: ", 
@@ -1840 +1840 @@
         }
         if (!data.append(buffer, numRead)) {
-            ERROR("MakeMovie: can't append movie data to buffer %d bytes",
+            ERROR("Can't append movie data to buffer %d bytes",
                   numRead);
             Tcl_AppendResult(interp, "can't append movie data to buffer",
@@ -1847 +1847 @@
         }
     }
-    sprintf(cmd,"nv>image -type movie -token \"%s\" -bytes %lu\n", 
-            token, (unsigned long)data.size());
-    NanoVis::sendDataToClient(cmd, data.bytes(), data.size());
-    return TCL_OK;
+    if (data.size() == 0) {
+        ERROR("ffmpeg returned 0 bytes");
+        Tcl_AppendResult(interp, "Couldn't create movie file",
+                         (char *)NULL);
+        return TCL_ERROR;
+    } else {
+        sprintf(cmd,"nv>image -type movie -token \"%s\" -bytes %lu\n", 
+                token, (unsigned long)data.size());
+        NanoVis::sendDataToClient(cmd, data.bytes(), data.size());
+        return TCL_OK;
+    }
 }