Fix bug where intermittently HW accelerated config was reverted to CPU encoding on its own

Author: Josh5

changelog.md

@@ -1,3 +1,6 @@
+**<span style="color:#56adda">0.1.13</span>**
+- Fix bug where intermittently HW accelerated config was reverted to CPU encoding on its own
+
 **<span style="color:#56adda">0.1.12</span>**
 - Improved handling for HDR content with new helper tools for detecting and parsing metadata.
 - Removed the look-ahead feature from QSV's HEVC and AV1 encoders (not supported).

info.json

@@ -12,5 +12,5 @@
         "on_worker_process": 1
     },
     "tags": "video,ffmpeg",
-    "version": "0.1.12"
+    "version": "0.1.13"
 }

lib/encoders/libsvtav1.py

@@ -167,8 +167,16 @@ def __set_default_option(self, select_options, key, default_option=None):
             available_options.append(option.get('value'))
             if not default_option:
                 default_option = option.get('value')
-        if self.settings.get_setting(key) not in available_options:
-            self.settings.set_setting(key, default_option)
+        current_value = self.settings.get_setting(key)
+        if not getattr(self.settings, 'apply_default_fallbacks', True):
+            return current_value
+        if current_value not in available_options:
+            # Update in-memory setting for display only. 
+            # IMPORTANT: do not persist settings from plugin.
+            #   Only the Unmanic API calls should persist to JSON file.
+            self.settings.settings_configured[key] = default_option
+            return default_option
+        return current_value
 
     def get_preset_form_settings(self):
         values = {

lib/encoders/libx.py

@@ -201,8 +201,16 @@ def __set_default_option(self, select_options, key, default_option=None):
             available_options.append(option.get('value'))
             if not default_option:
                 default_option = option.get('value')
-        if self.settings.get_setting(key) not in available_options:
-            self.settings.set_setting(key, default_option)
+        current_value = self.settings.get_setting(key)
+        if not getattr(self.settings, 'apply_default_fallbacks', True):
+            return current_value
+        if current_value not in available_options:
+            # Update in-memory setting for display only. 
+            # IMPORTANT: do not persist settings from plugin.
+            #   Only the Unmanic API calls should persist to JSON file.
+            self.settings.settings_configured[key] = default_option
+            return default_option
+        return current_value
 
     def get_preset_form_settings(self):
         values = {

lib/encoders/nvenc.py

@@ -323,8 +323,16 @@ def __set_default_option(self, select_options, key, default_option=None):
             available_options.append(option.get('value'))
             if not default_option:
                 default_option = option.get('value')
-        if self.settings.get_setting(key) not in available_options:
-            self.settings.set_setting(key, default_option)
+        current_value = self.settings.get_setting(key)
+        if not getattr(self.settings, 'apply_default_fallbacks', True):
+            return current_value
+        if current_value not in available_options:
+            # Update in-memory setting for display only. 
+            # IMPORTANT: do not persist settings from plugin.
+            #   Only the Unmanic API calls should persist to JSON file.
+            self.settings.settings_configured[key] = default_option
+            return default_option
+        return current_value
 
     def get_nvenc_device_form_settings(self):
         values = {

lib/encoders/qsv.py

@@ -271,8 +271,16 @@ def __set_default_option(self, select_options, key, default_option=None):
             available_options.append(option.get('value'))
             if not default_option:
                 default_option = option.get('value')
-        if self.settings.get_setting(key) not in available_options:
-            self.settings.set_setting(key, default_option)
+        current_value = self.settings.get_setting(key)
+        if not getattr(self.settings, 'apply_default_fallbacks', True):
+            return current_value
+        if current_value not in available_options:
+            # Update in-memory setting for display only. 
+            # IMPORTANT: do not persist settings from plugin.
+            #   Only the Unmanic API calls should persist to JSON file.
+            self.settings.settings_configured[key] = default_option
+            return default_option
+        return current_value
 
     def get_qsv_decoding_method_form_settings(self):
         values = {

lib/encoders/vaapi.py

@@ -315,8 +315,16 @@ def __set_default_option(self, select_options, key, default_option=None):
             available_options.append(option.get('value'))
             if not default_option:
                 default_option = option.get('value')
-        if self.settings.get_setting(key) not in available_options:
-            self.settings.set_setting(key, default_option)
+        current_value = self.settings.get_setting(key)
+        if not getattr(self.settings, 'apply_default_fallbacks', True):
+            return current_value
+        if current_value not in available_options:
+            # Update in-memory setting for display only. 
+            # IMPORTANT: do not persist settings from plugin.
+            #   Only the Unmanic API calls should persist to JSON file.
+            self.settings.settings_configured[key] = default_option
+            return default_option
+        return current_value
 
     def get_vaapi_device_form_settings(self):
         values = {

lib/global_settings.py

@@ -94,8 +94,16 @@ def __set_default_option(self, select_options, key, default_option=None):
             available_options.append(option.get("value"))
             if not default_option:
                 default_option = option.get("value")
-        if self.settings.get_setting(key) not in available_options:
-            self.settings.set_setting(key, default_option)
+        current_value = self.settings.get_setting(key)
+        if not getattr(self.settings, 'apply_default_fallbacks', True):
+            return current_value
+        if current_value not in available_options:
+            # Update in-memory setting for display only. 
+            # IMPORTANT: do not persist settings from plugin.
+            #   Only the Unmanic API calls should persist to JSON file.
+            self.settings.settings_configured[key] = default_option
+            return default_option
+        return current_value
 
     def get_mode_form_settings(self):
         return {

plugin.py

@@ -31,9 +31,8 @@
     - Add support for source bitrate matching on basic mode
 """
 
-import logging
 import os
-
+import logging
 from video_transcoder.lib import plugin_stream_mapper, tools
 from video_transcoder.lib.ffmpeg import Parser, Probe
 from video_transcoder.lib.global_settings import GlobalSettings
@@ -42,9 +41,9 @@
 from video_transcoder.lib.encoders.vaapi import VaapiEncoder
 from video_transcoder.lib.encoders.nvenc import NvencEncoder
 from video_transcoder.lib.encoders.libsvtav1 import LibsvtAv1Encoder
-
-from unmanic.libs.unplugins.settings import PluginSettings
 from unmanic.libs.directoryinfo import UnmanicDirectoryInfo
+from unmanic.libs.unplugins.settings import PluginSettings
+
 
 # Configure plugin logger
 logger = logging.getLogger("Unmanic.Plugin.video_transcoder")
@@ -53,6 +52,8 @@
 class Settings(PluginSettings):
 
     def __init__(self, *args, **kwargs):
+        # Add optional flag to disable default fallback logic. This should be set for the plugin runner calls
+        self.apply_default_fallbacks = kwargs.pop('apply_default_fallbacks', True)
         super(Settings, self).__init__(*args, **kwargs)
         self.settings = self.__build_settings_object()
         self.global_settings = GlobalSettings(self)
@@ -181,8 +182,8 @@ def on_library_management_file_test(data):
 
     """
 
-    # Get settings
-    settings = Settings(library_id=data.get('library_id'))
+    # Get settings (do not persist defaults during worker/library execution)
+    settings = Settings(library_id=data.get('library_id'), apply_default_fallbacks=False)
 
     # Get the path to the file
     abspath = data.get('path')
@@ -233,8 +234,8 @@ def on_worker_process(data):
     data['exec_command'] = []
     data['repeat'] = False
 
-    # Get settings
-    settings = Settings(library_id=data.get('library_id'))
+    # Get settings (do not persist defaults during worker execution)
+    settings = Settings(library_id=data.get('library_id'), apply_default_fallbacks=False)
 
     # Get the path to the file
     abspath = data.get('file_in')
@@ -308,8 +309,8 @@ def on_postprocessor_task_results(data):
     :param data:
     :return:
     """
-    # Get settings
-    settings = Settings(library_id=data.get('library_id'))
+    # Get settings (do not persist defaults during post-processing)
+    settings = Settings(library_id=data.get('library_id'), apply_default_fallbacks=False)
 
     # Get the original file's absolute path
     original_source_path = data.get('source_data', {}).get('abspath')