Skip to content

Commit

Permalink
[vaapi] Remove superfluous logic from ffmpeg postproc
Browse files Browse the repository at this point in the history
COutput::InitCycle is making sure that settings are observed. There is
nothing to do in this function actually as a change of the deinterlace
method currently requires a reinitialization of CFFmpegPostproc.
  • Loading branch information
pkerling committed Mar 28, 2019
1 parent fc74a9d commit f28ccdd
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3152,18 +3152,7 @@ void CFFmpegPostproc::Flush()

bool CFFmpegPostproc::UpdateDeintMethod(EINTERLACEMETHOD method)
{
// switching between certain methods should be done without deinit/init
if (method != m_diMethod)
return false;

if (method == VS_INTERLACEMETHOD_DEINTERLACE)
return true;
else if (method == VS_INTERLACEMETHOD_RENDER_BOB)
return true;
else if (method == VS_INTERLACEMETHOD_NONE &&
!CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(SETTING_VIDEOPLAYER_PREFERVAAPIRENDER))
return true;

/// \todo switching between certain methods could be done without deinit/init
return false;
}

Expand Down

0 comments on commit f28ccdd

Please sign in to comment.