Changeset 047584cfad186d4dd2c6feee9e21e74f663b76fc

Timestamp:

11/24/06 18:36:58 (2 years ago)

Author:

Jason Michalski <armooo@armooo.net>

git-committer:

Jason Michalski <armooo@armooo.net> 1164415018 +0000

git-parent:

[4170f5970d1565e433b99279c8ef30d0efc05614]

git-author:

Jason Michalski <armooo@armooo.net> 1164415018 +0000

Message:

pyTivo
- Added support to pass correct mpegs past
- Added support to pick a aspect.
- Added support to pad a video

Files:

• httpserver.py (modified) (3 diffs)
• templates/container.tmpl (modified) (1 diff)
• transcode.py (modified) (1 diff)

httpserver.py

@@ -3 +3 @@
-from urlparse import urlparse
-from cgi import parse_qs
-
-from Cheetah.Template import Template
+from transcode import output_video
-
-class TivoHTTPServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer):
@@ -91 +91 @@
-            t.files = files
-            t.total = totalFiles
+            t.start = index
-            t.isdir = isdir
-            self.wfile.write(t)
@@ -108 +109 @@
-        #rfile = open(container['path'] + path[len(name)+1:], 'rb')
-        #shutil.copyfileobj(rfile, self.wfile)
-
-
+
-    
-    def infopage(self):

templates/container.tmpl

@@ -1 +1 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<TiVoContainer>
-0
+$start
-    <ItemCount>#echo len($files) #</ItemCount>
-    <Details>

transcode.py

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
-
-def transcode(inFile, outFile):
+
+    cmd = "ffmpeg_mp2.exe -i \"%s\" -vcodec mpeg2video -r 29.97 -b 4096 %s -ac 2 -ab 192 -f vob -" % (inFile, select_aspect(inFile))
+    print cmd
+    ffmpeg = subprocess.Popen(cmd, stdout=subprocess.PIPE)
-    try:
-        cmd = "ffmpeg_mp2.exe -y -i \"%s\" -vcodec mpeg2video -s 720x480 -r 29.97 -b 4096 -aspect 4:3 -ac 2 -ab 192 -f vob -" % inFile
-        ffmpeg = subprocess.Popen(cmd, stdout=subprocess.PIPE)
-        shutil.copyfileobj(ffmpeg.stdout, outFile)
-    except:
+        win32kill(ffmpeg.pid)
+
+def select_aspect(inFile):
+    type, height, width, fps =  video_info(inFile)
+    print type, height, width, fps
+    
+    d = gcd(height,width)
+
+    rheight, rwidth = height/d, width/d
+    print height, width
+
+    if (rheight, rwidth) == (4, 3):
+        return '-aspect 4:3 -s 720x480'
+    elif (rheight, rwidth) == (16, 9):
+        return '-aspect 16:9 -s 720x480'
+    else:
+        settings = []
+        settings.apppend('-aspect 16:9')
+      
+        endHeight = (720*width)/height
+        if endHeight % 2:
+            endHeight -= 1
+        print endHeight
+
+        settings.append('-s 720x' + str(endHeight))
+
+        topPadding = ((480 - endHeight)/2)
+        if topPadding % 2:
+            topPadding -= 1
+        
+        settings.append('-padtop ' + str(topPadding))
+        bottomPadding = (480 - endHeight) - topPadding
+        settings.append('-padbottom ' + str(bottomPadding))
+            
+        return ' '.join(settings)
+
+def tivo_compatable(inFile):
+    suportedModes = [[720, 480], [704, 480], [544, 480], [480, 480], [352, 480]]
+    type, height, width, fps =  video_info(inFile)
+
+    if not type == 'mpeg2video':
+        return False
+
+    if not fps == '29.97':
+        return False
+
+    for mode in suportedModes:
+        if (mode[0], mode[1]) == (height, width):
+            return True
+    return False
+
+def video_info(inFile):
+    cmd = "ffmpeg_mp2.exe -i \"%s\"" % inFile
+    ffmpeg = subprocess.Popen(cmd, stderr=subprocess.PIPE)
+    output = ffmpeg.stderr.read()
+    
+    rezre = re.compile(r'.*Video: (.+), (\d+)x(\d+), (.+) fps.*')
+    m = rezre.search(output)
+    if m:
+        return m.group(1), int(m.group(2)), int(m.group(3)), m.group(4)
+    else:
+        return None, None, None, None
+        
+def win32kill(pid):
-        import ctypes
-ffmpeg.
+
-        ctypes.windll.kernel32.TerminateProcess(handle, -1)
-        ctypes.windll.kernel32.CloseHandle(handle)
+
+def gcd(a,b):
+    while b:
+        a, b = b, a % b
+    return a