Changeset 6380 for geovis

Timestamp:

Jun 13, 2016 1:02:31 PM (8 years ago)

Author:

ldelgass

Message:

Add commandline option to set max bitrate (in kbps)

Location:

geovis/trunk

Files:

• ReadBuffer.cpp (modified) (1 diff)
• RenderServer.cpp (modified) (3 diffs)
• Renderer.cpp (modified) (2 diffs)
• Renderer.h (modified) (1 diff)

geovis/trunk/ReadBuffer.cpp

@@ -26 +26 @@
     _lastStatus(OK)
 {
-    _bytes = new unsigned char [_bufferSize];
+    _bytes = new unsigned char[_bufferSize];
     flush();
 }

geovis/trunk/RenderServer.cpp

@@ -296 +296 @@
 
     std::string resourcePath;
+    double maxbitrate = 1.0e8;
     while (1) {
-        int c = getopt(argc, argv, "p:i:o:");
+        int c = getopt(argc, argv, "r:p:i:o:");
         if (c == -1) {
             break;
@@ -304 +305 @@
         case 'p':
             resourcePath = optarg;
+            break;
+        case 'r':
+            // Option is in kbps
+            maxbitrate = 1000.0 * (double)atol(optarg);
             break;
         case 'i': {
@@ -355 +360 @@
     g_inBufPtr = new ReadBuffer(g_fdIn, 1<<12);
 
+    g_renderer->setMaximumBitrate(maxbitrate);
     if (resourcePath.empty()) {
         resourcePath = "/usr/share/osgearth/data";

geovis/trunk/Renderer.cpp

@@ -136 +136 @@
     _bgColor[1] = 0;
     _bgColor[2] = 0;
-    //setMaximumFrameRateInHertz(15.0);
     // 100 Mbps
     setMaximumBitrate(1.0e8);
     _lastFrameTime = _minFrameTime;
-    TRACE("Bandwidth target: %.2f Mbps", (float)(getMaximumBitrate()/1.0e6));
-    TRACE("Frame rate target: %.2f Hz", (float)getMaximumFrameRateInHertz());
-    TRACE("Frame time target: %.2f msec", _minFrameTime * 1000.0f);
 
     iDataInit(getenv("USER"));
@@ -2317 +2313 @@
 
     setMaximumBitrate(origBitrate);
-    TRACE("Bandwidth target: %.2f Mbps", (float)(getMaximumBitrate()/1.0e6));
-    TRACE("Frame rate target: %.2f Hz", (float)getMaximumFrameRateInHertz());
 
     if (_viewer.valid()) {

geovis/trunk/Renderer.h

@@ -500 +500 @@
             }
         }
+        TRACE("Frame rate target: %.2f Hz", (float)getMaximumFrameRateInHertz());
+        TRACE("Frame time target: %.2f msec", _minFrameTime * 1000.0f);
     }
 
     void setMaximumBitrate(double bitsPerSecond)
     {
+        TRACE("Setting max bitrate to %g", bitsPerSecond);
         unsigned long bitsPerFrame = (_windowWidth * _windowHeight * 3 + 16) * 8;
         double fps = bitsPerSecond / ((double)bitsPerFrame);
         setMaximumFrameRateInHertz(fps);
+        TRACE("Bandwidth target: %.2f Mbps", (float)(getMaximumBitrate()/1.0e6));
     }