Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: xbmc/xbmc
...
head fork: xbmc/xbmc
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on Mar 08, 2013
@pitpompej pitpompej Prevent timeout error because of waiting for port settings change eve…
…nt on the wrong pipeline object when using deinterlace mode
7a9939f
Commits on Mar 09, 2013
@huceke huceke Merge pull request #2395 from pitpompej/master
[rbp/omxplayer] Prevent timeout error that occurs because of waiting for port settings change event…
bde1790
Showing with 2 additions and 2 deletions.
  1. +2 −2 xbmc/cores/omxplayer/OMXVideo.cpp
View
4 xbmc/cores/omxplayer/OMXVideo.cpp
@@ -885,10 +885,10 @@ int COMXVideo::Decode(uint8_t *pData, int iSize, double dts, double pts)
{
CLog::Log(LOGERROR, "%s::%s - error m_omx_image_fx.SetParameter(OMX_IndexParamPortDefinition) omx_err(0x%08x)\n", CLASSNAME, __func__, omx_err);
}
- omx_err = m_omx_decoder.WaitForEvent(OMX_EventPortSettingsChanged);
+ omx_err = m_omx_image_fx.WaitForEvent(OMX_EventPortSettingsChanged);
if(omx_err != OMX_ErrorNone)
{
- CLog::Log(LOGERROR, "%s::%s - error m_omx_decoder.WaitForEvent(OMX_EventPortSettingsChanged) omx_err(0x%08x)\n", CLASSNAME, __func__, omx_err);
+ CLog::Log(LOGERROR, "%s::%s - error m_omx_image_fx.WaitForEvent(OMX_EventPortSettingsChanged) omx_err(0x%08x)\n", CLASSNAME, __func__, omx_err);
}
port_image.nPortIndex = m_omx_image_fx.GetOutputPort();
omx_err = m_omx_image_fx.GetParameter(OMX_IndexParamPortDefinition, &port_image);

No commit comments for this range

Something went wrong with that request. Please try again.