Changeset 2810 for trunk

Timestamp:

Mar 6, 2012, 12:14:32 PM (13 years ago)

Author:

ldelgass

Message:

Movie bitrate flag is an int not a float

Location:

trunk/packages/vizservers/nanovis

Files:

• FlowCmd.cpp (modified) (4 diffs)
• RpAVTranslate.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/FlowCmd.cpp

@@ -1944 +1944 @@
 
 Rappture::SwitchSpec FlowCmd::videoSwitches[] = {
-    {Rappture::SWITCH_FLOAT, "-bitrate", "value",
+    {Rappture::SWITCH_INT, "-bitrate", "value",
         offsetof(FlowVideoValues, bitRate), 0},
     {Rappture::SWITCH_CUSTOM, "-format", "string",
@@ -1977 +1977 @@
     token = Tcl_GetString(objv[2]);
     values.frameRate = 25.0f;           // Default frame rate 25 fps
-    values.bitRate = 6.0e+6f;           // Default video bit rate.
+    values.bitRate = 6000000;           // Default video bit rate.
     values.width = NanoVis::win_width;
     values.height = NanoVis::win_height;
@@ -1995 +1995 @@
         return TCL_ERROR;
     }
-    if (values.bitRate < 0.0f) {
+    if (values.bitRate < 0) {
         Tcl_AppendResult(interp, "bad bit rate.", (char *)NULL);
         return TCL_ERROR;
@@ -2012 +2012 @@
     Rappture::Outcome context;
 
-    Rappture::AVTranslate movie(values.width, values.height, values.bitRate, 
-        values.frameRate);
+    Rappture::AVTranslate movie(values.width, values.height,
+                                values.bitRate, 
+                                values.frameRate);
     char tmpFileName[200];
     sprintf(tmpFileName,"/tmp/flow%d.mpeg", getpid());

trunk/packages/vizservers/nanovis/RpAVTranslate.cpp

@@ -81 +81 @@
 
 AVTranslate::AVTranslate(size_t width, size_t height, size_t bitRate,
-                         float frameRate)
-  : _width (width),
+                         float frameRate) :
+    _width (width),
     _height (height),
     _bitRate(bitRate),