corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 587678 - Implement ImageLayerOGL::GetCurrentAsSurface for YUV surfaces. r=bas a=blocking2.0:beta6+

Browse Source
This commit is contained in:
Matt Woodrow
2010-09-03 23:27:04 -04:00
parent a9ebf473d6
commit 7e292e5cda
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
gfx/layers/opengl/ImageLayerOGL.cpp
View File

@@ -38,6 +38,7 @@
#include "ImageLayerOGL.h"
#include "gfxImageSurface.h"
#include "yuv_convert.h"
#include "GLContextProvider.h"
using namespace mozilla::gl;
@@ -253,22 +254,37 @@ ImageContainerOGL::GetCurrentAsSurface(gfxIntSize *aSize)
GLContext *gl = nsnull;
// tex1 will be RGBA or Y, tex2 will Cb, tex3 will be Cr
GLuint tex1 = 0, tex2 = 0, tex3 = 0;
GLuint tex1 = 0;
gfxIntSize size;
if (mActiveImage->GetFormat() == Image::PLANAR_YCBCR) {
PlanarYCbCrImageOGL *yuvImage =
static_cast<PlanarYCbCrImageOGL*>(mActiveImage.get());
if (!yuvImage->HasData() || !yuvImage->HasTextures()) {
if (!yuvImage->HasData()) {
*aSize = gfxIntSize(0, 0);
return nsnull;
}
size = yuvImage->mSize;
gl = yuvImage->mTextures[0].GetGLContext();
tex1 = yuvImage->mTextures[0].GetTextureID();
tex2 = yuvImage->mTextures[1].GetTextureID();
tex3 = yuvImage->mTextures[2].GetTextureID();
nsRefPtr<gfxImageSurface> imageSurface =
new gfxImageSurface(size, gfxASurface::ImageFormatRGB24);
gfx::ConvertYCbCrToRGB32(yuvImage->mData.mYChannel,
yuvImage->mData.mCbChannel,
yuvImage->mData.mCrChannel,
imageSurface->Data(),
0,
0,
size.width,
size.height,
yuvImage->mData.mYStride,
yuvImage->mData.mCbCrStride,
imageSurface->Stride(),
yuvImage->mType);
*aSize = size;
return imageSurface.forget().get();
}
if (mActiveImage->GetFormat() == Image::CAIRO_SURFACE) {
@@ -279,9 +295,6 @@ ImageContainerOGL::GetCurrentAsSurface(gfxIntSize *aSize)
tex1 = cairoImage->mTexture.GetTextureID();
}
// XXX TODO: read all textures in YCbCr case and convert to RGB
// XXX Or maybe add a ReadYCbCrTextureImage that will take 3 textures
// and return RGB, since we can render YCbCr to the temporary framebuffer.
nsRefPtr<gfxImageSurface> s = gl->ReadTextureImage(tex1, size, LOCAL_GL_RGBA);
*aSize = size;
return s.forget();