Changeset 4628 for geovis/trunk/Renderer.cpp

Timestamp:

Aug 27, 2014, 1:08:53 PM (10 years ago)

Author:

ldelgass

Message:

Add some Makefile flags for sleep throttling settings

File:

• geovis/trunk/Renderer.cpp (modified) (8 diffs)

geovis/trunk/Renderer.cpp

@@ -20 +20 @@
 #include <sys/time.h>
 #endif
-
-//#define USE_OSGEARTH_TRUNK
-#define USE_CACHE
 
 #include <osgDB/FileUtils>
@@ -89 +86 @@
     _bgColor[1] = 0;
     _bgColor[2] = 0;
-    _minFrameTime = 1.0/30.0;
+    //setMaximumFrameRateInHertz(15.0);
+    // 100MBit
+    setMaximumBitrate(1.0e8);
     _lastFrameTime = _minFrameTime;
+    TRACE("Bandwidth target: %.2f MBit", (float)(getMaximumBitrate()/1.0e6));
+    TRACE("Frame rate target: %.2f Hz", (float)getMaximumFrameRateInHertz());
 
     char *base = getenv("MAP_BASE_URI");
@@ -1026 +1027 @@
 }
 
-void Renderer::addImageLayer(const char *name,
+bool Renderer::addImageLayer(const char *name,
                              osgEarth::TileSourceOptions& opts,
                              bool makeShared,
@@ -1033 +1034 @@
     if (!_map.valid()) {
         ERROR("No map");
-        return;
+        return false;
     }
     TRACE("layer: %s", name);
@@ -1046 +1047 @@
         layerOpts.visible() = false;
     }
-    _map->addImageLayer(new osgEarth::ImageLayer(layerOpts));
+    osg::ref_ptr<osgEarth::ImageLayer> layer = new osgEarth::ImageLayer(layerOpts);
+    _map->addImageLayer(layer.get());
+    if (layer->getTileSource() == NULL || !layer->getTileSource()->isOK()) {
+        ERROR("Failed to add image layer: %s", name);
+        _map->removeImageLayer(layer.get());
+        return false;
+    }
     _needsRedraw = true;
+    return true;
 }
 
@@ -1307 +1315 @@
     TRACE("Setting window size to %dx%d", width, height);
 
+    double origBitrate = getMaximumBitrate();
+
     _windowWidth = width;
     _windowHeight = height;
+
+    setMaximumBitrate(origBitrate);
+    TRACE("Bandwidth target: %.2f MBit", (float)(getMaximumBitrate()/1.0e6));
+    TRACE("Frame rate target: %.2f Hz", (float)getMaximumFrameRateInHertz());
+
     if (_viewer.valid()) {
 #ifdef USE_OFFSCREEN_RENDERING
@@ -1647 +1662 @@
 }
 
+void Renderer::markFrameStart()
+{
+    _startFrameTime = osg::Timer::instance()->tick();
+}
+
+void Renderer::markFrameEnd()
+{
+    osg::Timer_t endFrameTick = osg::Timer::instance()->tick();
+    _lastFrameTime = osg::Timer::instance()->delta_s(_startFrameTime, endFrameTick);
+    TRACE("Frame time: %g sec", _lastFrameTime);
+#ifdef USE_THROTTLING_SLEEP
+    if (_lastFrameTime < _minFrameTime) {
+        TRACE("Sleeping for %g secs", _minFrameTime - _lastFrameTime);
+        OpenThreads::Thread::microSleep(static_cast<unsigned int>(1000000.0*(_minFrameTime - _lastFrameTime)));
+    }
+#endif
+}
+
 /**
  * \brief Cause the rendering to render a new image if needed
@@ -1657 +1690 @@
     if (_viewer.valid() && checkNeedToDoFrame()) {
         TRACE("Enter needsRedraw=%d",  _needsRedraw ? 1 : 0);
+#ifndef SLEEP_AFTER_QUEUE_FRAME
         osg::Timer_t startFrameTick = osg::Timer::instance()->tick();
+#endif
         TRACE("Before frame()");
         _viewer->frame();
         TRACE("After frame()");
+#ifndef SLEEP_AFTER_QUEUE_FRAME
         osg::Timer_t endFrameTick = osg::Timer::instance()->tick();
         _lastFrameTime = osg::Timer::instance()->delta_s(startFrameTick, endFrameTick);
         TRACE("Frame time: %g sec", _lastFrameTime);
-#if 0
-        if (frameTime < minFrameTime) {
-            TRACE("Sleeping for %g secs", minFrameTime-frameTime);
-            OpenThreads::Thread::microSleep(static_cast<unsigned int>(1000000.0*(minFrameTime-frameTime)));
-        }
+#ifdef USE_THROTTLING_SLEEP
+        if (_lastFrameTime < _minFrameTime) {
+            TRACE("Sleeping for %g secs", _minFrameTime - _lastFrameTime);
+            OpenThreads::Thread::microSleep(static_cast<unsigned int>(1000000.0*(_minFrameTime - _lastFrameTime)));
+        }
+#endif
 #endif
 #ifdef WANT_TRACE