X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5..5e214d181d1590e0002eabdc6f8395cd6ddde2a7:/lib/gdi/gfbdc.cpp diff --git a/lib/gdi/gfbdc.cpp b/lib/gdi/gfbdc.cpp index 83f681d7..80dd2479 100644 --- a/lib/gdi/gfbdc.cpp +++ b/lib/gdi/gfbdc.cpp @@ -2,10 +2,20 @@ #include #include -#include + +#include + +#include gFBDC *gFBDC::instance; +ePtr NewgFBDCPtr(void) +{ + ePtr ptr; + gFBDC::getInstance(ptr); + return ptr; +} + gFBDC::gFBDC() { instance=this; @@ -14,28 +24,16 @@ gFBDC::gFBDC() 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 - pixmap=new gPixmap(); - pixmap->x=720; - pixmap->y=576; - pixmap->bpp=8; - pixmap->bypp=1; - pixmap->stride=fb->Stride(); - pixmap->data=fb->lfb; - - pixmap->clut.colors=256; - pixmap->clut.data=new gRGB[pixmap->clut.colors]; - memset(pixmap->clut.data, 0, sizeof(*pixmap->clut.data)*pixmap->clut.colors); reloadSettings(); } gFBDC::~gFBDC() { - delete pixmap; delete fb; + delete[] surface.clut.data; instance=0; } @@ -56,7 +54,7 @@ void gFBDC::calcRamp() if (d > 255) d=255; ramp[i]=d; - + rampalpha[i]=i*alpha/256; } #endif @@ -72,10 +70,7 @@ void gFBDC::calcRamp() d=255; ramp[i]=d; -/* if ( eDVB::getInstance()->getmID == 1 ) - rampalpha[i]=i*alpha/65535; - else*/ - rampalpha[i]=i*alpha/256; + rampalpha[i]=i*alpha/256; } rampalpha[255]=255; // transparent BLEIBT bitte so. @@ -83,17 +78,15 @@ void gFBDC::calcRamp() void gFBDC::setPalette() { - if (!pixmap->clut.data) + if (!surface.clut.data) return; - + for (int i=0; i<256; ++i) { - fb->CMAP()->red[i]=ramp[pixmap->clut.data[i].r]<<8; - fb->CMAP()->green[i]=ramp[pixmap->clut.data[i].g]<<8; - fb->CMAP()->blue[i]=ramp[pixmap->clut.data[i].b]<<8; - fb->CMAP()->transp[i]=rampalpha[pixmap->clut.data[i].a]<<8; - if (!fb->CMAP()->red[i]) - fb->CMAP()->red[i]=0x100; + 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; } fb->PutCMAP(); } @@ -104,19 +97,51 @@ void gFBDC::exec(gOpcode *o) { case gOpcode::setPalette: { - gPixmapDC::exec(o); + gDC::exec(o); setPalette(); break; } - default: - gPixmapDC::exec(o); + 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; -gFBDC *gFBDC::getInstance() -{ - return instance; + 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; + } } void gFBDC::setAlpha(int a) @@ -143,24 +168,81 @@ void gFBDC::setGamma(int g) 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; ylfb+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() { - eConfig::getInstance()->setKey("/ezap/osd/alpha", alpha); - eConfig::getInstance()->setKey("/ezap/osd/gamma", gamma); - eConfig::getInstance()->setKey("/ezap/osd/brightness", brightness); } 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(); } -eAutoInitP0 init_gFBDC(eAutoInitNumbers::graphic+1, "GFBDC"); +// eAutoInitPtr init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC"); +#ifndef WITH_SDL +eAutoInitPtr init_gFBDC(eAutoInitNumbers::graphic-1, "GFBDC"); +#endif