jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-01 15:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc-pvr: update XVBA patch

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-04-05 16:02:03 +02:00
parent 42270be4b2
commit 5a45c3555f
1 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-11.0.1-902.01-xvba_support-46bda285a6b3a8cebdb5760780101fe71d74a766.patch → packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-11.0.1-902.01-xvba_support-fc969e525002544a65cbf9660c4562cd4e2d45f1.patch
View File

@ -1045,7 +1045,7 @@ index f0b4aeb..47d25e4 100644
m_paused = false; m_paused = false;
m_clock = 0; m_clock = 0;
diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
index 8172750..d6f91da 100644 index 8172750..77e4855 100644
--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp --- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp +++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
@@ -61,6 +61,9 @@ @@ -61,6 +61,9 @@
@ -1086,7 +1086,19 @@ index 8172750..d6f91da 100644
//m_iYV12RenderBuffer = 0; //m_iYV12RenderBuffer = 0;
return; return;
} }
@@ -569,6 +577,11 @@ void CLinuxRendererGL::Flush() @@ -241,6 +249,11 @@ bool CLinuxRendererGL::ValidateRenderTarget()
else
CLog::Log(LOGNOTICE,"Using GL_TEXTURE_2D");
+ // function pointer for texture might change in
+ // call to LoadShaders
+ for (int i = 0 ; i < m_NumYV12Buffers ; i++)
+ (this->*m_textureDelete)(i);
+
// create the yuv textures
LoadShaders();
@@ -569,6 +582,11 @@ void CLinuxRendererGL::Flush()
m_bValidated = false; m_bValidated = false;
} }
@ -1098,7 +1110,7 @@ index 8172750..d6f91da 100644
void CLinuxRendererGL::Update(bool bPauseDrawing) void CLinuxRendererGL::Update(bool bPauseDrawing)
{ {
if (!m_bConfigured) return; if (!m_bConfigured) return;
@@ -730,14 +743,15 @@ unsigned int CLinuxRendererGL::PreInit() @@ -730,14 +748,15 @@ unsigned int CLinuxRendererGL::PreInit()
{ {
CSingleLock lock(g_graphicsContext); CSingleLock lock(g_graphicsContext);
m_bConfigured = false; m_bConfigured = false;
@ -1117,7 +1129,7 @@ index 8172750..d6f91da 100644
// setup the background colour // setup the background colour
m_clearColour = (float)(g_advancedSettings.m_videoBlackBarColour & 0xff) / 0xff; m_clearColour = (float)(g_advancedSettings.m_videoBlackBarColour & 0xff) / 0xff;
@@ -817,7 +831,7 @@ void CLinuxRendererGL::UpdateVideoFilter() @@ -817,7 +836,7 @@ void CLinuxRendererGL::UpdateVideoFilter()
case VS_SCALINGMETHOD_LINEAR: case VS_SCALINGMETHOD_LINEAR:
SetTextureFilter(m_scalingMethod == VS_SCALINGMETHOD_NEAREST ? GL_NEAREST : GL_LINEAR); SetTextureFilter(m_scalingMethod == VS_SCALINGMETHOD_NEAREST ? GL_NEAREST : GL_LINEAR);
m_renderQuality = RQ_SINGLEPASS; m_renderQuality = RQ_SINGLEPASS;
@ -1126,7 +1138,7 @@ index 8172750..d6f91da 100644
{ {
m_pVideoFilterShader = new StretchFilterShader(); m_pVideoFilterShader = new StretchFilterShader();
if (!m_pVideoFilterShader->CompileAndLink()) if (!m_pVideoFilterShader->CompileAndLink())
@@ -898,6 +912,11 @@ void CLinuxRendererGL::LoadShaders(int field) @@ -898,6 +917,11 @@ void CLinuxRendererGL::LoadShaders(int field)
CLog::Log(LOGNOTICE, "GL: Using VAAPI render method"); CLog::Log(LOGNOTICE, "GL: Using VAAPI render method");
m_renderMethod = RENDER_VAAPI; m_renderMethod = RENDER_VAAPI;
} }
@ -1138,7 +1150,7 @@ index 8172750..d6f91da 100644
else else
{ {
int requestedMethod = g_guiSettings.GetInt("videoplayer.rendermethod"); int requestedMethod = g_guiSettings.GetInt("videoplayer.rendermethod");
@@ -1032,6 +1051,18 @@ void CLinuxRendererGL::LoadShaders(int field) @@ -1032,6 +1056,18 @@ void CLinuxRendererGL::LoadShaders(int field)
m_textureCreate = &CLinuxRendererGL::CreateVAAPITexture; m_textureCreate = &CLinuxRendererGL::CreateVAAPITexture;
m_textureDelete = &CLinuxRendererGL::DeleteVAAPITexture; m_textureDelete = &CLinuxRendererGL::DeleteVAAPITexture;
} }
@ -1157,7 +1169,7 @@ index 8172750..d6f91da 100644
else else
{ {
// setup default YV12 texture handlers // setup default YV12 texture handlers
@@ -1125,6 +1156,13 @@ void CLinuxRendererGL::Render(DWORD flags, int renderBuffer) @@ -1125,6 +1161,13 @@ void CLinuxRendererGL::Render(DWORD flags, int renderBuffer)
RenderVDPAU(renderBuffer, m_currentField); RenderVDPAU(renderBuffer, m_currentField);
} }
#endif #endif
@ -1171,7 +1183,7 @@ index 8172750..d6f91da 100644
#ifdef HAVE_LIBVA #ifdef HAVE_LIBVA
else if (m_renderMethod & RENDER_VAAPI) else if (m_renderMethod & RENDER_VAAPI)
{ {
@@ -1598,6 +1636,77 @@ void CLinuxRendererGL::RenderVAAPI(int index, int field) @@ -1598,6 +1641,77 @@ void CLinuxRendererGL::RenderVAAPI(int index, int field)
#endif #endif
} }
@ -1249,14 +1261,15 @@ index 8172750..d6f91da 100644
void CLinuxRendererGL::RenderSoftware(int index, int field) void CLinuxRendererGL::RenderSoftware(int index, int field)
{ {
YUVPLANES &planes = m_buffers[index].fields[field]; YUVPLANES &planes = m_buffers[index].fields[field];
@@ -2352,6 +2461,424 @@ void CLinuxRendererGL::UploadVAAPITexture(int index) @@ -2352,6 +2466,426 @@ void CLinuxRendererGL::UploadVAAPITexture(int index)
#endif #endif
} }
+void CLinuxRendererGL::DeleteXVBATexture(int index) +void CLinuxRendererGL::DeleteXVBATexture(int index)
+{ +{
+#ifdef HAVE_LIBXVBA +#ifdef HAVE_LIBXVBA
+ YUVPLANE &plane = m_buffers[index].fields[0][1]; + YUVPLANE &planeFallback = m_buffers[index].fields[0][1];
+ YUVFIELDS &fields = m_buffers[index].fields;
+ +
+ if (m_buffers[index].xvba) + if (m_buffers[index].xvba)
+ m_buffers[index].xvba->FinishGL(); + m_buffers[index].xvba->FinishGL();
@ -1264,11 +1277,12 @@ index 8172750..d6f91da 100644
+ SAFE_RELEASE(m_buffers[index].xvba); + SAFE_RELEASE(m_buffers[index].xvba);
+ SAFE_RELEASE(m_buffers[index].xvba_tmp); + SAFE_RELEASE(m_buffers[index].xvba_tmp);
+ +
+ if(plane.id && glIsTexture(plane.id)) + if(planeFallback.id && glIsTexture(planeFallback.id))
+ glDeleteTextures(1, &plane.id); + glDeleteTextures(1, &planeFallback.id);
+ plane.id = 0; + planeFallback.id = 0;
+ m_buffers[index].fields[0][0].id = 0; + fields[0][0].id = 0;
+ + fields[1][0].id = 0;
+ fields[2][0].id = 0;
+#endif +#endif
+} +}
+ +
@ -1674,7 +1688,7 @@ index 8172750..d6f91da 100644
void CLinuxRendererGL::UploadYUV422PackedTexture(int source) void CLinuxRendererGL::UploadYUV422PackedTexture(int source)
{ {
YUVBUFFER& buf = m_buffers[source]; YUVBUFFER& buf = m_buffers[source];
@@ -2935,6 +3462,9 @@ bool CLinuxRendererGL::Supports(ERENDERFEATURE feature) @@ -2935,6 +3469,9 @@ bool CLinuxRendererGL::Supports(ERENDERFEATURE feature)
if (m_renderMethod & RENDER_VAAPI) if (m_renderMethod & RENDER_VAAPI)
return false; return false;
@ -1684,7 +1698,7 @@ index 8172750..d6f91da 100644
return (m_renderMethod & RENDER_GLSL) return (m_renderMethod & RENDER_GLSL)
|| (m_renderMethod & RENDER_ARB) || (m_renderMethod & RENDER_ARB)
|| ((m_renderMethod & RENDER_SW) && glewIsSupported("GL_ARB_imaging") == GL_TRUE); || ((m_renderMethod & RENDER_SW) && glewIsSupported("GL_ARB_imaging") == GL_TRUE);
@@ -2948,6 +3478,9 @@ bool CLinuxRendererGL::Supports(ERENDERFEATURE feature) @@ -2948,6 +3485,9 @@ bool CLinuxRendererGL::Supports(ERENDERFEATURE feature)
if (m_renderMethod & RENDER_VAAPI) if (m_renderMethod & RENDER_VAAPI)
return false; return false;
@ -1694,7 +1708,7 @@ index 8172750..d6f91da 100644
return (m_renderMethod & RENDER_GLSL) return (m_renderMethod & RENDER_GLSL)
|| (m_renderMethod & RENDER_ARB) || (m_renderMethod & RENDER_ARB)
|| ((m_renderMethod & RENDER_SW) && glewIsSupported("GL_ARB_imaging") == GL_TRUE); || ((m_renderMethod & RENDER_SW) && glewIsSupported("GL_ARB_imaging") == GL_TRUE);
@@ -2971,7 +3504,8 @@ bool CLinuxRendererGL::Supports(ERENDERFEATURE feature) @@ -2971,7 +3511,8 @@ bool CLinuxRendererGL::Supports(ERENDERFEATURE feature)
if (feature == RENDERFEATURE_NONLINSTRETCH) if (feature == RENDERFEATURE_NONLINSTRETCH)
{ {
if (((m_renderMethod & RENDER_GLSL) && !(m_renderMethod & RENDER_POT)) || if (((m_renderMethod & RENDER_GLSL) && !(m_renderMethod & RENDER_POT)) ||
@ -1704,7 +1718,7 @@ index 8172750..d6f91da 100644
return true; return true;
} }
@@ -3034,10 +3568,22 @@ bool CLinuxRendererGL::Supports(EINTERLACEMETHOD method) @@ -3034,10 +3575,22 @@ bool CLinuxRendererGL::Supports(EINTERLACEMETHOD method)
return false; return false;
#endif #endif
@ -1731,7 +1745,7 @@ index 8172750..d6f91da 100644
if((method == VS_INTERLACEMETHOD_RENDER_BLEND if((method == VS_INTERLACEMETHOD_RENDER_BLEND
|| method == VS_INTERLACEMETHOD_RENDER_WEAVE_INVERTED || method == VS_INTERLACEMETHOD_RENDER_WEAVE_INVERTED
@@ -3069,7 +3615,7 @@ bool CLinuxRendererGL::Supports(ESCALINGMETHOD method) @@ -3069,7 +3622,7 @@ bool CLinuxRendererGL::Supports(ESCALINGMETHOD method)
|| method == VS_SCALINGMETHOD_LANCZOS3) || method == VS_SCALINGMETHOD_LANCZOS3)
{ {
if ((glewIsSupported("GL_EXT_framebuffer_object") && (m_renderMethod & RENDER_GLSL)) || if ((glewIsSupported("GL_EXT_framebuffer_object") && (m_renderMethod & RENDER_GLSL)) ||
@ -1740,7 +1754,7 @@ index 8172750..d6f91da 100644
{ {
// spline36 and lanczos3 are only allowed through advancedsettings.xml // spline36 and lanczos3 are only allowed through advancedsettings.xml
if(method != VS_SCALINGMETHOD_SPLINE36 if(method != VS_SCALINGMETHOD_SPLINE36
@@ -3128,7 +3674,7 @@ void CLinuxRendererGL::UnBindPbo(YUVBUFFER& buff) @@ -3128,7 +3681,7 @@ void CLinuxRendererGL::UnBindPbo(YUVBUFFER& buff)
pbo = true; pbo = true;
glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, buff.pbo[plane]); glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, buff.pbo[plane]);
@ -1749,7 +1763,7 @@ index 8172750..d6f91da 100644
buff.image.plane[plane] = (BYTE*)glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB) + PBO_OFFSET; buff.image.plane[plane] = (BYTE*)glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB) + PBO_OFFSET;
} }
if(pbo) if(pbo)
@@ -3152,4 +3698,13 @@ void CLinuxRendererGL::AddProcessor(VAAPI::CHolder& holder) @@ -3152,4 +3705,13 @@ void CLinuxRendererGL::AddProcessor(VAAPI::CHolder& holder)
} }
#endif #endif