diff options
| author | Peter Frühberger <Peter.Fruehberger@gmail.com> | 2023-08-06 08:59:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-06 08:59:23 +0200 |
| commit | bd39be048b740ae7c7f03e9784877e87c9232e7c (patch) | |
| tree | 8f4c9ea05761266ec4893276cf9eb6e32784009c | |
| parent | b17f267dcefb6eece9a9aa13774e40f7aff7a0b4 (diff) | |
| parent | 9ca6c3da5175fd6031cb83e1b0d0c4c93d078f91 (diff) | |
Merge pull request #23298 from alanswanson/deinterlacer-bwdif
VideoPlayer: ffmpeg change default software deinterlacer from yadif to bwdif
| -rw-r--r-- | xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 10 | ||||
| -rw-r--r-- | xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp index 032ee16454..5d1b7162f9 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp @@ -55,7 +55,7 @@ enum DecoderState enum EFilterFlags { FILTER_NONE = 0x0, - FILTER_DEINTERLACE_YADIF = 0x1, //< use first deinterlace mode + FILTER_DEINTERLACE_BWDIF = 0x1, //< use first deinterlace mode FILTER_DEINTERLACE_ANY = 0xf, //< use any deinterlace mode FILTER_DEINTERLACE_FLAGGED = 0x10, //< only deinterlace flagged frames FILTER_DEINTERLACE_HALFED = 0x20, //< do half rate deinterlacing @@ -526,12 +526,12 @@ void CDVDVideoCodecFFmpeg::SetFilters() } } - if (filters & FILTER_DEINTERLACE_YADIF) + if (filters & FILTER_DEINTERLACE_BWDIF) { if (filters & FILTER_DEINTERLACE_HALFED) - m_filters_next = "yadif=0:-1"; + m_filters_next = "bwdif=0:-1"; else - m_filters_next = "yadif=1:-1"; + m_filters_next = "bwdif=1:-1"; if (filters & FILTER_DEINTERLACE_FLAGGED) m_filters_next += ":1"; @@ -1226,7 +1226,7 @@ int CDVDVideoCodecFFmpeg::FilterOpen(const std::string& filters, bool scale) return result; } - if (filters.compare(0,5,"yadif") == 0) + if (filters.compare(0,5,"bwdif") == 0) { m_processInfo.SetVideoDeintMethod(filters); } diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp index 24edd058e9..f9b6f17824 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp @@ -3007,7 +3007,7 @@ bool CFFmpegPostproc::Init(EINTERLACEMETHOD method) { std::string filter; - filter = "yadif=1:-1"; + filter = "bwdif=1:-1"; if (avfilter_graph_parse_ptr(m_pFilterGraph, filter.c_str(), &inputs, &outputs, NULL) < 0) { @@ -3026,7 +3026,7 @@ bool CFFmpegPostproc::Init(EINTERLACEMETHOD method) return false; } - m_config.processInfo->SetVideoDeintMethod("yadif"); + m_config.processInfo->SetVideoDeintMethod("bwdif"); } else if (method == VS_INTERLACEMETHOD_RENDER_BOB || method == VS_INTERLACEMETHOD_NONE) |