diff --git a/projects/RPi/devices/RPi4/patches/kodi/0002-popcornmix-VideoPlayer-Add-setting-to-disable-non-hevc-accel.patch b/projects/RPi/devices/RPi4/patches/kodi/0002-popcornmix-VideoPlayer-Add-setting-to-disable-non-hevc-accel.patch deleted file mode 100644 index be27bd5b10..0000000000 --- a/projects/RPi/devices/RPi4/patches/kodi/0002-popcornmix-VideoPlayer-Add-setting-to-disable-non-hevc-accel.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 276f11db060cc2967377187e2e53138242a43937 Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Fri, 27 Mar 2020 15:14:11 +0000 -Subject: [PATCH] VideoPlayer: Add setting to disable non-hevc accel - ---- - addons/resource.language.en_gb/resources/strings.po | 10 ++++++++++ - system/settings/linux.xml | 12 ++++++++++++ - .../DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp | 13 +++++++++++++ - xbmc/settings/Settings.cpp | 2 ++ - xbmc/settings/Settings.h | 1 + - 5 files changed, 38 insertions(+) - -diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 8fa3fe34dc..1a518905e3 100644 ---- a/addons/resource.language.en_gb/resources/strings.po -+++ b/addons/resource.language.en_gb/resources/strings.po -@@ -7282,6 +7282,16 @@ msgctxt "#13467" - msgid "Unlimited / 1080 (>30Hz)" - msgstr "" - -+#: system/settings/settings.xml -+msgctxt "#13500" -+msgid "Only allow acceleration for HEVC" -+msgstr "" -+ -+#: system/settings/settings.xml -+msgctxt "#13501" -+msgid "This option disables acceleration for other codecs as they don't currently support seeking with V4L2" -+msgstr "" -+ - #empty strings from id 13468 to 13504 - - #: system/settings/settings.xml -diff --git a/system/settings/linux.xml b/system/settings/linux.xml -index 6d1fb9cd49..691a84e65e 100644 ---- a/system/settings/linux.xml -+++ b/system/settings/linux.xml -@@ -168,6 +168,18 @@ - true - - -+ -+ HAS_GLES -+ false -+ -+ -+ true -+ -+ -+ 3 -+ true -+ -+ - - HAS_GLES - false -diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp -index 8024c20816..74c29ba3b9 100644 ---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp -+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp -@@ -37,6 +37,7 @@ namespace - { - - constexpr const char* SETTING_VIDEOPLAYER_USEPRIMEDECODERFORHW{"videoplayer.useprimedecoderforhw"}; -+constexpr const char* SETTING_VIDEOPLAYER_DISABLENONHEVC{"videoplayer.disablenonhevc"}; - - static void ReleaseBuffer(void* opaque, uint8_t* data) - { -@@ -123,6 +124,15 @@ void CDVDVideoCodecDRMPRIME::Register() - - setting->SetVisible(true); - -+ setting = settings->GetSetting(SETTING_VIDEOPLAYER_DISABLENONHEVC); -+ if (!setting) -+ { -+ CLog::Log(LOGERROR, "Failed to load setting for: {}", SETTING_VIDEOPLAYER_DISABLENONHEVC); -+ return; -+ } -+ -+ setting->SetVisible(true); -+ - CDVDFactoryCodec::RegisterHWVideoCodec("drm_prime", CDVDVideoCodecDRMPRIME::Create); - } - -@@ -144,6 +154,9 @@ static const AVCodecHWConfig* FindHWConfig(const AVCodec* codec) - if (!CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool( - SETTING_VIDEOPLAYER_USEPRIMEDECODERFORHW)) - return nullptr; -+ if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool( -+ SETTING_VIDEOPLAYER_DISABLENONHEVC) && codec->id != AV_CODEC_ID_HEVC) -+ return nullptr; - - const AVCodecHWConfig* config = nullptr; - for (int n = 0; (config = avcodec_get_hw_config(codec, n)); n++) -diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index 2b487339d6..b9fbe306ce 100644 ---- a/xbmc/settings/Settings.cpp -+++ b/xbmc/settings/Settings.cpp -@@ -140,6 +140,7 @@ constexpr const char* CSettings::SETTING_VIDEOPLAYER_RENDERMETHOD; - constexpr const char* CSettings::SETTING_VIDEOPLAYER_HQSCALERS; - constexpr const char* CSettings::SETTING_VIDEOPLAYER_USEMEDIACODEC; - constexpr const char* CSettings::SETTING_VIDEOPLAYER_USEMEDIACODECSURFACE; -+constexpr const char* CSettings::SETTING_VIDEOPLAYER_DISABLE_NON_HEVC; - constexpr const char* CSettings::SETTING_VIDEOPLAYER_USEVDPAU; - constexpr const char* CSettings::SETTING_VIDEOPLAYER_USEVDPAUMIXER; - constexpr const char* CSettings::SETTING_VIDEOPLAYER_USEVDPAUMPEG2; -@@ -982,6 +983,7 @@ void CSettings::InitializeISettingCallbacks() - settingSet.insert(CSettings::SETTING_VIDEOSCREEN_TESTPATTERN); - settingSet.insert(CSettings::SETTING_VIDEOPLAYER_USEMEDIACODEC); - settingSet.insert(CSettings::SETTING_VIDEOPLAYER_USEMEDIACODECSURFACE); -+ settingSet.insert(CSettings::SETTING_VIDEOPLAYER_DISABLE_NON_HEVC); - settingSet.insert(CSettings::SETTING_AUDIOOUTPUT_VOLUMESTEPS); - settingSet.insert(CSettings::SETTING_SOURCE_VIDEOS); - settingSet.insert(CSettings::SETTING_SOURCE_MUSIC); -diff --git a/xbmc/settings/Settings.h b/xbmc/settings/Settings.h -index 8276c8a5aa..00967cf908 100644 ---- a/xbmc/settings/Settings.h -+++ b/xbmc/settings/Settings.h -@@ -118,6 +118,7 @@ public: - static constexpr auto SETTING_VIDEOPLAYER_USEMEDIACODEC = "videoplayer.usemediacodec"; - static constexpr auto SETTING_VIDEOPLAYER_USEMEDIACODECSURFACE = - "videoplayer.usemediacodecsurface"; -+ static constexpr auto SETTING_VIDEOPLAYER_DISABLE_NON_HEVC = "videoplayer.disablenonhevc"; - static constexpr auto SETTING_VIDEOPLAYER_USEVDPAU = "videoplayer.usevdpau"; - static constexpr auto SETTING_VIDEOPLAYER_USEVDPAUMIXER = "videoplayer.usevdpaumixer"; - static constexpr auto SETTING_VIDEOPLAYER_USEVDPAUMPEG2 = "videoplayer.usevdpaumpeg2"; --- -2.20.1 -