Changeset 1807

Timestamp:

11/19/08 17:32:54 (16 months ago)

Author:

JensDiemer

Message:

VideoTools? updates.

Location:

CodeSnippets/VideoTools

Files:

• . (modified) (1 prop)
• AC3downconvert.cmd (added)
• AC3downconvert.py (added)
• eac3to.py (modified) (25 diffs)
• shared/tk_tools.py (modified) (1 diff)
• shared/tools.py (modified) (2 diffs)
• Templatemaker.cmd (added)
• Templatemaker.py (modified) (1 diff)
• templates/bitrate - 2pass with fast-first-pass/x264 2pass with fast-first-pass.cmd (modified) (2 diffs)

CodeSnippets/VideoTools/eac3to.py

@@ -5 +5 @@
 """
 
-import os, sys, glob, time, datetime, subprocess, logging
+import os, sys, glob, time, datetime, logging
 from pprint import pprint
 
@@ -14 +14 @@
 from shared.config import VideoToolsConfig
 from shared.tk_tools import askopenfilename2, askdirectory2, TkListbox
-from shared.tools import make_slug, human_filesize
+from shared.tools import make_slug, human_filesize, subprocess2
 
 DEBUG = False
@@ -60 +60 @@
         self["vol_info"] = vol_info
         self["lable"] = vol_info[0]
-
+        
     def debug(self):
         print "_"*79
@@ -88 +88 @@
         self["abs_path"] = abs_path # File path + filename
         self["stat"] = stat # os.stat
-
+        
         self.cfg = cfg
 
@@ -130 +130 @@
     def get_command(self, stream_selection):
         cmd = [self.cfg["eac3to"], self["abs_path"]]
-
+        
         value_dict = {}
         for k,v in self["streams"].iteritems():
@@ -136 +136 @@
             if v not in value_dict:
                 value_dict[v] = []
-
+        
             value_dict[v].append(k)
-
+        
 #        pprint(value_dict)
 
@@ -147 +147 @@
                         return True
                 return False
-
+            
             for stream_info in STREAMINFOS:
                 if in_list(stream_txt, stream_info["txt_filter"]):
                     return stream_info["ext"]
-
+                
             raise RuntimeError(
                 "No STREAMINFOS entry matched for '%s'" % stream_txt
             )
-
+        
         selected_streams = {}
         for stream_txt in stream_selection:
@@ -163 +163 @@
                 print "Stream '%s' doesn't exist. Skip file." % stream_txt
                 return
-
+            
             file_ext = get_file_ext(stream_txt)
-
+            
             for id in ids:
                 filename = "%s - %i - %s%s" % (
@@ -174 +174 @@
                 )
                 out_filepath = os.path.join(self["out_path"], filename)
-
+                
                 cmd.append("%i:" % id)
                 cmd.append(out_filepath)
-
+                        
         return cmd
 
@@ -189 +189 @@
                 print ">", line
             no, info = line.split(":",1)
-
+            
             try:
                 no = int(no)
             except ValueError:
                 continue
-
+            
             info = info.strip()
-
+            
             self["streams"][no] = info
-
+ 
 
     def get_stream_info(self):
@@ -216 +216 @@
             print "run '%s'..." % " ".join(cmd)
             process, output = subprocess2(cmd)
-
+            
             f = file(self["eac3to_txt_path"], "w")
             f.write(output)
             f.close()
-
+            
         return output
 
     #-------------------------------------------------------------------------
-
+    
     def debug(self):
         print "_"*79
@@ -250 +250 @@
     result = []
     for drive in drives:
+        drive_letter = drive["letter"]
         try:
-            vol_info = win32api.GetVolumeInformation(drive.letter)
+            vol_info = win32api.GetVolumeInformation(drive_letter)
         except Exception, err:
-            #~ print "Skip drive '%s': %s" % (drive.letter, err)
+            print "Skip drive '%s': %s" % (drive_letter, err)
             continue
 
@@ -273 +274 @@
         filetypes = [('M2TS File','*.m2ts')],
     )
-
+    
     vol_info = path.replace("\\", "_").replace(":","_") # Fallback
     for part in reversed(path.split(os.sep)[:-1]):
@@ -280 +281 @@
             vol_info = part
             break
-
+    
     drive = Drive(os.path.splitdrive(path)[0], cfg)
     drive["stream_dir"] = os.path.split(path)[0]
     drive.set_vol_info((vol_info,))
-
+    
     drive.debug()
-
+    
     drives = [drive,]
-
+    
     cfg["last sourcedir"] = path
-
+    
     return drives
 
@@ -306 +307 @@
             print "Error: Path '%s' doesn't exist -> skip." % path
             continue
-
+        
         glob_path = os.path.join(path, cfg["glob"])
         print "Looking in", glob_path
@@ -313 +314 @@
         for abs_path in sorted(file_list):
             filename = os.path.basename(abs_path)
-
+            
             stat = os.stat(abs_path)
 
@@ -344 +345 @@
     for index, videofile in enumerate(videofiles):
         filesize = videofile["stat"].st_size
-
+        
         line = "%s - %s" % (videofile["abs_path"], human_filesize(filesize))
         item_list.append(line)
-
+        
         if filesize>cfg["skip_size"]:
             activated.append(index)
-
+    
 #    size = stat.st_size
 #    if size<cfg["skip_size"]:
 #        # Skip small files
-#        continue
-
+#        continue  
+    
     lb = TkListbox(
         title = "Please select",
@@ -364 +365 @@
     print "selected items:"
     pprint(lb.selection) # list of selected items.
-
+    
     curselection = lb.curselection # tuple containing index of selected items
-    print "curselection:", curselection
-
+    print "curselection:", curselection      
+        
     new_list = [
         item
@@ -380 +381 @@
 
 
-def subprocess2(cmd):
-    print "_"*80
-    print "subprocess2():"
-    pprint(cmd)
-    print " -"*40
-    process = subprocess.Popen(
-        cmd,
-        stdout=subprocess.PIPE,
-        shell=True,
-    )
-    output = ""
-    char_count = 0
-    while True:
-        char = process.stdout.read(1)
-        if char=="":
-            break
-
-        if char in ("\r", "\x08"):
-            continue
-
-        if char == "\n":
-            char_count = 0
-        else:
-            char_count += 1
-
-        output += char
-        sys.stdout.write(char)
-        if char_count>79:
-            sys.stdout.write("\n")
-            char_count = 0
-        sys.stdout.flush()
-
-    return process, output
-
-
+
+
+    
 def select_streams(videofiles):
     """
@@ -426 +395 @@
             if not stream_txt in streams_txt:
                 streams_txt.append(stream_txt)
-#
+#    
 #    lb = TkListbox(
 #        title = "Please select",
@@ -433 +402 @@
 #    )
 #    print lb.selection
-
+    
     selection = TkListbox(
         title = "Please select",
@@ -439 +408 @@
         items = streams_txt
     ).selection
-
+    
     return selection
 
@@ -445 +414 @@
     print "convert_streams():", videofile, stream_selection
     videofile.debug()
-
-
-
-
-if __name__ == "__main__":
+    
+    
+
+
+if __name__ == "__main__":    
     cfg = VideoToolsConfig()
     cfg.debug()
-
+    
     if DEBUG:
         print "DEBUG!!!"
@@ -473 +442 @@
     # Select via Tk the files witch realy convert
     videofiles = select_videofiles(videofiles)
-
+    
     if not videofiles:
         print "No stream files found -> abort, ok."
@@ -497 +466 @@
             print "ERROR: No streams found!"
             continue
-
+        
 
 

CodeSnippets/VideoTools/shared/tk_tools.py

@@ -17 +17 @@
         sys.exit()
     
-    return os.path.normpath(path)
+    if isinstance(path, tuple):
+        return [os.path.normpath(i) for i in path]
+    else:
+        return os.path.normpath(path)
 
 def askdirectory2(*args, **kwargs):

CodeSnippets/VideoTools/shared/tools.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
 
-import os, sys, string
+import os, sys, string, subprocess
+from pprint import pprint
 
 
@@ -79 +80 @@
 
 
+
+
+def subprocess2(cmd, debug=False):
+    """
+    start a subprocess and display all output
+    """
+    print "_"*80
+    print "subprocess2():"
+    pprint(cmd)
+    print " -"*40
+    if debug:
+        print "(Debug only, nothing would be started.)"
+        return
+    process = subprocess.Popen(
+        cmd,
+        stdout=subprocess.PIPE,
+        shell=True,
+    )
+    output = ""
+    char_count = 0
+    while True:
+        char = process.stdout.read(1)
+        if char=="":
+            break
+
+        if char in ("\r", "\x08"):
+            continue
+        
+        if char == "\n":
+            char_count = 0
+        else:
+            char_count += 1
+
+        output += char
+        sys.stdout.write(char)
+        if char_count>79:
+            sys.stdout.write("\n")
+            char_count = 0            
+        sys.stdout.flush()
+
+    return process, output
+
+
+
+
+
 if __name__ == "__main__":
     import doctest

CodeSnippets/VideoTools/Templatemaker.py

@@ -308 +308 @@
     print "rate value:", rate_value
     
-    create_files(cfg, video_file_path, template, rate_value, x264_settings)
+    if len(sys.argv)>1:
+        for fn in sys.argv[1:]:
+            create_files(cfg, fn, template, rate_value, x264_settings)
+    else:
+        create_files(cfg, video_file_path, template, rate_value, x264_settings)
     
     print " -- END -- "

CodeSnippets/VideoTools/templates/bitrate - 2pass with fast-first-pass/x264 2pass with fast-first-pass.cmd

@@ -19 +19 @@
 set stats_file=${basename} x264.stats
 
-set out_file1=${basename} x264 ${rate_value}KBits pass1.mkv
 set out_file2=${basename} x264 ${rate_value}KBits pass2.mkv
 
@@ -38 +37 @@
 :pass1
 echo on
-%x264% --pass 1 %firstpass% --bitrate %rate_value% --stats "%stats_file%" -o "%out_file1%" "%pass1_source%"
+%x264% --pass 1 %firstpass% --bitrate %rate_value% --stats "%stats_file%" -o NUL "%pass1_source%"
 @echo off