Changeset 9686b71a78da019076ddbbbeb997fd2458c651d5
- Timestamp:
- 04/02/08 23:04:12
(9 months ago)
- Author:
- Jason <armooo@armooo.net>
- git-committer:
- Jason <armooo@armooo.net> 1207195452 -0500
- git-parent:
[4574b4f1b1074c71a4cc2a2c75361462d9a8fc3b]
- git-author:
- Jason <armooo@armooo.net> 1207195452 -0500
- Message:
FFMpeg will not output a 15 fps mpeg2
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| rdedb278 |
r9686b71 |
|
| 5 | 5 | info_cache = lrucache.LRUCache(1000) |
|---|
| 6 | 6 | videotest = os.path.join(os.path.dirname(__file__), 'videotest.mpg') |
|---|
| | 7 | |
|---|
| | 8 | BAD_MPEG_FPS = ['15.00'] |
|---|
| 7 | 9 | |
|---|
| 8 | 10 | def ffmpeg_path(): |
|---|
| … | … | |
| 38 | 40 | settings['video_codec'] = select_videocodec(tsn) |
|---|
| 39 | 41 | settings['video_br'] = select_videobr(tsn) |
|---|
| 40 | | settings['video_fps'] = select_videofps( |
|---|
| | 42 | settings['video_fps'] = select_videofps(inFile, tsn) |
|---|
| 41 | 43 | settings['max_video_br'] = select_maxvideobr() |
|---|
| 42 | 44 | settings['buff_size'] = select_buffsize() |
|---|
| … | … | |
| 93 | 95 | return '' |
|---|
| 94 | 96 | |
|---|
| 95 | | def select_videofps(tsn): |
|---|
| | 97 | def select_videofps(inFile, tsn): |
|---|
| | 98 | type, width, height, fps, millisecs, kbps, akbps, acodec, afreq, vpar = video_info(inFile) |
|---|
| 96 | 99 | vfps = '-r 29.97' #default |
|---|
| 97 | | if config.isHDtivo(tsn) |
|---|
| | 100 | if config.isHDtivo(tsn) and fps not in BAD_MPEG_FPS: |
|---|
| 98 | 101 | vfps = ' ' |
|---|
| 99 | 102 | if config.getVideoFPS(tsn) != None: |
|---|
