Changeset 3be20791af43ba0d603a52d51fb39fedc6208827
- Timestamp:
- 02/03/08 10:43:31
(10 months ago)
- Author:
- wgw <tjm1100@gmail.com>
- git-committer:
- wgw <tjm1100@gmail.com> 1202057011 -0600
- git-parent:
[ca8299241813f96b4ac27b5ac0644dddd4b35a42]
- git-author:
- wgw <tjm1100@gmail.com> 1202057011 -0600
- Message:
thought about that, couldn't decide, let's change it
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rca82992 |
r3be2079 |
|
| 91 | 91 | return '-vcodec mpeg2video -r 29.97 -b %(video_br)s -maxrate %(max_video_br)s -bufsize %(buff_size)s %(aspect_ratio)s -comment pyTivo.py %(audio_codec)s -ab %(audio_br)s -f vob -' |
|---|
| 92 | 92 | |
|---|
| 93 | | def getHDtivos(tsn): # tsn's of High Definition Tivo's |
|---|
| | 93 | def isHDtivo(tsn): # tsn's of High Definition Tivo's |
|---|
| 94 | 94 | return tsn != '' and tsn[:3] in ['648', '652'] |
|---|
| 95 | 95 | |
|---|
| … | … | |
| 128 | 128 | return nearestTivoHeight(height) |
|---|
| 129 | 129 | except NoOptionError: #defaults for S3/S2 TiVo |
|---|
| 130 | | if getHDtivos(tsn): |
|---|
| | 130 | if isHDtivo(tsn): |
|---|
| 131 | 131 | return 720 |
|---|
| 132 | 132 | else: |
|---|
| … | … | |
| 144 | 144 | return nearestTivoWidth(width) |
|---|
| 145 | 145 | except NoOptionError: #defaults for S3/S2 TiVo |
|---|
| 146 | | if getHDtivos(tsn): |
|---|
| | 146 | if isHDtivo(tsn): |
|---|
| 147 | 147 | return 1280 |
|---|
| 148 | 148 | else: |
|---|
| … | … | |
| 162 | 162 | return str(min(audiobr, getMaxAudioBR(tsn))) + 'k' |
|---|
| 163 | 163 | except NoOptionError: #defaults for S3/S2 TiVo |
|---|
| 164 | | if getHDtivos(tsn): |
|---|
| | 164 | if isHDtivo(tsn): |
|---|
| 165 | 165 | return '384k' |
|---|
| 166 | 166 | else: |
|---|
| … | … | |
| 176 | 176 | return config.get('Server', 'video_br') |
|---|
| 177 | 177 | except NoOptionError: #defaults for S3/S2 TiVo |
|---|
| 178 | | if getHDtivos(tsn): |
|---|
| | 178 | if isHDtivo(tsn): |
|---|
| 179 | 179 | return '8192k' |
|---|
| 180 | 180 | else: |
|---|
| … | … | |
| 203 | 203 | return int(int(strtod(config.get('Server', 'max_audio_br'))/1000)/64)*64 |
|---|
| 204 | 204 | except NoOptionError: |
|---|
| 205 | | if getHDtivos(tsn): |
|---|
| | 205 | if isHDtivo(tsn): |
|---|
| 206 | 206 | return int(448) #default to 448, max supported by HD TiVo's |
|---|
| 207 | 207 | else: |
|---|
| r1fd7a51 |
r3be2079 |
|
| 66 | 66 | def select_audiocodec(tsn = ''): |
|---|
| 67 | 67 | #check for HD tivo and return compatible audio parameters |
|---|
| 68 | | if config.getHDtivos(tsn): |
|---|
| | 68 | if config.isHDtivo(tsn): |
|---|
| 69 | 69 | return '-acodec ac3 -ar 48000' |
|---|
| 70 | 70 | else: |
|---|
| … | … | |
| 104 | 104 | multiplier4by3 = (4.0 * TIVO_HEIGHT) / (3.0 * TIVO_WIDTH) |
|---|
| 105 | 105 | |
|---|
| 106 | | if config.getHDtivos(tsn) and height <= TIVO_HEIGHT and config.getOptres() == False: |
|---|
| | 106 | if config.isHDtivo(tsn) and height <= TIVO_HEIGHT and config.getOptres() == False: |
|---|
| 107 | 107 | return [] #pass all resolutions to S3/HD, except heights greater than conf height |
|---|
| 108 | 108 | # else, optres is enabled and resizes SD video to the "S2" standard on S3/HD. |
|---|
| … | … | |
| 244 | 244 | return False |
|---|
| 245 | 245 | |
|---|
| 246 | | if config.getHDtivos(tsn): |
|---|
| | 246 | if config.isHDtivo(tsn): |
|---|
| 247 | 247 | debug_write(['tivo_compatible: ', inFile, ' you have a S3 skiping the rest of the tests', '\n']) |
|---|
| 248 | 248 | return True |
|---|
