Skip to content
This repository has been archived by the owner on Sep 30, 2018. It is now read-only.

Commit

Permalink
[smp] changed, 1) skip memcpy and use dfb surface directly for render…
Browse files Browse the repository at this point in the history 
…ing loaded imaged, 2) used WinSystemDFB managed image provider create/release so we retain the 1st one and skip the lengthy setup overhead for hw accelerated image decoding
  • Loading branch information
@davilla
davilla committed Jul 3, 2011
1 parent be66538 commit 72c86b1
Show file tree
Hide file tree
Showing 4 changed files with 138 additions and 38 deletions.
130 changes: 101 additions & 29 deletions xbmc/guilib/Texture.cpp 100644 → 100755
View file
Expand Up @@ -31,14 +31,14 @@
#include "filesystem/File.h"
#include "osx/DarwinUtils.h"
#endif
#if defined (HAS_DIRECTFB)
#if defined(HAS_DIRECTFB)
#include "filesystem/File.h"
#include "threads/SingleLock.h"
#include "threads/CriticalSection.h"
#include <directfb.h>
#endif

#if defined (HAS_DIRECTFB)
#if defined(HAS_DIRECTFB)
// we need this to serialize access to hw image decoder.
static CCriticalSection gHWLoaderSection;
#endif
Expand All @@ -53,13 +53,27 @@ CBaseTexture::CBaseTexture(unsigned int width, unsigned int height, unsigned int
m_texture = 0;
#endif
m_pixels = NULL;
#if defined(HAS_DIRECTFB)
m_dfbSurface = NULL;
#endif
m_loadedToGPU = false;
Allocate(width, height, format);
}

CBaseTexture::~CBaseTexture()
{
delete[] m_pixels;
#if defined(HAS_DIRECTFB)
if (m_dfbSurface && (m_format & XB_FMT_DFBSURFACE))
{
m_dfbSurface->Release(m_dfbSurface);
m_dfbSurface = NULL;
}
else
#endif
{
delete[] m_pixels;
m_pixels = NULL;
}
}

void CBaseTexture::Allocate(unsigned int width, unsigned int height, unsigned int format)
Expand Down Expand Up @@ -94,8 +108,13 @@ void CBaseTexture::Allocate(unsigned int width, unsigned int height, unsigned in
CLAMP(m_imageWidth, m_textureWidth);
CLAMP(m_imageHeight, m_textureHeight);

delete[] m_pixels;
m_pixels = new unsigned char[GetPitch() * GetRows()];
#if defined(HAS_DIRECTFB)
if (!(m_format & XB_FMT_DFBSURFACE))
#endif
{
delete[] m_pixels;
m_pixels = new unsigned char[GetPitch() * GetRows()];
}
}

void CBaseTexture::Update(unsigned int width, unsigned int height, unsigned int pitch, unsigned int format, const unsigned char *pixels, bool loadToGPU)
Expand All @@ -108,6 +127,13 @@ void CBaseTexture::Update(unsigned int width, unsigned int height, unsigned int
Allocate(width, height, XB_FMT_A8R8G8B8);
CDDSImage::Decompress(m_pixels, std::min(width, m_textureWidth), std::min(height, m_textureHeight), GetPitch(m_textureWidth), pixels, format);
}
#if defined(HAS_DIRECTFB)
else if (m_format & XB_FMT_DFBSURFACE)
{
CLog::Log(LOGERROR, "CBaseTexture::Update, should not be here, format is XB_FMT_DFBSURFACE");
Allocate(width, height, format);
}
#endif
else
{
Allocate(width, height, format);
Expand Down Expand Up @@ -139,30 +165,33 @@ void CBaseTexture::Update(unsigned int width, unsigned int height, unsigned int

void CBaseTexture::ClampToEdge()
{
unsigned int imagePitch = GetPitch(m_imageWidth);
unsigned int imageRows = GetRows(m_imageHeight);
unsigned int texturePitch = GetPitch(m_textureWidth);
unsigned int textureRows = GetRows(m_textureHeight);
if (imagePitch < texturePitch)
if (!(m_format & XB_FMT_DFBSURFACE))
{
unsigned int blockSize = GetBlockSize();
unsigned char *src = m_pixels + imagePitch - blockSize;
unsigned char *dst = m_pixels;
for (unsigned int y = 0; y < imageRows; y++)
unsigned int imagePitch = GetPitch(m_imageWidth);
unsigned int imageRows = GetRows(m_imageHeight);
unsigned int texturePitch = GetPitch(m_textureWidth);
unsigned int textureRows = GetRows(m_textureHeight);
if (imagePitch < texturePitch)
{
for (unsigned int x = imagePitch; x < texturePitch; x += blockSize)
memcpy(dst + x, src, blockSize);
dst += texturePitch;
unsigned int blockSize = GetBlockSize();
unsigned char *src = m_pixels + imagePitch - blockSize;
unsigned char *dst = m_pixels;
for (unsigned int y = 0; y < imageRows; y++)
{
for (unsigned int x = imagePitch; x < texturePitch; x += blockSize)
memcpy(dst + x, src, blockSize);
dst += texturePitch;
}
}
}

if (imageRows < textureRows)
{
unsigned char *dst = m_pixels + imageRows * texturePitch;
for (unsigned int y = imageRows; y < textureRows; y++)
if (imageRows < textureRows)
{
memcpy(dst, dst - texturePitch, texturePitch);
dst += texturePitch;
unsigned char *dst = m_pixels + imageRows * texturePitch;
for (unsigned int y = imageRows; y < textureRows; y++)
{
memcpy(dst, dst - texturePitch, texturePitch);
dst += texturePitch;
}
}
}
}
Expand Down Expand Up @@ -442,6 +471,8 @@ unsigned int CBaseTexture::GetPitch(unsigned int width) const
return ((width + 3) / 4) * 16;
case XB_FMT_A8:
return width;
case XB_FMT_DFBSURFACE:
return width*4;
case XB_FMT_A8R8G8B8:
default:
return width*4;
Expand All @@ -458,6 +489,8 @@ unsigned int CBaseTexture::GetRows(unsigned int height) const
case XB_FMT_DXT5:
case XB_FMT_DXT5_YCoCg:
return (height + 3) / 4;
case XB_FMT_DFBSURFACE:
return height;
default:
return height;
}
Expand All @@ -475,6 +508,8 @@ unsigned int CBaseTexture::GetBlockSize() const
return 16;
case XB_FMT_A8:
return 1;
case XB_FMT_DFBSURFACE:
return 4;
default:
return 4;
}
Expand Down Expand Up @@ -561,8 +596,9 @@ bool CBaseTexture::LoadHWAccelerated(const CStdString& texturePath)
}

IDirectFBImageProvider *provider = NULL;
err = buffer->CreateImageProvider(buffer, &provider);
if (err != DFB_OK)
// use g_Windowing to create the image provider and retain the 1st
// so we avoid recurring setup overhead.
if (!g_Windowing.CreateImageProvider(buffer, &provider, true))
{
CLog::Log(LOGERROR,"CBaseTexture::LoadHWAccelerated:buffer->CreateImageProvider failed");
buffer->Release(buffer);
Expand All @@ -579,6 +615,35 @@ bool CBaseTexture::LoadHWAccelerated(const CStdString& texturePath)
dsc.flags = (DFBSurfaceDescriptionFlags)(DSDESC_CAPS|DSDESC_WIDTH|DSDESC_HEIGHT|DSDESC_PIXELFORMAT);
provider->GetSurfaceDescription(provider, &dsc);

// remember original jpeg/png width, height.
unsigned int img_width = dsc.width;
unsigned int img_height = dsc.height;
// check size limits and limit to screen size - preserving aspectratio of image
if ( img_width > g_Windowing.GetMaxTextureSize() ||
img_height > g_Windowing.GetMaxTextureSize() )
{
float aspect;
if (img_width > img_height)
{
aspect = (float)img_width / (float)img_height;
img_width = g_Windowing.GetWidth();
img_height = (float)img_width / (float)aspect;
}
else
{
aspect = (float)img_height / (float)img_width;
img_height = g_Windowing.GetHeight();
img_width = (float)img_height / (float)aspect;
}
CLog::Log(LOGDEBUG, "CBaseTexture::LoadHWAccelerated:clamping image size: %i x %i",
img_height, img_height);
}
if (!g_Windowing.SupportsNPOT(false))
{
dsc.width = PadPow2(img_width);
dsc.height = PadPow2(img_height);
}

// set caps to DSCAPS_VIDEOONLY so we get hw decode.
dsc.caps = (DFBSurfaceCapabilities)(dsc.caps | DSCAPS_VIDEOONLY);
dsc.caps = (DFBSurfaceCapabilities)(dsc.caps &~DSCAPS_SYSTEMONLY);
Expand All @@ -597,12 +662,18 @@ bool CBaseTexture::LoadHWAccelerated(const CStdString& texturePath)
delete [] imageBuff;
return false;
}
provider->RenderTo(provider, imagesurface, NULL);
provider->Release(provider);
const DFBRectangle dstRect = {0, 0, img_width, img_height};
provider->RenderTo(provider, imagesurface, &dstRect);
// use g_Windowing to manage release
g_Windowing.ReleaseImageProvider(provider);
buffer->Release(buffer);
delete [] imageBuff;

Allocate(dsc.width, dsc.height, XB_FMT_A8R8G8B8);
#if 1
m_dfbSurface = imagesurface;
Allocate(img_width, img_height, XB_FMT_DFBSURFACE);
#else
Allocate(img_width, img_height, XB_FMT_A8R8G8B8);
// lock the rendered surface, get a read pointer to it
// and memcpy the contents into our m_pixels.
int gotpitch = 0;
Expand All @@ -613,6 +684,7 @@ bool CBaseTexture::LoadHWAccelerated(const CStdString& texturePath)
imagesurface->Release(imagesurface);
ClampToEdge();
#endif

return true;
#else
Expand Down
7 changes: 7 additions & 0 deletions xbmc/guilib/Texture.h 100644 → 100755
View file
Expand Up @@ -42,6 +42,9 @@ struct COLOR {unsigned char b,g,r,x;}; // Windows GDI expects 4bytes per color
class CTexture;
class CGLTexture;
class CDXTexture;
#if defined(HAS_DIRECTFB)
typedef struct _IDirectFBSurface IDirectFBSurface;
#endif

#pragma once

Expand Down Expand Up @@ -111,6 +114,10 @@ class CBaseTexture
unsigned int m_format;
int m_orientation;
bool m_hasAlpha;
#if defined(HAS_DIRECTFB)
IDirectFBSurface *m_dfbSurface;
#endif

};

#if defined(HAS_GL) || defined(HAS_GLES)
Expand Down
38 changes: 29 additions & 9 deletions xbmc/guilib/TextureGL.cpp 100644 → 100755
View file
Expand Up @@ -27,6 +27,10 @@

#if defined(HAS_GL) || defined(HAS_GLES)

#if defined(HAS_DIRECTFB)
#include <directfb.h>
#endif

using namespace std;

/************************************************************************/
Expand Down Expand Up @@ -55,7 +59,7 @@ void CGLTexture::DestroyTextureObject()

void CGLTexture::LoadToGPU()
{
if (!m_pixels)
if (!m_pixels && !m_dfbSurface)
{
// nothing to load - probably same image (no change)
return;
Expand Down Expand Up @@ -127,15 +131,31 @@ void CGLTexture::LoadToGPU()
#else // GLES version
m_textureWidth = maxSize;
}

#if HAS_GLES == 1
glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, m_textureWidth, m_textureHeight, 0,
GL_BGRA_EXT, GL_UNSIGNED_BYTE, m_pixels);
#elif HAS_GLES == 2
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_textureWidth, m_textureHeight, 0,
GL_RGBA, GL_UNSIGNED_BYTE, m_pixels);
#if defined (HAS_DIRECTFB)
if (m_format & XB_FMT_DFBSURFACE)
{
int imgpitch = 0;
void *imgsrc = NULL;
m_dfbSurface->Lock(m_dfbSurface, DSLF_READ , &imgsrc, &imgpitch);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_textureWidth, m_textureHeight, 0,
GL_RGBA, GL_UNSIGNED_BYTE, imgsrc);
VerifyGLState();

m_dfbSurface->Unlock(m_dfbSurface);
m_dfbSurface->Release(m_dfbSurface);
m_dfbSurface = NULL;
}
else
#endif

{
#if HAS_GLES == 1
glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT, m_textureWidth, m_textureHeight, 0,
GL_BGRA_EXT, GL_UNSIGNED_BYTE, m_pixels);
#elif HAS_GLES == 2
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_textureWidth, m_textureHeight, 0,
GL_RGBA, GL_UNSIGNED_BYTE, m_pixels);
#endif
}
#endif
VerifyGLState();

Expand Down
1 change: 1 addition & 0 deletions xbmc/guilib/XBTF.h 100644 → 100755
View file
Expand Up @@ -36,6 +36,7 @@
#define XB_FMT_DXT5_YCoCg 8
#define XB_FMT_A8R8G8B8 16
#define XB_FMT_A8 32
#define XB_FMT_DFBSURFACE 64

class CXBTFFrame
{
Expand Down

0 comments on commit 72c86b1

Please sign in to comment.