fixes bug #582

[enigma2.git] / lib / gdi / gfbdc.cpp

diff --git a/lib/gdi/gfbdc.cpp b/lib/gdi/gfbdc.cpp
index 7130b0c71f161d3bf796aeb1770baaa016286010..80dd2479b52b92d97a983b5ddf38c4de6dd8b326 100644 (file)
--- a/lib/gdi/gfbdc.cpp
+++ b/lib/gdi/gfbdc.cpp
@@ -2,10 +2,20 @@
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>

-#include <lib/base/econfig.h>
+
+#include <lib/gdi/accel.h>
+
+#include <time.h>

 
 gFBDC *gFBDC::instance;
 
 
 gFBDC *gFBDC::instance;
 

+ePtr<gFBDC> NewgFBDCPtr(void)
+{
+       ePtr<gFBDC> ptr;
+       gFBDC::getInstance(ptr);
+       return ptr;
+}
+

 gFBDC::gFBDC()
 {
        instance=this;
 gFBDC::gFBDC()
 {
        instance=this;


@@ -14,30 +24,16 @@ gFBDC::gFBDC()
        if (!fb->Available())
                eFatal("no framebuffer available");
 
        if (!fb->Available())
                eFatal("no framebuffer available");
 

-       fb->SetMode(720, 576, 8);
-
-       for (int y=0; y<576; y++)                                                                                                                                                // make whole screen transparent
-               memset(fb->lfb+y*fb->Stride(), 0x00, fb->Stride());
+       surface.clut.data = 0;
+       setResolution(720, 576); // default res

 
 

-       surface.type = 0;
-       surface.x = 720;
-       surface.y = 576;
-       surface.bpp = 8;
-       surface.bypp = 1;
-       surface.stride = fb->Stride();
-       surface.data = fb->lfb;
-       surface.clut.colors=256;
-       surface.clut.data=new gRGB[surface.clut.colors];
-       
-       m_pixmap = new gPixmap(&surface);
-       
-       memset(surface.clut.data, 0, sizeof(*surface.clut.data)*surface.clut.colors);

        reloadSettings();
 }
 
 gFBDC::~gFBDC()
 {
        delete fb;
        reloadSettings();
 }
 
 gFBDC::~gFBDC()
 {
        delete fb;

+       delete[] surface.clut.data;

        instance=0;
 }
 
        instance=0;
 }
 


@@ -58,7 +54,7 @@ void gFBDC::calcRamp()
                if (d > 255)
                        d=255;
                ramp[i]=d;
                if (d > 255)
                        d=255;
                ramp[i]=d;

-               
+

                rampalpha[i]=i*alpha/256;
        }
 #endif
                rampalpha[i]=i*alpha/256;
        }
 #endif


@@ -84,15 +80,13 @@ void gFBDC::setPalette()
 {
        if (!surface.clut.data)
                return;
 {
        if (!surface.clut.data)
                return;

-       
+

        for (int i=0; i<256; ++i)
        {
                fb->CMAP()->red[i]=ramp[surface.clut.data[i].r]<<8;
                fb->CMAP()->green[i]=ramp[surface.clut.data[i].g]<<8;
                fb->CMAP()->blue[i]=ramp[surface.clut.data[i].b]<<8;
                fb->CMAP()->transp[i]=rampalpha[surface.clut.data[i].a]<<8;
        for (int i=0; i<256; ++i)
        {
                fb->CMAP()->red[i]=ramp[surface.clut.data[i].r]<<8;
                fb->CMAP()->green[i]=ramp[surface.clut.data[i].g]<<8;
                fb->CMAP()->blue[i]=ramp[surface.clut.data[i].b]<<8;
                fb->CMAP()->transp[i]=rampalpha[surface.clut.data[i].a]<<8;

-               if (!fb->CMAP()->red[i])
-                       fb->CMAP()->red[i]=0x100;

        }
        fb->PutCMAP();
 }
        }
        fb->PutCMAP();
 }


@@ -107,6 +101,43 @@ void gFBDC::exec(gOpcode *o)
                setPalette();
                break;
        }
                setPalette();
                break;
        }

+       case gOpcode::flip:
+       {
+               if (m_enable_double_buffering)
+               {
+                       gSurface s(surface);
+                       surface = surface_back;
+                       surface_back = s;
+
+                       fb->setOffset(surface_back.offset);
+               }
+               break;
+       }
+       case gOpcode::waitVSync:
+       {
+               static timeval l;
+               static int t;
+               timeval now;
+
+               if (t == 1000)
+               {
+                       gettimeofday(&now, 0);
+
+                       int diff = (now.tv_sec - l.tv_sec) * 1000 + (now.tv_usec - l.tv_usec) / 1000;
+                       eDebug("%d ms latency (%d fps)", diff, t * 1000 / (diff ? diff : 1));
+                       l = now;
+                       t = 0;
+               }
+
+               ++t;
+
+               fb->blit();
+               fb->waitVSync();
+               break;
+       }
+       case gOpcode::flush:
+               fb->blit();
+               break;

        default:
                gDC::exec(o);
                break;
        default:
                gDC::exec(o);
                break;


@@ -137,28 +168,81 @@ void gFBDC::setGamma(int g)
        setPalette();
 }
 
        setPalette();
 }
 

+void gFBDC::setResolution(int xres, int yres)
+{
+       if ((m_xres == xres) && (m_yres == yres))
+               return;
+
+       m_xres = xres; m_yres = yres;
+
+       fb->SetMode(m_xres, m_yres, 32);
+
+       for (int y=0; y<m_yres; y++)    // make whole screen transparent
+               memset(fb->lfb+y*fb->Stride(), 0x00, fb->Stride());
+
+       surface.type = 0;
+       surface.x = m_xres;
+       surface.y = m_yres;
+       surface.bpp = 32;
+       surface.bypp = 4;
+       surface.stride = fb->Stride();
+       surface.data = fb->lfb;
+       surface.offset = 0;
+
+       surface.data_phys = fb->getPhysAddr();
+
+       int fb_size = surface.stride * surface.y;
+
+       if (fb->getNumPages() > 1)
+       {
+               m_enable_double_buffering = 1;
+               surface_back.type = 0;
+               surface_back.x = m_xres;
+               surface_back.y = m_yres;
+               surface_back.bpp = 32;
+               surface_back.bypp = 4;
+               surface_back.stride = fb->Stride();
+               surface_back.offset = surface.y;
+               surface_back.data = fb->lfb + fb_size;
+               surface_back.data_phys = surface.data_phys + fb_size;
+
+               fb_size *= 2;
+       } else
+               m_enable_double_buffering = 0;
+
+       eDebug("%dkB available for acceleration surfaces.", (fb->Available() - fb_size)/1024);
+       eDebug("resolution: %d x %d x %d (stride: %d)", surface.x, surface.y, surface.bpp, fb->Stride());
+
+       if (gAccel::getInstance())
+               gAccel::getInstance()->setAccelMemorySpace(fb->lfb + fb_size, surface.data_phys + fb_size, fb->Available() - fb_size);
+
+       if (!surface.clut.data)
+       {
+               surface.clut.colors = 256;
+               surface.clut.data = new gRGB[surface.clut.colors];
+               memset(surface.clut.data, 0, sizeof(*surface.clut.data)*surface.clut.colors);
+       }
+
+       surface_back.clut = surface.clut;
+
+       m_pixmap = new gPixmap(&surface);
+}
+

 void gFBDC::saveSettings()
 {
 void gFBDC::saveSettings()
 {

-       eConfig::getInstance()->setKey("/ezap/osd/alpha", alpha);
-       eConfig::getInstance()->setKey("/ezap/osd/gamma", gamma);
-       eConfig::getInstance()->setKey("/ezap/osd/brightness", brightness);

 }
 
 void gFBDC::reloadSettings()
 {
 }
 
 void gFBDC::reloadSettings()
 {

-       if (eConfig::getInstance()->getKey("/ezap/osd/alpha", alpha))
-               alpha=255;
-       if (eConfig::getInstance()->getKey("/ezap/osd/gamma", gamma))
-               gamma=128;
-       if (eConfig::getInstance()->getKey("/ezap/osd/brightness", brightness))
-               brightness=128;
+       alpha=255;
+       gamma=128;
+       brightness=128;

 
        calcRamp();
        setPalette();
 }
 
 // eAutoInitPtr<gFBDC> init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC");
 
        calcRamp();
        setPalette();
 }
 
 // eAutoInitPtr<gFBDC> init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC");

-#ifndef SDLDC
+#ifndef WITH_SDL

 eAutoInitPtr<gFBDC> init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC");
 #endif
 eAutoInitPtr<gFBDC> init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC");
 #endif

-