Changeset 22c71e076b9374066aebe1a63e75ee594dab4ea1

Show
Ignore:
Timestamp:
03/09/07 01:59:59 (2 years ago)
Author:
KRKeegan <KRKeegan>
git-committer:
KRKeegan <KRKeegan> 1173427199 +0000
git-parent:

[07acc27cef1dccd68e3645a634331d9f6bfc56df]

git-author:
KRKeegan <KRKeegan> 1173427199 +0000
Message:

- Added dlfl's mod to allow for transferring of ".tivo" files

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/video/transcode.py

    r46c8bdb r22c71e0  
    108108    #print type, width, height, fps, millisecs 
    109109 
     110    if (inFile[-5:]).lower() == '.tivo': 
     111        return True 
     112 
    110113    if not type == 'mpeg2video': 
    111114        #print 'Not Tivo Codec' 
    …… 
    124127 
    125128def video_info(inFile): 
     129    if (inFile[-5:]).lower() == '.tivo': 
     130        return True, True, True, True, True 
    126131    cmd = [FFMPEG, '-i', inFile ]  
    127132    ffmpeg = subprocess.Popen(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE, stdin=subprocess.PIPE) 
    …… 
    135140        codec = x.group(1) 
    136141    else: 
    137         return None, None, None, None, None, None 
     142        return None, None, None, None, None 
    138143 
    139144    rezre = re.compile(r'.*Video: .+, (\d+)x(\d+),.*') 
    …… 
    143148        height = int(x.group(2)) 
    144149    else: 
    145         return None, None, None, None, None, None 
     150        return None, None, None, None, None 
    146151 
    147152    rezre = re.compile(r'.*Video: .+, (.+) fps.*') 
    …… 
    150155        fps = x.group(1) 
    151156    else: 
    152         return None, None, None, None, None, None 
     157        return None, None, None, None, None 
    153158 
    154159    millisecs = ((int(d.group(1))*3600) + (int(d.group(2))*60) + int(d.group(3)))*1000 + (int(d.group(4))*100)