Skip to content

Commit

Permalink
Revert "[omxplayer] Only enable audio clock master when A/V sync meth…
Browse files Browse the repository at this point in the history
…od is set to audio clock"

This reverts commit 56491e6.
  • Loading branch information
popcornmix committed Apr 14, 2015
1 parent 4b80a62 commit 4f8a102
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions xbmc/cores/omxplayer/OMXAudio.cpp
Expand Up @@ -248,8 +248,7 @@ bool COMXAudio::PortSettingsChanged()
{
// By default audio_render is the clock master, and if output samples don't fit the timestamps, it will speed up/slow down the clock.
// This tends to be better for maintaining audio sync and avoiding audio glitches, but can affect video/display sync
if((CSettings::Get().GetBool("videoplayer.usedisplayasclock") && CSettings::Get().GetInt("videoplayer.synctype") == SYNC_DISCON) ||
m_output == AESINKPI_BOTH)
if(CSettings::Get().GetBool("videoplayer.usedisplayasclock") || m_output == AESINKPI_BOTH)
{
OMX_CONFIG_BOOLEANTYPE configBool;
OMX_INIT_STRUCTURE(configBool);
Expand All @@ -275,7 +274,7 @@ bool COMXAudio::PortSettingsChanged()
{
// By default audio_render is the clock master, and if output samples don't fit the timestamps, it will speed up/slow down the clock.
// This tends to be better for maintaining audio sync and avoiding audio glitches, but can affect video/display sync
if(CSettings::Get().GetBool("videoplayer.usedisplayasclock") && CSettings::Get().GetInt("videoplayer.synctype") == SYNC_DISCON)
if(CSettings::Get().GetBool("videoplayer.usedisplayasclock"))
{
OMX_CONFIG_BOOLEANTYPE configBool;
OMX_INIT_STRUCTURE(configBool);
Expand Down

0 comments on commit 4f8a102

Please sign in to comment.