Changeset 19f68114ed66d3e613ac582097a372e399f4af17

Timestamp:

07/29/11 14:02:28 (10 months ago)

Author:

Luper Rouch <luper.rouch@…>

Children:

7cebbdb62a64026be49de41d00e78e6af5cedef2, 3a775b411f35b86eb3571e5ee1847dbfa4067f9c

Parents:

70076a735ad14f19763a31ed1f6e806027043cba

git-committer:

Luper Rouch <luper.rouch@…> (07/29/11 14:02:28)

Message:

avi2mkv: cleaned up mkvmerge options, should support all arangements of tracks now

File:

• utils/avi2mkv/src/avi2mkv/__init__.py (modified) (7 diffs)

utils/avi2mkv/src/avi2mkv/__init__.py

@@ -1 +1 @@
 import os
 import os.path as op
+import re
 import subprocess
 import argparse
@@ -9 +10 @@
 
 
-def mux_avi(args):
+def mux_file(args):
     """
     Mux an avi and its subtitles (if any) in a mkv file.
@@ -36 +37 @@
     else:
         subtitles_file = None
-    # Run mkvmerge
-    args = [
-        "mkvmerge", 
-        "-o", output_file, 
-        "--quiet",
-        "--forced-track", "0:no", 
-        "--compression", "0:none", 
-        "--forced-track", "1:no",
-        "--compression", "1:none", 
-        "-a", "1", 
-        "-d", "0", 
-        "-S", 
-        "-T",
-        "--no-global-tags", 
-        "--no-chapters",
-        input_file
-    ]
+    # Build mkvmerge args
+    args = ["mkvmerge", "-o", output_file]
+    for track in list_tracks(input_file):
+        args += ["--compression", "%d:none" % track]
     if subtitles_file is not None:
+        args += ["-S", input_file]
         out_fd = tempfile.NamedTemporaryFile()
         subrip.clean_srt(open(subtitles_file, "rt"), out_fd)
@@ -59 +48 @@
         args += [
             "--sub-charset", "0:%s" % options.charset, 
-            "--forced-track", "0:no", 
             "--compression", "0:none", 
-            "-s", "0",
-            "-D", 
-            "-A", 
-            "-T", 
-            "--no-global-tags", 
-            "--no-chapters",
             out_fd.name, 
-            "--track-order", "0:0,0:1,1:0"
         ]
     else:
-        args += ["--track-order", "0:0,0:1"]
+        args += [input_file]
     kwargs = {}
     if not options.quiet:
@@ -77 +58 @@
                 (input_file, output_file))
     else:
+        args += ["--quiet"]
         fnull = open(os.devnull, "w")
         kwargs["stdout"] = fnull
         kwargs["stderr"] = fnull
+    # Run mkvmerge
+    if options.verbose:
+        sys.stdout.write("mkvmerge command line:\n%s\n" % " ".join(args))
     try:
         subprocess.check_call(args, **kwargs)
@@ -85 +70 @@
         sys.stderr.write("Error muxing '%s', mkvmerge exited with error "
                 "code %s\n" % (input_file, err.returncode))
+
+
+def list_tracks(filename):
+    """
+    List and return track IDs in *filename* with ``mkvmerge --identify``.
+    """
+    process = subprocess.Popen(["mkvmerge", "--identify", filename],
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = process.communicate()
+    track_pattern = re.compile("Track ID ([0-9]+):")
+    ids = []
+    for line in stdout.splitlines():
+        match = track_pattern.match(line)
+        if match:
+            ids.append(int(match.group(1)))
+    return ids
 
 
@@ -100 +101 @@
             help="output directory (default is to create the new files in the "
             "same directory as the input files)")
+    parser.add_argument("--force", "-f", action="store_true", default=False,
+            help="force overwrite of existing files")
     parser.add_argument("--quiet", "-q", action="store_true", default=False, 
             help="be quiet")
-    parser.add_argument("--force", "-f", action="store_true", default=False,
-            help="force overwrite of existing files")
+    parser.add_argument("--verbose", action="store_true", default=False, 
+            help="be verbose")
     args = parser.parse_args()
     # Run jobs
     pool = multiprocessing.Pool(args.num_jobs)
-    pool.map(mux_avi, [(f, args) for f in args.input_files])
+    pool.map(mux_file, [(f, args) for f in args.input_files])