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 63a0c9bbf4..3478fe26e9 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,7 +1,7 @@ -From 63c6707ac488e5bb61da045845cf533f39899dbf Mon Sep 17 00:00:00 2001 +From 598151eb44cb9eec05a6403a1eee1efbd6ab0f61 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Fri, 27 Mar 2020 15:14:11 +0000 -Subject: [PATCH 6/8] VideoPlayer: Add setting to disable non-hevc accel +Subject: [PATCH] VideoPlayer: Add setting to disable non-hevc accel --- addons/resource.language.en_gb/resources/strings.po | 10 ++++++++++ @@ -12,7 +12,7 @@ Subject: [PATCH 6/8] VideoPlayer: Add setting to disable non-hevc accel 5 files changed, 26 insertions(+) diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po -index 35706f9f07..2ae4e31231 100644 +index 6beae9269ef1..a7331a4f4cf6 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -7275,6 +7275,16 @@ msgctxt "#13467" @@ -33,7 +33,7 @@ index 35706f9f07..2ae4e31231 100644 #: system/settings/settings.xml diff --git a/system/settings/gbm.xml b/system/settings/gbm.xml -index cdc6c2b284..fa6a14d4c6 100644 +index cdc6c2b284d8..fa6a14d4c6ce 100644 --- a/system/settings/gbm.xml +++ b/system/settings/gbm.xml @@ -26,6 +26,12 @@ @@ -50,7 +50,7 @@ index cdc6c2b284..fa6a14d4c6 100644 false 2 diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp -index f892b1140d..d25c64012c 100644 +index ba3c93d89d48..0abcc90e72d5 100644 --- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp +++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecDRMPRIME.cpp @@ -221,6 +221,13 @@ int CDVDVideoCodecDRMPRIME::GetBuffer(struct AVCodecContext* avctx, AVFrame* fra @@ -59,7 +59,7 @@ index f892b1140d..d25c64012c 100644 { + if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool(CSettings::SETTING_VIDEOPLAYER_DISABLE_NON_HEVC) && hints.codec != AV_CODEC_ID_HEVC) + { -+ CLog::Log(LOGNOTICE, "CDVDVideoCodecDRMPRIME::{} - codec {} disallowed", ++ CLog::Log(LOGINFO, "CDVDVideoCodecDRMPRIME::{} - codec {} disallowed", + __FUNCTION__, hints.codec); + return false; + } @@ -68,10 +68,10 @@ index f892b1140d..d25c64012c 100644 if (!pCodec) { diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index 67e87a53e5..2d91880849 100644 +index 8036a9086842..eb771c984c19 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp -@@ -135,6 +135,7 @@ const std::string CSettings::SETTING_VIDEOPLAYER_RENDERMETHOD = "videoplayer.ren +@@ -132,6 +132,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"; @@ -79,7 +79,7 @@ index 67e87a53e5..2d91880849 100644 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"; -@@ -954,6 +955,7 @@ void CSettings::InitializeISettingCallbacks() +@@ -947,6 +948,7 @@ void CSettings::InitializeISettingCallbacks() settingSet.insert(CSettings::SETTING_VIDEOSCREEN_TESTPATTERN); settingSet.insert(CSettings::SETTING_VIDEOPLAYER_USEMEDIACODEC); settingSet.insert(CSettings::SETTING_VIDEOPLAYER_USEMEDIACODECSURFACE); @@ -88,10 +88,10 @@ index 67e87a53e5..2d91880849 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 7280587324..3dbaeeb234 100644 +index 518d3c19ccf5..d74f8cc8da36 100644 --- a/xbmc/settings/Settings.h +++ b/xbmc/settings/Settings.h -@@ -100,6 +100,7 @@ public: +@@ -100,6 +100,7 @@ class CSettings : public CSettingsBase, public CSettingCreator, public CSettingC static const std::string SETTING_VIDEOPLAYER_HQSCALERS; static const std::string SETTING_VIDEOPLAYER_USEMEDIACODEC; static const std::string SETTING_VIDEOPLAYER_USEMEDIACODECSURFACE; @@ -99,6 +99,3 @@ index 7280587324..3dbaeeb234 100644 static const std::string SETTING_VIDEOPLAYER_USEVDPAU; static const std::string SETTING_VIDEOPLAYER_USEVDPAUMIXER; static const std::string SETTING_VIDEOPLAYER_USEVDPAUMPEG2; --- -2.20.1 -