Apple-2-SW/ii-vision
1
0
Fork 0
mirror of https://github.com/KrisKennaway/ii-vision.git synced 2024-06-09 06:29:32 +00:00
Code Issues Projects Releases Wiki Activity

Fix merges after rebase

Browse Source
This commit is contained in:
kris 2019-06-19 22:10:15 +01:00
parent 4d9e1e510b
commit cf3c687a8f
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
transcoder/movie.py
View File

@ -32,9 +32,10 @@ class Movie:
self.frame_grabber = frame_grabber.FileFrameGrabber(
filename, mode=video_mode, palette=self.palette)
self.video = video.Video(
self.frame_sequencer, mode=video_mode,
palette=self.palette,
ticks_per_second=self.audio.sample_rate
self.frame_sequencer,
ticks_per_second=self.audio.sample_rate,
mode=video_mode,
palette=self.palette
) # type: video.Video
self.stream_pos = 0 # type: int

6
transcoder/video.py
View File

@ -22,15 +22,15 @@ class Video:
def __init__(
self,
frame_grabber: FrameGrabber,
mode: VideoMode = VideoMode.HGR,
palette: Palette = Palette.NTSC,
ticks_per_second: int,
mode: VideoMode = VideoMode.HGR,
palette: Palette = Palette.NTSC
):
self.mode = mode # type: VideoMode
self.frame_grabber = frame_grabber # type: FrameGrabber
self.ticks_per_second = float(ticks_per_second) # type: float
self.ticks_per_frame = (
self.ticks_per_second / self.input_frame_rate) # type: float
self.ticks_per_second / frame_grabber.input_frame_rate) # type: float
self.frame_number = 0 # type: int
self.palette = palette # type: Palette

2
transcoder/video_test.py
View File

@ -12,7 +12,7 @@ import video_mode
class TestVideo(unittest.TestCase):
def test_diff_weights(self):
fs = frame_grabber.FrameGrabber(mode=video_mode.VideoMode.DHGR)
v = video.Video(fs, mode=video_mode.VideoMode.DHGR)
v = video.Video(fs, ticks_per_second=10000, mode=video_mode.VideoMode.DHGR)
frame = screen.MemoryMap(screen_page=1)
frame.page_offset[0, 0] = 0b1111111