Add mkv ugoira packing without encoding (#1218)

* Added mkv ugoira packing without encoding * Add back 'temp fix? #1209' commit * Update PixivBrowserFactory.py * Update PixivBrowserFactory.py * Update readme * Update readme.md * Update readme.md * Added mkv params to make it usable with args Update readme.md * Update readme.md
Nandaka · Jan 2, 2023 · b06e869 · b06e869
1 parent 32b0e83
commit b06e869
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 1 deletion.
diff --git a/PixivConfig.py b/PixivConfig.py
@@ -178,6 +178,8 @@ class PixivConfig():
         ConfigItem("FFmpeg", "ffmpegCodec", "libvpx-vp9"),
         ConfigItem("FFmpeg", "ffmpegExt", "webm"),
         ConfigItem("FFmpeg", "ffmpegParam", "-lossless 0 -crf 15 -b 0 -vsync 0"),
+        ConfigItem("FFmpeg", "mkvCodec", "copy"),
+        ConfigItem("FFmpeg", "mkvParam", ""),
         ConfigItem("FFmpeg", "webpCodec", "libwebp"),
         ConfigItem("FFmpeg", "webpParam", "-lossless 0 -compression_level 5 -quality 100 -loop 0 -vsync 0"),
         ConfigItem("FFmpeg", "gifParam",
@@ -187,6 +189,7 @@ class PixivConfig():
 
         ConfigItem("Ugoira", "writeUgoiraInfo", False),
         ConfigItem("Ugoira", "createUgoira", False),
+        ConfigItem("Ugoira", "createMkv", False),
         ConfigItem("Ugoira", "createWebm", False),
         ConfigItem("Ugoira", "createWebp", False),
         ConfigItem("Ugoira", "createGif", False),

diff --git a/PixivDownloadHandler.py b/PixivDownloadHandler.py
@@ -85,7 +85,7 @@ def download_image(caller,
                     remote_file_size = get_remote_filesize(url, referer, config, notifier)
                 else:
                     remote_file_size = -1
-                    PixivHelper.print_and_log(None, f"\rSkipped getting remote file size because local file not exists")
+                    PixivHelper.print_and_log(None, "\rSkipped getting remote file size because local file not exists")
 
                 # 837
                 if config.skipUnknownSize and is_exists and remote_file_size == -1:
@@ -426,13 +426,22 @@ def handle_ugoira(image, zip_filename, config, notifier):
                                     codec=config.ffmpegCodec,
                                     extension=config.ffmpegExt,
                                     image=image)
+
     if config.createWebp:
         webp_filename = ugo_name[:-7] + ".webp"
         if not os.path.exists(webp_filename):
             PixivHelper.ugoira2webp(ugo_name,
                                     webp_filename,
                                     image=image)
 
+    if config.createMkv:
+        mkv_filename = ugo_name[:-7] + ".mkv"
+        if not os.path.exists(mkv_filename):
+            PixivHelper.ugoira2mkv(ugo_name,
+                                   mkv_filename,
+                                   codec=config.mkvCodec,
+                                   image=image)
+
     if config.deleteZipFile and os.path.exists(zip_filename) and zip_filename.endswith(".zip"):
         PixivHelper.print_and_log('info', f"Deleting zip file => {zip_filename}")
         os.remove(zip_filename)

diff --git a/PixivHelper.py b/PixivHelper.py
@@ -1023,6 +1023,17 @@ def ugoira2webm(ugoira_file, exportname, codec="libvpx-vp9", extension="webm", i
                    image=image)
 
 
+def ugoira2mkv(ugoira_file, exportname, codec="copy", image=None):
+    print_and_log('info', 'Processing ugoira to mkv...')
+    convert_ugoira(ugoira_file,
+                   exportname,
+                   ffmpeg=_config.ffmpeg,
+                   codec=codec,
+                   param=_config.mkvParam,
+                   extension="mkv",
+                   image=image)
+
+
 def convert_ugoira(ugoira_file, exportname, ffmpeg, codec, param, extension, image=None):
     ''' modified based on https://github.com/tsudoko/ugoira-tools/blob/master/ugoira2webm/ugoira2webm.py '''
     # if not os.path.exists(os.path.abspath(ffmpeg)):

diff --git a/PixivImageHandler.py b/PixivImageHandler.py
@@ -480,6 +480,7 @@ def process_ugoira_local(caller, config):
                             file_basename = os.path.basename(file)
                             file_ext = os.path.splitext(file_basename)[1]
                             if ((("gif" in file_ext) and (config.createGif))
+                               or (("mkv" in file_ext) and (config.createMkv))
                                or (("png" in file_ext) and (config.createApng))
                                or (("webm" in file_ext) and (config.createWebm))
                                or (("webp" in file_ext) and (config.createWebp))

diff --git a/readme.md b/readme.md
@@ -640,6 +640,12 @@ Please refer run with `--help` for latest information.
 - ffmpegparam
 
   Parameter to be used to encode webm, default: `-lossless 0 -crf 15 -b 0 -vsync 0`.
+- mkvcodec
+
+  Codec to be used for encoding mkv, default is using `copy`.
+- mkvparam
+
+  Parameter to be used to encode mkv, default: ` `.
 - webpcodec
 
   Codec to be used for encoding webm, default is using `libwebp`.
@@ -655,6 +661,10 @@ Please refer run with `--help` for latest information.
 
   If set to `True`, it will create .ugoira file.
   This is Pixiv own format for animated images. You can use Honeyview to see the animation.
+- createmkv
+
+  Set to True to create mkv file (video format). The default settings is lossless(no encoding), it will pack the images in the container. Very large file size.
+  Required `createUgoira = True` and ffmpeg executeable.
 - createwebm
 
   Set to True to create webm file (video format). The default encoding settings is lossy encoding but high quality with smallest file size.