[rbp] Add settings option to disable gpu jpeg acceleration

popcornmix · Apr 3, 2020 · 5d98919 · 5d98919
1 parent b1d75fe
commit 5d98919
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
@@ -21403,6 +21403,16 @@ msgstr ""
 #empty strings from id 38081 to 38099
 #strings 38081 to 38099 reserved for music library
 
+#: system/settings/rbp.xml
+msgctxt "#38114"
+msgid "Use GPU for jpeg acceleration"
+msgstr ""
+
+#: system/settings/rbp.xml
+msgctxt "#38115"
+msgid "This option uses the GPU for encoding and decoding jpegs"
+msgstr ""
+
 #. Description of section #14200 "Player""
 #: system/settings/settings.xml
 msgctxt "#38100"

diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml
@@ -27,6 +27,11 @@
           </control>
           <control type="edit" format="integer" />
         </setting>
+        <setting id="videoplayer.acceleratedjpegs" type="boolean" label="38114" help="38115">
+          <level>2</level>
+          <default>true</default>
+          <control type="toggle" />
+        </setting>
       </group>
     </category>
   </section>

diff --git a/xbmc/TextureCacheJob.cpp b/xbmc/TextureCacheJob.cpp
@@ -12,6 +12,7 @@
 #include "guilib/Texture.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/SettingsComponent.h"
+#include "settings/Settings.h"
 #include "utils/log.h"
 #include "filesystem/File.h"
 #include "pictures/Picture.h"
@@ -81,7 +82,7 @@ bool CTextureCacheJob::CacheTexture(CBaseTexture **out_texture)
     return true;
 
 #if defined(TARGET_RASPBERRY_PI)
-  if (COMXImage::CreateThumb(image, width, height, additional_info, CTextureCache::GetCachedPath(m_cachePath + ".jpg")))
+  if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool("videoplayer.acceleratedjpegs") && COMXImage::CreateThumb(image, width, height, additional_info, CTextureCache::GetCachedPath(m_cachePath + ".jpg")))
   {
     m_details.width = width;
     m_details.height = height;

diff --git a/xbmc/guilib/TexturePi.cpp b/xbmc/guilib/TexturePi.cpp
@@ -6,6 +6,10 @@
  *  See LICENSES/README.md for more information.
  */
 
+#include "ServiceBroker.h"
+#include "settings/Settings.h"
+#include "settings/SettingsComponent.h"
+
 #include "Texture.h"
 #include "cores/omxplayer/OMXImage.h"
 #include "guilib/TextureManager.h"
@@ -100,7 +104,7 @@ void CPiTexture::Update(unsigned int width, unsigned int height, unsigned int pi
 
 bool CPiTexture::LoadFromFileInternal(const std::string& texturePath, unsigned int maxWidth, unsigned int maxHeight, bool requirePixels, const std::string& strMimeType)
 {
-  if (URIUtils::HasExtension(texturePath, ".jpg|.tbn"))
+  if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool("videoplayer.acceleratedjpegs") && URIUtils::HasExtension(texturePath, ".jpg|.tbn"))
   {
     COMXImageFile *file = g_OMXImage.LoadJpeg(texturePath);
     if (file)

diff --git a/xbmc/pictures/Picture.cpp b/xbmc/pictures/Picture.cpp
@@ -61,7 +61,7 @@ bool CPicture::CreateThumbnailFromSurface(const unsigned char *buffer, int width
   if (URIUtils::HasExtension(thumbFile, ".jpg"))
   {
 #if defined(TARGET_RASPBERRY_PI)
-    if (COMXImage::CreateThumbnailFromSurface(const_cast<unsigned char*>(buffer), width, height, XB_FMT_A8R8G8B8, stride, thumbFile.c_str()))
+    if (CServiceBroker::GetSettingsComponent()->GetSettings()->GetBool("videoplayer.acceleratedjpegs") && COMXImage::CreateThumbnailFromSurface(const_cast<unsigned char*>(buffer), width, height, XB_FMT_A8R8G8B8, stride, thumbFile.c_str()))
       return true;
 #endif
   }