Fix issues with the plugin:

- Improve audio bitrate calculator to default to x2 channels when calculating if the stream does not define the number of channels
- Fix bug where "Write your own FFmpeg params" options were not being applied correctly to the FFmpeg command
- Remove support for v1 plugin executor

changelog.md

@@ -1,4 +1,10 @@
 
+**<span style="color:#56adda">0.0.5</span>**
+- Update FFmpeg helper
+- Remove support for v1 plugin executor
+- Improve audio bitrate calculator to default to x2 channels when calculating if the stream does not define the number of channels
+- Fix bug where "Write your own FFmpeg params" options were not being applied correctly to the FFmpeg command
+
 **<span style="color:#56adda">0.0.4</span>**
 - Update FFmpeg helper
 - Add platform declaration

info.json

@@ -1,7 +1,6 @@
 {
     "author": "Josh.5",
     "compatibility": [
-        1,
         2
     ],
     "description": "Ensure all audio streams are encoded with the AAC codec using the native FFmpeg aac encoder.",
@@ -16,5 +15,5 @@
         "on_worker_process": 0
     },
     "tags": "audio,encoder,ffmpeg,library file test",
-    "version": "0.0.4"
+    "version": "0.0.5"
 }

plugin.py

@@ -101,18 +101,40 @@ def __init__(self):
         self.codec = 'aac'
         self.encoder = 'aac'
 
-    def set_settings(self, settings):
+    def set_default_values(self, settings, abspath, probe):
+        """
+        Configure the stream mapper with defaults
+
+        :param settings:
+        :param abspath:
+        :param probe:
+        :return:
+        """
+        self.abspath = abspath
+        # Set the file probe data
+        self.set_probe(probe)
+        # Set the input file
+        self.set_input_file(abspath)
+        # Configure settings
         self.settings = settings
 
+        # Build default options of advanced mode
+        if self.settings.get_setting('advanced'):
+            # If any main options are provided, overwrite them
+            main_options = settings.get_setting('main_options').split()
+            if main_options:
+                # Overwrite all main options
+                self.main_options = main_options
+            # If any advanced options are provided, overwrite them
+            advanced_options = settings.get_setting('advanced_options').split()
+            if advanced_options:
+                # Overwrite all advanced options
+                self.advanced_options = advanced_options
+
     @staticmethod
     def calculate_bitrate(stream_info: dict):
-        channels = stream_info.get('channels')
-        # If no channel count is provided, assume the highest bitrate for 6 channels
-        if not channels:
-            logger.debug("Stream did not contain 'channels'. Setting max AC3 bit rate (640k).")
-            return 384
-
-        return (int(stream_info.get('channels')) * 64)
+        channels = stream_info.get('channels', 2)
+        return int(channels) * 64
 
     def test_stream_needs_processing(self, stream_info: dict):
         # Ignore streams already of the required codec_name
@@ -169,8 +191,7 @@ def on_library_management_file_test(data):
 
     # Get stream mapper
     mapper = PluginStreamMapper()
-    mapper.set_settings(settings)
-    mapper.set_probe(probe)
+    mapper.set_default_values(settings, abspath, probe)
 
     if mapper.streams_need_processing():
         # Mark this file to be added to the pending tasks
@@ -212,15 +233,11 @@ def on_worker_process(data):
         return data
 
     # Configure settings object (maintain compatibility with v1 plugins)
-    if data.get('library_id'):
-        settings = Settings(library_id=data.get('library_id'))
-    else:
-        settings = Settings()
+    settings = Settings(library_id=data.get('library_id'))
 
     # Get stream mapper
     mapper = PluginStreamMapper()
-    mapper.set_settings(settings)
-    mapper.set_probe(probe)
+    mapper.set_default_values(settings, abspath, probe)
 
     if mapper.streams_need_processing():
         # Set the input file
@@ -240,5 +257,3 @@ def on_worker_process(data):
         parser = Parser(logger)
         parser.set_probe(probe)
         data['command_progress_parser'] = parser.parse_progress
-
-    return data