Fix imports and point to player debug symbols

transcoder/main.py

@@ -2,7 +2,7 @@
 
 import argparse
 
-from transcoder import movie
+import movie
 
 parser = argparse.ArgumentParser(
     description='Transcode videos to ][Vision format.')

transcoder/movie.py

@@ -2,7 +2,9 @@
 
 from typing import Iterable, Iterator
 
-from transcoder import video, opcodes, audio
+import audio
+import opcodes
+import video
 
 
 class Movie:

transcoder/opcodes.py

@@ -1,8 +1,10 @@
 import enum
-import numpy as np
 from typing import Iterator, Tuple
 
-from transcoder import screen, symbol_table
+import numpy as np
+
+import screen
+import symbol_table
 
 
 class CycleCounter:
@@ -159,7 +161,7 @@ def _ParseSymbolTable():
 
     opcode_data = {}
     for name, data in symbol_table.SymbolTable(
-            "audiotest/audiotest/audiotest.dbg").parse().items():
+            "player/iivision.dbg").parse().items():
         if name.startswith("\"op_"):
             op_name = name[4:-1]
             start_addr = int(data["val"], 16)

transcoder/opcodes_test.py

@@ -1,6 +1,6 @@
 import unittest
 
-from transcoder import opcodes
+import opcodes
 
 
 class TestOpcodes(unittest.TestCase):

transcoder/symbol_table_test.py

@@ -1,7 +1,7 @@
 import io
 import unittest
 
-from transcoder import symbol_table
+import symbol_table
 
 DEBUG_FILE = """
 version major=2,minor=0

transcoder/video.py

@@ -1,18 +1,19 @@
 import heapq
-import random
 import os
-import threading
 import queue
+import random
 import subprocess
-
+import threading
 from typing import List, Iterator, Tuple
 
-from PIL import Image
 # import hitherdither
 import numpy as np
 import skvideo.io
+from PIL import Image
 
-from transcoder import opcodes, screen, edit_distance
+import edit_distance
+import opcodes
+import screen
 
 
 class Video:

transcoder/video_test.py

@@ -1,6 +1,6 @@
 import unittest
 
-from transcoder import video
+import video
 
 
 class TestHammingWeight(unittest.TestCase):