Changeset c1d881f21b141fb2f7e119a80670ac76774dcf2e

Timestamp:

12/03/07 21:22:45 (1 year ago)

Author:

Jason Michalski <armooo@armooo.net>

git-committer:

Jason Michalski <armooo@armooo.net> 1196738565 -0600

git-parent:

[5b28e1c0764cb417669a19ef08b2757615918467]

git-author:

Jason Michalski <armooo@armooo.net> 1195449644 -0600

Message:

S3 mpeg settings

All mpeg going to S3 will not be transcoded
Please report mpeg files that will not play on your S3 They will be
so they can be transcoded.

Files:

• plugins/video/transcode.py (modified) (3 diffs)
• plugins/video/video.py (modified) (2 diffs)

plugins/video/transcode.py

@@ -35 +35 @@
-        
-def output_video(inFile, outFile, tsn=''):
-
+, tsn
-        debug_write(['output_video: ', inFile, ' is tivo compatible\n'])
-        f = file(inFile, 'rb')
@@ -208 +208 @@
-            return settings
-
-
+, tsn = ''
-    suportedModes = [[720, 480], [704, 480], [544, 480], [480, 480], [352, 480]]
-    type, width, height, fps, millisecs =  video_info(inFile)
@@ -221 +221 @@
-        debug_write(['tivo_compatible: ', inFile, ' is not mpeg2video it is ', type, '\n'])
-        return False
+
+    if tsn[:3] in ('648', '652'):
+        debug_write(['tivo_compatible: ', inFile, ' you have a S3 skiping the rest of the tests', '\n'])
+        return True
-
-    if not fps == '29.97':

plugins/video/video.py

@@ -46 +46 @@
-        return transcode.video_info(full_path)[4]
-
-
+, tsn = ''
-        #Size is estimated by taking audio and video bit rate adding 2%
-
@@ -124 +124 @@
-    def QueryContainer(self, handler, query):
-        
+        tsn =  handler.headers.getheader('tsn', '')
-        subcname = query['Container'][0]
-        cname = subcname.split('/')[0]