Changeset 4881 for nanovis/branches/1.1/FlowCmd.cpp

Timestamp:

Dec 19, 2014 3:49:27 PM (9 years ago)

Author:

ldelgass

Message:

Fixes for video generation

File:

• nanovis/branches/1.1/FlowCmd.cpp (modified) (7 diffs)

nanovis/branches/1.1/FlowCmd.cpp

@@ -1065 +1065 @@
 };
 
-static int
-ppmWriteToFile(Tcl_Interp *interp, const char *path, FlowVideoSwitches *switchesPtr)
-{
-    int f;
-    
+static bool
+ppmWriteToFile(const char *path, const unsigned char *imgData,
+               int width, int height)
+{
     /* Open the named file for writing. */
-    f = creat(path, 0600);
-    if (f < 0) {
-        Tcl_AppendResult(interp, "can't open temporary image file \"", path,
-                         "\": ", Tcl_PosixError(interp), (char *)NULL);
-        return TCL_ERROR;
+    int fdOut = creat(path, 0600);
+    if (fdOut < 0) {
+        ERROR("can't open temporary image file \"%s\": %s", path, strerror(errno));
+        return false;
     }
     // Generate the PPM binary file header
     char header[200];
 #define PPM_MAXVAL 255
-    sprintf(header, "P6 %d %d %d\n", switchesPtr->width, switchesPtr->height, 
+    sprintf(header, "P6 %d %d %d\n", width, height, 
         PPM_MAXVAL);
 
     size_t header_length = strlen(header);
-    size_t wordsPerRow = (switchesPtr->width * 24 + 31) / 32;
+    size_t wordsPerRow = (width * 24 + 31) / 32;
     size_t bytesPerRow = wordsPerRow * 4;
-    size_t rowLength = switchesPtr->width * 3;
-    size_t numRecords = switchesPtr->height + 1;
+    size_t rowLength = width * 3;
+    size_t numRecords = height + 1;
 
     struct iovec *iov;
@@ -1098 +1096 @@
     // Now add the image data, reversing the order of the rows.
     int y;
-    unsigned char *srcRowPtr = NanoVis::screenBuffer;
+    unsigned char *srcRowPtr = const_cast<unsigned char *>(imgData);
     /* Reversing the pointers for the image rows.  PPM is top-to-bottom. */
-    for (y = switchesPtr->height; y >= 1; y--) {
+    for (y = height; y >= 1; y--) {
         iov[y].iov_base = srcRowPtr;
         iov[y].iov_len = rowLength;
         srcRowPtr += bytesPerRow;
     }
-    if (writev(f, iov, numRecords) < 0) {
-        Tcl_AppendResult(interp, "writing image to \"", path, "\" failed: ", 
-                         Tcl_PosixError(interp), (char *)NULL);
+    if (writev(fdOut, iov, numRecords) < 0) {
+        ERROR("writing image to \"%s\" failed: %s", path, strerror(errno));
         free(iov);
-        close(f);
-        return TCL_ERROR;
-    }
-    close(f);
+        close(fdOut);
+        return false;
+    }
+    close(fdOut);
     free(iov);
-    return TCL_OK;
-}
-
-static int
-MakeImageFiles(Tcl_Interp *interp, char *tmpFileName, 
-               FlowVideoSwitches *switchesPtr, bool *cancelPtr)
+    return true;
+}
+
+static bool
+MakeImageFiles(char *tmpFileName,
+               int width, int height, int numFrames,
+               bool *cancelPtr)
 {
     struct pollfd pollResults;
@@ -1131 +1129 @@
     oldHeight = NanoVis::winHeight;
 
-    if ((switchesPtr->width != oldWidth) || 
-        (switchesPtr->height != oldHeight)) {
+    if (width != oldWidth ||
+        height != oldHeight) {
         // Resize to the requested size.
-        NanoVis::resizeOffscreenBuffer(switchesPtr->width, switchesPtr->height);
+        NanoVis::resizeOffscreenBuffer(width, height);
     }
     NanoVis::resetFlows();
     *cancelPtr = false;
-    int result = TCL_OK;
+    bool result = true;
     size_t length = strlen(tmpFileName);
-    for (int i = 1; i <= switchesPtr->numFrames; i++) {
+    for (int i = 1; i <= numFrames; i++) {
         if (((i & 0xF) == 0) && (poll(&pollResults, 1, timeout) > 0)) {
             /* If there's another command on stdin, that means the client is
@@ -1162 +1160 @@
 
         sprintf(tmpFileName + length, "/image%d.ppm", i);
-        result = ppmWriteToFile(interp, tmpFileName, switchesPtr);
-        if (result != TCL_OK) {
+        result = ppmWriteToFile(tmpFileName, NanoVis::screenBuffer,
+                                width, height);
+        if (!result) {
             break;
         }
     }
-    if ((switchesPtr->width != oldWidth) || 
-        (switchesPtr->height != oldHeight)) {
+    if (width != oldWidth || 
+        height != oldHeight) {
         NanoVis::resizeOffscreenBuffer(oldWidth, oldHeight);
     }
@@ -1193 +1192 @@
             switchesPtr->bitRate, switchesPtr->frameRate);
     TRACE("Enter: %s", cmd);
-    FILE *f;
-    f = popen(cmd, "r");
+    FILE *f = popen(cmd, "r");
     if (f == NULL) {
         Tcl_AppendResult(interp, "can't run ffmpeg: ", 
@@ -1203 +1201 @@
     size_t total = 0;
     for (;;) {
-        ssize_t numRead;
         char buffer[BUFSIZ]; 
         
-        numRead = fread(buffer, sizeof(unsigned char), BUFSIZ, f);
+        ssize_t numRead = fread(buffer, sizeof(unsigned char), BUFSIZ, f);
         total += numRead;
         if (numRead == 0) {             // EOF
@@ -1287 +1284 @@
     size_t length = strlen(tmpFileName);
     bool canceled = false;
-    result = MakeImageFiles(interp, tmpFileName, &switches, &canceled);
+    if (MakeImageFiles(tmpFileName,
+                       switches.width, switches.height, switches.numFrames,
+                       &canceled)) {
+        result = TCL_OK;
+    } else {
+        result = TCL_ERROR;
+    }
     if ((result == TCL_OK) && (!canceled)) {
         result = MakeMovie(interp, tmpFileName, token, &switches);