Merge 4a14707f06 into 10d475e81e

bazarr/languages/get_languages.py

@@ -54,13 +54,18 @@ def create_languages_dict():
                TableSettingsLanguages.code3b))
         .all()]
 
-def audio_language_from_alpha2(lang):
+def audio_language_from_name(lang):
     lang_map = {
         'Chinese': 'zh',
         'Portuguese (Brazil)': 'pb'
     }
 
-    return language_from_alpha2(lang_map.get(lang, lang))
+    alpha2_code = lang_map.get(lang, None)
+
+    if alpha2_code is None:
+        return lang
+
+    return language_from_alpha2(alpha2_code)
 
 def language_from_alpha2(lang):
     return next((item['name'] for item in languages_dict if item['code2'] == lang[:2]), None)

bazarr/radarr/sync/parser.py

@@ -3,7 +3,7 @@
 import os
 
 from app.config import settings
-from languages.get_languages import audio_language_from_alpha2
+from languages.get_languages import audio_language_from_name
 from radarr.info import get_radarr_info
 from utilities.video_analyzer import embedded_audio_reader
 from utilities.path_mappings import path_mappings
@@ -117,7 +117,7 @@ def movieParser(movie, action, tags_dict, language_profiles, movie_default_profi
                     for item in movie['movieFile']['languages']:
                         if isinstance(item, dict):
                             if 'name' in item:
-                                language = audio_language_from_alpha2(item['name'])
+                                language = audio_language_from_name(item['name'])
                                 audio_language.append(language)
 
         tags = [d['label'] for d in tags_dict if d['id'] in movie['tags']]

bazarr/sonarr/sync/parser.py

@@ -5,7 +5,7 @@ import os
 from app.config import settings
 from app.database import TableShows, database, select
 from constants import MINIMUM_VIDEO_SIZE
-from languages.get_languages import audio_language_from_alpha2
+from languages.get_languages import audio_language_from_name
 from utilities.path_mappings import path_mappings
 from utilities.video_analyzer import embedded_audio_reader
 from sonarr.info import get_sonarr_info
@@ -122,13 +122,13 @@ def episodeParser(episode):
                             item = episode['episodeFile']['language']
                             if isinstance(item, dict):
                                 if 'name' in item:
-                                    audio_language.append(audio_language_from_alpha2(item['name']))
+                                    audio_language.append(audio_language_from_name(item['name']))
                         elif 'languages' in episode['episodeFile'] and len(episode['episodeFile']['languages']):
                             items = episode['episodeFile']['languages']
                             if isinstance(items, list):
                                 for item in items:
                                     if 'name' in item:
-                                        audio_language.append(audio_language_from_alpha2(item['name']))
+                                        audio_language.append(audio_language_from_name(item['name']))
                         else:
                             audio_language = database.execute(
                                 select(TableShows.audio_language)

custom_libs/subliminal_patch/providers/whisperai.py

@@ -143,7 +143,7 @@ def encode_audio_stream(path, ffmpeg_path, audio_stream_language=None):
             logger.debug(f"Whisper will only use the {audio_stream_language} audio stream for {path}")
             inp = inp[f'a:m:language:{audio_stream_language}']
 
-        out, _ = inp.output("-", format="s16le", acodec="pcm_s16le", ac=1, ar=16000) \
+        out, _ = inp.output("-", format="s16le", acodec="pcm_s16le", ac=1, ar=16000, af="aresample=async=1") \
                     .run(cmd=[ffmpeg_path, "-nostdin"], capture_stdout=True, capture_stderr=True)
 
     except ffmpeg.Error as e:

libs/ffsubsync/speech_transformers.py

@@ -367,6 +367,8 @@ class VideoSpeechTransformer(TransformerMixin):
                 "1",
                 "-acodec",
                 "pcm_s16le",
+                "-af",
+                "aresample=async=1",
                 "-ar",
                 str(self.frame_rate),
                 "-",