Changeset 3886559eb7bda4b175df80853f4cb83baba610da

Show
Ignore:
Timestamp:
03/12/08 22:41:21 (10 months ago)
Author:
wgw <tjm1100@gmail.com>
git-committer:
wgw <tjm1100@gmail.com> 1205379681 -0500
git-parent:

[a47ec592a6de883f4ae6bca512c23ac5bf1e1231]

git-author:
wgw <tjm1100@gmail.com> 1205379681 -0500
Message:

per tivo optres needed

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • config.py

    re40c8f2 r3886559  
    104104        return False 
    105105 
    106 def getOptres(): 
     106def getOptres(tsn = None): 
     107    if tsn and config.has_section('_tivo_' + tsn): 
     108        try: 
     109            return config.getboolean('_tivo_' + tsn, 'optres') 
     110        except NoOptionError, ValueError: 
     111            pass 
    107112    try: 
    108113        return config.getboolean('Server', 'optres') 

  • plugins/admin/admin.py

    r8d06eb5 r3886559  
    6565        t.tivos_data = [ (section, dict(config.items(section, raw=True))) for section in config.sections() \ 
    6666                         if section.startswith('_tivo_')] 
    67         t.tivos_known = ["aspect169", "audio_br", "video_br", "video_fps", "width",\ 
     67        t.tivos_known = ["aspect169", "optres", "video_fps", "video_br", "width",\ 
    6868                         "height", "audio_br", "max_audio_br", "audio_fr", "audio_ch",\ 
    6969                         "audio_codec", "ffmpeg_pram", "shares"] 

  • plugins/video/transcode.py

    ra47ec59 r3886559  
    151151    debug_write(__name__, fn_attr(), ['aspect169:', aspect169]) 
    152152 
    153     optres = config.getOptres() 
     153    optres = config.getOptres(tsn) 
    154154 
    155155    debug_write(__name__, fn_attr(), ['optres:', optres]) 
    …… 
    172172    multiplier4by3  =  (4.0 * TIVO_HEIGHT) / (3.0 * TIVO_WIDTH) 
    173173    
    174     if config.isHDtivo(tsn) and height <= TIVO_HEIGHT and config.getOptres() == False: 
     174    if config.isHDtivo(tsn) and height <= TIVO_HEIGHT and not optres: 
    175175        return [] #pass all resolutions to S3/HD, except heights greater than conf height 
    176176                # else, optres is enabled and resizes SD video to the "S2" standard on S3/HD.