Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make weave double rate since we are unable to sync to specific field on output #1086

Merged
merged 2 commits into from
Jul 2, 2012
Merged

Make weave double rate since we are unable to sync to specific field on output #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b63a1a
[video] replace useless weave interlace mode with double rate weave
Jun 17, 2012
7f3fb69
[video] cosmetic: rename PresentBob to PresentFields and remove unuse…
Jun 17, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,8 +628,6 @@ void CLinuxRendererGL::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
index = m_iYV12RenderBuffer;
}
}
else
m_iLastRenderBuffer = index;

if (clear)
{
Expand All @@ -652,17 +650,26 @@ void CLinuxRendererGL::RenderUpdate(bool clear, DWORD flags, DWORD alpha)
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
}

if( (flags & RENDER_FLAG_TOP)
&& (flags & RENDER_FLAG_BOT) )
if(flags & RENDER_FLAG_WEAVE)
{
glEnable(GL_POLYGON_STIPPLE);
int top_index = index;
int bot_index = index;

if((flags & RENDER_FLAG_FIELD0) && m_iLastRenderBuffer > -1)
{
if(flags & RENDER_FLAG_TOP)
bot_index = m_iLastRenderBuffer;
else
top_index = m_iLastRenderBuffer;
}

glEnable(GL_POLYGON_STIPPLE);
glPolygonStipple(stipple_weave);
Render(flags & ~RENDER_FLAG_BOT, index);
Render((flags & ~RENDER_FLAG_FIELDMASK) | RENDER_FLAG_TOP, top_index);
glPolygonStipple(stipple_weave+4);
Render(flags & ~RENDER_FLAG_TOP , index);

Render((flags & ~RENDER_FLAG_FIELDMASK) | RENDER_FLAG_BOT, bot_index);
glDisable(GL_POLYGON_STIPPLE);

}
else
Render(flags, index);
Expand Down Expand Up @@ -733,6 +740,8 @@ void CLinuxRendererGL::FlipPage(int source)
{
UnBindPbo(m_buffers[m_iYV12RenderBuffer]);

m_iLastRenderBuffer = m_iYV12RenderBuffer;

if( source >= 0 && source < m_NumYV12Buffers )
m_iYV12RenderBuffer = source;
else
Expand Down
1 change: 1 addition & 0 deletions xbmc/cores/VideoRenderers/RenderFlags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

#define RENDER_FLAG_FIELD0 0x80
#define RENDER_FLAG_FIELD1 0x100
#define RENDER_FLAG_WEAVE 0x200

// #define RENDER_FLAG_LAST 0x40

Expand Down
16 changes: 3 additions & 13 deletions xbmc/cores/VideoRenderers/RenderManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,9 +652,9 @@ void CXBMCRenderManager::Render(bool clear, DWORD flags, DWORD alpha)
CSharedLock lock(m_sharedSection);

if( m_presentmethod == PRESENT_METHOD_BOB )
PresentBob(clear, flags, alpha);
PresentFields(clear, flags, alpha);
else if( m_presentmethod == PRESENT_METHOD_WEAVE )
PresentWeave(clear, flags, alpha);
PresentFields(clear, flags | RENDER_FLAG_WEAVE, alpha);
else if( m_presentmethod == PRESENT_METHOD_BLEND )
PresentBlend(clear, flags, alpha);
else
Expand Down Expand Up @@ -698,7 +698,7 @@ void CXBMCRenderManager::PresentSingle(bool clear, DWORD flags, DWORD alpha)

/* new simpler method of handling interlaced material, *
* we just render the two fields right after eachother */
void CXBMCRenderManager::PresentBob(bool clear, DWORD flags, DWORD alpha)
void CXBMCRenderManager::PresentFields(bool clear, DWORD flags, DWORD alpha)
{
CSingleLock lock(g_graphicsContext);

Expand Down Expand Up @@ -738,16 +738,6 @@ void CXBMCRenderManager::PresentBlend(bool clear, DWORD flags, DWORD alpha)
m_presentstep = PRESENT_IDLE;
}

/* renders the two fields as one, but doing fieldbased *
* scaling then reinterlaceing resulting image */
void CXBMCRenderManager::PresentWeave(bool clear, DWORD flags, DWORD alpha)
{
CSingleLock lock(g_graphicsContext);

m_pRenderer->RenderUpdate(clear, flags | RENDER_FLAG_BOTH, alpha);
m_presentstep = PRESENT_IDLE;
}

void CXBMCRenderManager::Recover()
{
#if defined(HAS_GL) && !defined(TARGET_DARWIN)
Expand Down
3 changes: 1 addition & 2 deletions xbmc/cores/VideoRenderers/RenderManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ class CXBMCRenderManager
void Render(bool clear, DWORD flags, DWORD alpha);

void PresentSingle(bool clear, DWORD flags, DWORD alpha);
void PresentWeave(bool clear, DWORD flags, DWORD alpha);
void PresentBob(bool clear, DWORD flags, DWORD alpha);
void PresentFields(bool clear, DWORD flags, DWORD alpha);
void PresentBlend(bool clear, DWORD flags, DWORD alpha);

EINTERLACEMETHOD AutoInterlaceMethodInternal(EINTERLACEMETHOD mInt);
Expand Down