Gestion du désentrelacement, correction de bugs et passage au containeur MP4

LICENSE

@@ -1,4 +1,6 @@
-Copyright 2022 Antoine Van Elstraete <antoine@van-elstraete.net>
+MIT License
+
+Copyright (c) <year> <copyright holders>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

vid_convert.py

@@ -97,7 +97,7 @@ def is_interlaced(file, infos):
     except ZeroDivisionError:
         pct = 100
     if pct > 10:
-        logging.debug("Vidéo entrelacée à {pct}%")
+        logging.debug(f"Vidéo entrelacée à {pct}%")
         return True
     else:
         logging.debug("Vidéo non entrelacée")
@@ -152,7 +152,7 @@ def extract_subs(file, track, lang):
     logging.debug(command)
     result = subprocess.getoutput(command)
     if result != "":
-        logging.info(result)
+        logging.error(result)
 
 
 def convert_audio(file, track, volume_adj, channels, channel_layout, language, title):
@@ -163,10 +163,11 @@ def convert_audio(file, track, volume_adj, channels, channel_layout, language, t
     command = f'ffmpeg -loglevel error -i {file} -map 0:{track} -map_metadata -1 -vn -sn -c:a {codec} -mapping_family 1 -filter:a volume={volume_adj},aformat=channel_layouts={channel_layout} {metadatas} -y {file}_audio_{track}_{language}.mka'
     logging.debug(command)
     result = subprocess.getoutput(command)
-    logging.info(result)
+    if result != "":
+        logging.error(result)
 
 
-def convert_video(file, infos, start, crop, crf, animation):
+def convert_video(file, infos, start, crop, crf, animation, interlaced, vhs):
     str_start = "{:05d}".format(start)
     output = f'{file}_video_t{str_start}.mkv'
     fmt = "yuv420p10le"
@@ -177,6 +178,10 @@ def convert_video(file, infos, start, crop, crf, animation):
         tune = "-tune animation"
     else:
         tune = ""
+    if interlaced:
+        crop = f"{crop},yadif"
+    if vhs:
+        crop = f"{crop},hqdn3d,unsharp=5:5:0.8:3:3:0.4"
     if 'side_data_list' in infos['video'].keys():
         try:
             light_level = f"{infos['video']['side_data_list'][1]['max_content']},{infos['video']['side_data_list'][1]['max_average']}"
@@ -215,7 +220,8 @@ def convert_video(file, infos, start, crop, crf, animation):
     command = f'ffmpeg -loglevel error -i {file} -map 0:{track} -ss {start} -t 300 -an -sn -c:v {codec} {tune} {hdr} -crf {crf} -pix_fmt {fmt} -filter:v {crop} -y {output}'
     logging.debug(command)
     result = subprocess.getoutput(command)
-    logging.info(result)
+    if result != "":
+        logging.error(result)
 
 
 def create_mkv(filename):
@@ -270,6 +276,16 @@ def create_mkv(filename):
             remove(file)
 
 
+def mkv_to_mp4(filename):
+    options = "-c:a copy -c:v copy -c:s copy -movflags faststart"
+    command = f"ffmpeg -loglevel error -i {filename}_FINAL.mkv -map 0 {options} -y NEW_{filename}.mp4"
+    result = subprocess.getoutput(command)
+    if result != "":
+        logging.error(result)
+    else:
+        remove(f"{filename}_FINAL.mkv")
+
+
 if __name__ == '__main__':
     import argparse
     parser = argparse.ArgumentParser()
@@ -278,6 +294,7 @@ if __name__ == '__main__':
     parser.add_argument("-s", "--stabilise", dest="stab", action="store_true")
     parser.add_argument("-t", "--starttime", dest="starttime")
     parser.add_argument("-a", "--animation", dest="animation", action="store_true")
+    parser.add_argument("-c", "--vhs", dest="vhs", action="store_true")
     args = parser.parse_args()
     if args.debug:
         logging.basicConfig(format='[%(asctime)s]\n%(message)s', level=logging.DEBUG, datefmt='%d/%m/%Y %H:%M:%S')
@@ -285,7 +302,7 @@ if __name__ == '__main__':
         logging.basicConfig(format='[%(asctime)s]\n%(message)s', level=logging.INFO, datefmt='%d/%m/%Y %H:%M:%S')
     file = args.f_input
     infos = get_infos(file)
-    # interlaced = is_interlaced(file, infos)
+    interlaced = is_interlaced(file, infos)
     cropsize = cropping(file, infos)
     volumes = volume_audio(file, infos)
     if args.stab:
@@ -305,6 +322,7 @@ if __name__ == '__main__':
         vid_part_time = 0
     while vid_part_time < infos['duration']:
         crf = 19
-        convert_video(file, infos, vid_part_time, cropsize, crf, animation)
+        convert_video(file, infos, vid_part_time, cropsize, crf, animation, interlaced, args.vhs)
         vid_part_time += 300
     create_mkv(file)
+    mkv_to_mp4(file)