From 1fe1efdbfc19108bea66213d8f08ef1063cedf14 Mon Sep 17 00:00:00 2001 From: Thomas Reufer Date: Tue, 3 May 2016 16:16:17 +0200 Subject: fixed selection of deinterlacer mode --- omx.c | 2 ++ setup.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/omx.c b/omx.c index cc83a9c..eaba662 100644 --- a/omx.c +++ b/omx.c @@ -367,6 +367,8 @@ void cOmx::HandlePortSettingsChanged(unsigned int portId) portdef.format.video.nFrameWidth, portdef.format.video.nFrameHeight); + DBG("using %s deinterlacer", fastDeinterlace ? "fast" : "advanced"); + filterparam.nNumParams = 4; filterparam.nParams[0] = 3; filterparam.nParams[1] = 0; // default frame interval diff --git a/setup.h b/setup.h index 39224c4..e99d5c9 100644 --- a/setup.h +++ b/setup.h @@ -130,9 +130,9 @@ public: } static bool UseAdvancedDeinterlacer(int width, int height) { - return !GetInstance()->m_video.advancedDeinterlacer ? false : - GetInstance()->m_video.advancedDeinterlacer == 1 && - (width * height <= 576 * 720) ? true : true; + return GetInstance()->m_video.advancedDeinterlacer == 0 ? false : + GetInstance()->m_video.advancedDeinterlacer == 1 ? + (width * height <= 576 * 720 ? true : false) : true; } static bool IsAudioFormatSupported(cAudioCodec::eCodec codec, -- cgit v1.2.3