Changeset ea972e29ced282ead75dc9bfc15248de13eee07a
- Timestamp:
- 03/02/08 00:38:11
(10 months ago)
- Author:
- wgw <tjm1100@gmail.com>
- git-committer:
- wgw <tjm1100@gmail.com> 1204439891 -0600
- git-parent:
[13846522caa6199e6c12e614475b80438432e08d]
- git-author:
- wgw <tjm1100@gmail.com> 1204439891 -0600
- Message:
pass source frame rate to HD TiVo
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r75822c9 |
rea972e2 |
|
| 110 | 110 | return config.get('Server', 'ffmpeg_prams', raw=True) |
|---|
| 111 | 111 | except NoOptionError: #default |
|---|
| 112 | | 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 -ab %(audio_br)s %(audio_fr)s %(audio_codec)s -f vob -' |
|---|
| | 112 | return '-vcodec mpeg2video %(video_fps)s -b %(video_br)s -maxrate %(max_video_br)s -bufsize %(buff_size)s %(aspect_ratio)s -comment pyTivo.py -ab %(audio_br)s %(audio_fr)s %(audio_codec)s -f vob -' |
|---|
| 113 | 113 | |
|---|
| 114 | 114 | def isHDtivo(tsn): # tsn's of High Definition Tivo's |
|---|
| r1384652 |
rea972e2 |
|
| 39 | 39 | settings['audio_codec'] = select_audiocodec(inFile, tsn) |
|---|
| 40 | 40 | settings['audio_fr'] = select_audiofr(inFile) |
|---|
| | 41 | settings['video_fps'] = select_videofps(inFile) |
|---|
| 41 | 42 | settings['video_br'] = config.getVideoBR(tsn) |
|---|
| 42 | 43 | settings['max_video_br'] = config.getMaxVideoBR() |
|---|
| … | … | |
| 84 | 85 | freq = '-ar ' + afreq |
|---|
| 85 | 86 | return freq |
|---|
| | 87 | |
|---|
| | 88 | def select_videofps(inFile): |
|---|
| | 89 | vfps = '-r 29.97' #default |
|---|
| | 90 | if config.isHDtivo: |
|---|
| | 91 | vfps = ' ' |
|---|
| | 92 | return vfps |
|---|
| 86 | 93 | |
|---|
| 87 | 94 | def select_aspect(inFile, tsn = ''): |
|---|
| r6b0c52d |
rea972e2 |
|
| 43 | 43 | #width=1280 |
|---|
| 44 | 44 | #height=720 |
|---|
| 45 | | #ffmpeg_prams=-vcodec mpeg2video -r 29.97 -b %(video_br)s -maxrate %(max_video_br)s -bufsize %(buff_size)s %(aspect_ratio)s -comment pyTivo.py -ab %(audio_br)s %(audio_fr)s %(audio_codec)s -f vob - |
|---|
| | 45 | #ffmpeg_prams=-vcodec mpeg2video %(video_fps)s -b %(video_br)s -maxrate %(max_video_br)s -bufsize %(buff_size)s %(aspect_ratio)s -comment pyTivo.py -ab %(audio_br)s %(audio_fr)s %(audio_codec)s -f vob - |
|---|
| 46 | 46 | |
|---|
| 47 | 47 | # Per tivo options |
|---|
| … | … | |
| 56 | 56 | #audio_br=320K |
|---|
| 57 | 57 | #video_br=12Mi |
|---|
| 58 | | #ffmpeg_prams=-vcodec mpeg2video -r 29.97 -b %(video_br)s -maxrate %(max_video_br)s -bufsize %(buff_size)s %(aspect_ratio)s -comment pyTivo.py -ab %(audio_br)s %(audio_fr)s %(audio_codec)s -f vob - |
|---|
| | 58 | #ffmpeg_prams=-vcodec mpeg2video %(video_fps)s -b %(video_br)s -maxrate %(max_video_br)s -bufsize %(buff_size)s %(aspect_ratio)s -comment pyTivo.py -ab %(audio_br)s %(audio_fr)s %(audio_codec)s -f vob - |
|---|
| 59 | 59 | |
|---|
| 60 | 60 | [MyMovies] |
|---|
