From 52f649d19f7b6c3276570b06912c1d4bcd2bbd78 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Tue, 17 Nov 2020 19:39:42 +0100 Subject: [PATCH] RPi4: update kodi patch to disable non-HEVC HW decoding via settings Signed-off-by: Matthias Reichl --- ...dd-setting-to-disable-non-hevc-accel.patch | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) 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 index ef1fd9cf73..0c744a59ff 100644 --- 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 @@ -1,4 +1,4 @@ -From d87d1e05d69794262bec8ef54b9edeae5d476414 Mon Sep 17 00:00:00 2001 +From 3e61b48460b0d6e6ebfeee997dd0ec6caeac14d3 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 @@ -12,7 +12,7 @@ Subject: [PATCH] VideoPlayer: Add setting to disable non-hevc accel 5 files changed, 30 insertions(+) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 85bd4ff2ad..2e714eba87 100644 +index dc73e73828..51ab80f35b 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -7280,6 +7280,16 @@ msgctxt "#13467" @@ -86,18 +86,18 @@ index a12ef9ec1e..1366bd7fbf 100644 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 d5af5c7cc0..eb5dc4ccd0 100644 +index d4bd941376..1bb9df378c 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp -@@ -146,6 +146,7 @@ const std::string CSettings::SETTING_VIDEOPLAYER_RENDERMETHOD = "videoplayer.ren - const std::string CSettings::SETTING_VIDEOPLAYER_HQSCALERS = "videoplayer.hqscalers"; - const std::string CSettings::SETTING_VIDEOPLAYER_USEMEDIACODEC = "videoplayer.usemediacodec"; - const std::string CSettings::SETTING_VIDEOPLAYER_USEMEDIACODECSURFACE = "videoplayer.usemediacodecsurface"; -+const std::string CSettings::SETTING_VIDEOPLAYER_DISABLE_NON_HEVC = "videoplayer.disablenonhevc"; - const std::string CSettings::SETTING_VIDEOPLAYER_USEVDPAU = "videoplayer.usevdpau"; - const std::string CSettings::SETTING_VIDEOPLAYER_USEVDPAUMIXER = "videoplayer.usevdpaumixer"; - const std::string CSettings::SETTING_VIDEOPLAYER_USEVDPAUMPEG2 = "videoplayer.usevdpaumpeg2"; -@@ -971,6 +972,7 @@ void CSettings::InitializeISettingCallbacks() +@@ -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; +@@ -963,6 +964,7 @@ void CSettings::InitializeISettingCallbacks() settingSet.insert(CSettings::SETTING_VIDEOSCREEN_TESTPATTERN); settingSet.insert(CSettings::SETTING_VIDEOPLAYER_USEMEDIACODEC); settingSet.insert(CSettings::SETTING_VIDEOPLAYER_USEMEDIACODECSURFACE); @@ -106,17 +106,17 @@ index d5af5c7cc0..eb5dc4ccd0 100644 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 a5e419964c..49e2f62eb6 100644 +index 8276c8a5aa..00967cf908 100644 --- a/xbmc/settings/Settings.h +++ b/xbmc/settings/Settings.h -@@ -107,6 +107,7 @@ public: - static const std::string SETTING_VIDEOPLAYER_HQSCALERS; - static const std::string SETTING_VIDEOPLAYER_USEMEDIACODEC; - static const std::string SETTING_VIDEOPLAYER_USEMEDIACODECSURFACE; -+ static const std::string SETTING_VIDEOPLAYER_DISABLE_NON_HEVC; - static const std::string SETTING_VIDEOPLAYER_USEVDPAU; - static const std::string SETTING_VIDEOPLAYER_USEVDPAUMIXER; - static const std::string SETTING_VIDEOPLAYER_USEVDPAUMPEG2; +@@ -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