Changeset 2668e1141ec31c9f8a582dc41ad648e24ec446c6
- Timestamp:
- 03/02/07 22:50:25
(2 years ago)
- Author:
- KRKeegan <KRKeegan>
- git-committer:
- KRKeegan <KRKeegan> 1172897425 +0000
- git-parent:
[303570adb60c9254c17bdf1410bc5ecc1f01c518]
- git-author:
- KRKeegan <KRKeegan> 1172897425 +0000
- Message:
-Fixed height, width transposition problems
-Changed ffmpeg signal to kill not term
-Changed python2.4 to python in interpreter heading
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r303570a |
r2668e11 |
|
| 40 | 40 | else: |
|---|
| 41 | 41 | import os, signal |
|---|
| 42 | | os.kill(ffmpeg.pid, signal.SIGTERM) |
|---|
| | 42 | os.kill(ffmpeg.pid, signal.SIGKILL) |
|---|
| 43 | 43 | |
|---|
| 44 | 44 | def select_aspect(inFile): |
|---|
| 45 | | type, height, width, fps, millisecs = video_info(inFile) |
|---|
| | 45 | type, width, height, fps, millisecs = video_info(inFile) |
|---|
| 46 | 46 | |
|---|
| 47 | 47 | d = gcd(height,width) |
|---|
| … | … | |
| 81 | 81 | settings.append('-padbottom') |
|---|
| 82 | 82 | settings.append(str(bottomPadding)) |
|---|
| 83 | | |
|---|
| | 83 | |
|---|
| 84 | 84 | return settings |
|---|
| 85 | 85 | #If video is taller than 4:3 add left and right padding, this is rare |
|---|
| … | … | |
| 105 | 105 | def tivo_compatable(inFile): |
|---|
| 106 | 106 | suportedModes = [[720, 480], [704, 480], [544, 480], [480, 480], [352, 480]] |
|---|
| 107 | | type, height, width, fps, millisecs = video_info(inFile) |
|---|
| | 107 | type, width, height, fps, millisecs = video_info(inFile) |
|---|
| 108 | 108 | |
|---|
| 109 | 109 | if not type == 'mpeg2video': |
|---|
| … | … | |
| 114 | 114 | |
|---|
| 115 | 115 | for mode in suportedModes: |
|---|
| 116 | | if (mode[0], mode[1]) == (height, width): |
|---|
| | 116 | if (mode[0], mode[1]) == (width, height): |
|---|
| 117 | 117 | return True |
|---|
| 118 | 118 | return False |
|---|
