Skip to content

Loading…

Xvba eden #77

Merged
merged 2 commits into from

2 participants

@fritsch

Cause we like the Eden guys.

Port some important stuff mainly XVBA related but also Render cleanup

@FernetMenta
Owner

can you drop the 3rd commit? I hesitate to apply this to this old branch because it never has been tested against it.

@fritsch

Done :-)

@FernetMenta FernetMenta merged commit dc0093f into FernetMenta:eden
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 4, 2012
  1. @fritsch

    xvba: oopsie :)

    committed with fritsch
  2. @fritsch
This page is out of date. Refresh to see the latest.
Showing with 3 additions and 2 deletions.
  1. +1 −0 xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp
  2. +2 −2 xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
View
1 xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.cpp
@@ -735,6 +735,7 @@ void CDecoder::DestroySession()
XVBA_Destroy_Decode_Buffers_Input bufInput;
bufInput.size = sizeof(bufInput);
bufInput.num_of_buffers_in_list = 1;
+ bufInput.session = m_xvbaConfig.xvbaSession;
for (unsigned int i=0; i<m_xvbaBufferPool.data_control_buffers.size() ; ++i)
{
View
4 xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -975,7 +975,7 @@ int CDVDPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts)
|| m_output.height != pPicture->iHeight
|| m_output.dwidth != pPicture->iDisplayWidth
|| m_output.dheight != pPicture->iDisplayHeight
- || m_output.framerate != config_framerate
+ || (!m_bFpsInvalid && fmod(m_output.framerate, config_framerate) != 0.0 )
|| m_output.color_format != (unsigned int)pPicture->format
|| m_output.extended_format != pPicture->extended_format
|| ( m_output.color_matrix != pPicture->color_matrix && pPicture->color_matrix != 0 ) // don't reconfigure on unspecified
@@ -1124,7 +1124,7 @@ int CDVDPlayerVideo::OutputPicture(const DVDVideoPicture* src, double pts)
m_output.height = pPicture->iHeight;
m_output.dwidth = pPicture->iDisplayWidth;
m_output.dheight = pPicture->iDisplayHeight;
- m_output.framerate = config_framerate;
+ m_output.framerate = config_framerate == 0.0 ? g_graphicsContext.GetFPS() : config_framerate;
m_output.color_format = pPicture->format;
m_output.extended_format = pPicture->extended_format;
m_output.color_matrix = pPicture->color_matrix;
Something went wrong with that request. Please try again.