Changeset 3584 for trunk

Timestamp:

Mar 25, 2013, 6:47:35 PM (12 years ago)

Author:

ldelgass

Message:

Revert video command to return zero length image response if ffmpeg fails so
the client can deal with the error. However, continue to log an error on the
server end if ffmpeg fails.

File:

• trunk/packages/vizservers/nanovis/FlowCmd.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -1849 +1849 @@
     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;
-    }
+    }
+    // Send zero length to client so it can deal with error
+    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;
 }