mirror of
https://github.com/KrisKennaway/ii-vision.git
synced 2024-12-21 20:29:21 +00:00
ec65684221
- Extract out a (File)FrameSequencer class from Video to encapsulate the generation of still frames. This also makes Video easier to test. - Fix FileFrameSequencer.frames() to correctly handle filenames containing '.' - Temporarily switch to the BMP2DHR NTSC palette (#5) for evaluation. Video: - Temporarily hardcode DHGR decoding - Optimize _heapify_priorities() by using numpy to vectorize the construction of the list of tuples. This requires changing the random nonce to an int so the intermediate array has a uniform type. - Use the efficient 28-bit representation of DHGR (aux, main, aux, main) tuples introduced in DHGRBitmap to evaluate diffs - Switch to np.int type for accumulating diffs, and random.randint(0, 10000) instead of float for nonce values. - Fix/improve some of the error evaluation in _index_changes: - skip offsets whose diffs have already been cleared - hoist some stuff out of _compute_error into the parent - Add some validation that when we run out of work to do with a frame, the source and target memory maps should be equal. This isn't happening sometimes, i.e. there is a bug.
126 lines
4.0 KiB
Python
126 lines
4.0 KiB
Python
"""Multiplexes video and audio inputs to encoded byte stream."""
|
|
|
|
from typing import Iterable, Iterator
|
|
|
|
import audio
|
|
import machine
|
|
import opcodes
|
|
import video
|
|
|
|
|
|
class Movie:
|
|
def __init__(
|
|
self, filename: str,
|
|
every_n_video_frames: int = 1,
|
|
audio_normalization: float = None,
|
|
max_bytes_out: int = None,
|
|
video_mode: video.Mode = video.Mode.HGR,
|
|
):
|
|
self.filename = filename # type: str
|
|
self.every_n_video_frames = every_n_video_frames # type: int
|
|
self.max_bytes_out = max_bytes_out # type: int
|
|
self.video_mode = video_mode # type: video.Mode
|
|
|
|
self.audio = audio.Audio(
|
|
filename, normalization=audio_normalization) # type: audio.Audio
|
|
|
|
self.frame_sequencer = video.FileFrameSequencer(
|
|
filename, mode=video_mode)
|
|
self.video = video.Video(
|
|
self.frame_sequencer, mode=video_mode) # type: video.Video
|
|
|
|
self.stream_pos = 0 # type: int
|
|
|
|
# TODO: don't use this as well as cycle_counter, it's a relic of when
|
|
# I relied on variable-duration opcodes for frame timings.
|
|
self.cycles = 0 # type: int
|
|
self.cycle_counter = machine.CycleCounter()
|
|
|
|
self.state = machine.Machine(
|
|
self.cycle_counter,
|
|
self.video.memory_map,
|
|
self.video.update_priority
|
|
)
|
|
|
|
self.aux_memory_bank = False
|
|
|
|
def encode(self) -> Iterator[opcodes.Opcode]:
|
|
"""
|
|
|
|
:return:
|
|
"""
|
|
video_frames = self.frame_sequencer.frames()
|
|
main_seq = None
|
|
aux_seq = None
|
|
|
|
yield opcodes.Header(mode=self.video_mode)
|
|
|
|
for au in self.audio.audio_stream():
|
|
self.cycles += self.audio.cycles_per_tick
|
|
if self.video.tick(self.cycles):
|
|
main, aux = next(video_frames)
|
|
if ((self.video.frame_number - 1) % self.every_n_video_frames
|
|
== 0):
|
|
print("Starting frame %d" % self.video.frame_number)
|
|
main_seq = self.video.encode_frame(main, is_aux=False)
|
|
|
|
if aux:
|
|
aux_seq = self.video.encode_frame(aux, is_aux=True)
|
|
# au has range -15 .. 16 (step=1)
|
|
# Tick cycles are units of 2
|
|
tick = au * 2 # -30 .. 32 (step=2)
|
|
tick += 34 # 4 .. 66 (step=2)
|
|
|
|
(page, content, offsets) = next(
|
|
aux_seq if self.aux_memory_bank else main_seq)
|
|
|
|
yield opcodes.TICK_OPCODES[(tick, page)](content, offsets)
|
|
|
|
def _emit_bytes(self, _op):
|
|
"""
|
|
|
|
:param _op:
|
|
:return:
|
|
"""
|
|
for b in self.state.emit(_op):
|
|
yield b
|
|
self.stream_pos += 1
|
|
|
|
def emit_stream(self, ops: Iterable[opcodes.Opcode]) -> Iterator[int]:
|
|
"""
|
|
|
|
:param ops:
|
|
:return:
|
|
"""
|
|
for op in ops:
|
|
if self.max_bytes_out and self.stream_pos >= self.max_bytes_out:
|
|
yield from self.done()
|
|
return
|
|
|
|
yield from self._emit_bytes(op)
|
|
|
|
# Keep track of where we are in TCP client socket buffer
|
|
socket_pos = self.stream_pos % 2048
|
|
if socket_pos >= 2044:
|
|
# 2 op_ack address bytes + 2 payload bytes from ACK must
|
|
# terminate 2K stream frame
|
|
if self.video_mode == video.Mode.DHGR:
|
|
# Flip-flop between MAIN and AUX banks
|
|
self.aux_memory_bank = not self.aux_memory_bank
|
|
|
|
yield from self._emit_bytes(opcodes.Ack(self.aux_memory_bank))
|
|
assert self.stream_pos % 2048 == 0, self.stream_pos % 2048
|
|
|
|
yield from self.done()
|
|
|
|
def done(self) -> Iterator[int]:
|
|
"""Terminate opcode stream.
|
|
|
|
:return:
|
|
"""
|
|
yield from self._emit_bytes(opcodes.Terminate())
|
|
|
|
# Player expects to fill 2K TCP buffer so pad it out
|
|
for _ in range(2048 - (self.stream_pos % 2048)):
|
|
yield 0x00
|