Changeset 72bf4739b44070a029ac4fe25d496cc897bfe466

Show
Ignore:
Timestamp:
12/31/07 13:33:28 (1 year ago)
Author:
William McBrine <wmcbrine@gmail.com>
git-committer:
William McBrine <wmcbrine@gmail.com> 1199129608 -0500
git-parent:

[a831e6c85be8b9206c651b1bcb674f6beba51686], [90c92b8fef334c45c9cd5905b20c748ecc6d6394]

git-author:
William McBrine <wmcbrine@gmail.com> 1199129608 -0500
Message:

Merge git+ssh://repo.or.cz/srv/git/pyTivo/wgw

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/video/transcode.py

    raf8e504 r90c92b8  
    8181 
    8282    if optres: 
    83         optHeight = Config.nearestTivoHeight(height) 
    84         optWidth = Config.nearestTivoWidth(width) 
     83        optHeight = config.nearestTivoHeight(height) 
     84        optWidth = config.nearestTivoWidth(width) 
    8585        if optHeight < TIVO_HEIGHT: 
    8686            TIVO_HEIGHT = optHeight 
    …… 
    222222        return False 
    223223 
     224    if (inFile[-3:]).lower() == '.ts': 
     225        debug_write(['tivo_compatible: ', inFile, ' transport stream not supported ', '\n']) 
     226        return False 
     227 
    224228    if tsn[:3] in ('648', '652'): 
    225229        debug_write(['tivo_compatible: ', inFile, ' you have a S3 skiping the rest of the tests', '\n']) 

  • plugins/video/video.py

    r159e96c r8153cdc  
    5252            return int(os.stat(full_path).st_size) 
    5353        else:  # Must be re-encoded 
    54             audioBPS = strtod(config.getAudioBR()) 
    55             videoBPS = strtod(config.getVideoBR()) 
     54            audioBPS = strtod(config.getAudioBR(tsn)) 
     55            videoBPS = strtod(config.getVideoBR(tsn)) 
    5656            bitrate =  audioBPS + videoBPS 
    5757            return int((self.__duration(full_path)/1000)*(bitrate * 1.02 / 8))