update app.py

app.py

@@ -162,14 +162,21 @@ def main(file, name, fps=30, res: tuple=(1280,720), oscres=512, sr=11025, lyrics
     p = gr.Progress()
     if os.path.exists("out.srt"):
         os.remove("out.srt")
+    lyrics = False
     if lyrics:
         p(0.5,"parsing lyrics")
         try:
+            outf = open("out.srt",mode="x", encoding="UTF8")
             sf = open(lyrics, encoding="UTF8").read()
-            if sf[1] == '[':
-                rr = LRC.convert_to_json(lyrics)
-            elif sf[1].isdigit():
-                outf = open("out.srt",mode="x", encoding="UTF8").write()
+            if sf[0] == '[':
+                gr.Info("Lyrics of LRC type was detected, converting to SRT")
+                LRC2SRT.convert_to_srt(sf)
+                outf.write('\n'.join(LRC2SRT.SRT))
+                lyrics = True
+            elif sf[0].isdigit():
+                outf.write(sf)
+                gr.Info("Lyrics of SRT type was detected")
+                lyrics = True
             else:
                 gr.Warning("Lyrics file is invalid, skipping")
         except:
@@ -223,18 +230,35 @@ def main(file, name, fps=30, res: tuple=(1280,720), oscres=512, sr=11025, lyrics
     p = gr.Progress()
     p(0.5,desc="Compiling video")
     print('FFMPEG')
-    ffmpeg_cmd = [
-        "ffmpeg",
-        '-framerate', '30',
-        '-i', path+f'out/{name}/%d.png',  # Input PNG images
-        '-i', f'{file}',              # Input MP3 audio
-        '-c:v', 'libx264',
-        '-r', '30',
-        '-pix_fmt', 'yuv420p',
-        '-c:a', 'aac',
-        '-shortest', 
-        '-y',
-        path+f'{name}.mp4'  # Output MP4 filename
+    if lyrics:
+        ffmpeg_cmd = [
+            "ffmpeg",
+            '-framerate', '30',
+            '-i', path + f'out/{name}/%d.png',  # Input PNG images
+            '-i', file,  # Input MP3 audio
+            '-i', path + 'out.srt',  # Input SRT subtitles
+            '-c:v', 'libx264',
+            '-r', '30',
+            '-pix_fmt', 'yuv420p',
+            '-c:a', 'aac',
+            '-c:s', 'mov_text',  # Use mov_text codec for subtitles
+            '-shortest',
+            '-y',
+            path + f'{name}.mp4'  # Output MP4 filename
+        ]
+    else:
+        ffmpeg_cmd = [
+            "ffmpeg",
+            '-framerate', '30',
+            '-i', path+f'out/{name}/%d.png',  # Input PNG images
+            '-i', f'{file}',              # Input MP3 audio
+            '-c:v', 'libx264',
+            '-r', '30',
+            '-pix_fmt', 'yuv420p',
+            '-c:a', 'aac',
+            '-shortest', 
+            '-y',
+            path+f'{name}.mp4'  # Output MP4 filename
     ]
     subprocess.run(ffmpeg_cmd)