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

Get --resolution=140 working again

Browse Source 
Back out the pixel_palette_options WIP to make this mergable
This commit is contained in:
kris 2021-03-15 15:41:33 +00:00
parent fcf83aaf9c
commit 551be3eba7
2 changed files with 37 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
dither.pyx
View File

@ -4,7 +4,6 @@
cimport cython cimport cython
import functools import functools
import numpy as np import numpy as np
cimport numpy as np
from cython.view cimport array as cvarray from cython.view cimport array as cvarray
from libc.stdlib cimport malloc, free from libc.stdlib cimport malloc, free
@ -22,7 +21,6 @@ cdef float clip(float a, float min_value, float max_value) nogil:
return min(max(a, min_value), max_value) return min(max(a, min_value), max_value)
cdef int dither_bounds_xl(Dither *dither, int x) nogil: cdef int dither_bounds_xl(Dither *dither, int x) nogil:
cdef int el = max(dither.x_origin - x, 0) cdef int el = max(dither.x_origin - x, 0)
cdef int xl = x - dither.x_origin + el cdef int xl = x - dither.x_origin + el
@ -47,35 +45,14 @@ cdef int dither_bounds_yb(Dither *dither, int y_res, int y) nogil:
return yb return yb
# TODO: port screen.py to pyx
cdef unsigned char[::1] pixel_palette_options(object palette, int last_pixel_4bit, int x):
# The two available colours for position x are given by the 4-bit
# value of position x-1, and the 4-bit value produced by toggling the
# value of the x % 4 bit (the current value of NTSC phase)
last_dots = palette.DOTS[last_pixel_4bit]
other_dots = list(last_dots)
other_dots[x % 4] = not other_dots[x % 4]
other_dots = tuple(other_dots)
other_pixel_4bit = palette.DOTS_TO_4BIT[other_dots]
cdef unsigned char res[2]
res[0] = last_pixel_4bit
res[1] = other_pixel_4bit
return res
@cython.boundscheck(False) @cython.boundscheck(False)
@cython.wraparound(False) @cython.wraparound(False)
@functools.lru_cache(None) @functools.lru_cache(None)
def lookahead_options(object screen, int lookahead, unsigned char last_pixel_4bit, int x): def lookahead_options(object screen, int lookahead, unsigned char last_pixel_nbit, int x):
cdef unsigned char[:, ::1] options_4bit = np.empty((2 ** lookahead, lookahead), dtype=np.uint8) cdef unsigned char[:, ::1] options_nbit = np.empty((2 ** lookahead, lookahead), dtype=np.uint8)
# cdef float[:, :, ::1] options_rgb = np.empty((2 ** lookahead, lookahead, 3), dtype=np.float32)
cdef int i, j, xx, p cdef int i, j, xx, p
cdef unsigned char output_pixel_4bit cdef unsigned char output_pixel_nbit
#cdef unsigned char[::1] output_pixel_rgb cdef unsigned char[::1] palette_choices_nbit
cdef unsigned char[::1] palette_choices_4bit
cdef unsigned char[:, ::1] palette_choices_rgb cdef unsigned char[:, ::1] palette_choices_rgb
cdef object palette = screen.palette cdef object palette = screen.palette
@ -84,22 +61,19 @@ def lookahead_options(object screen, int lookahead, unsigned char last_pixel_4bi
output_pixel_nbit = last_pixel_nbit output_pixel_nbit = last_pixel_nbit
for j in range(lookahead): for j in range(lookahead):
xx = x + j xx = x + j
palette_choices_4bit = pixel_palette_options(palette, output_pixel_4bit, xx) # TODO: port screen.py to pyx
output_pixel_4bit = palette_choices_4bit[(i & (1 << j)) >> j] palette_choices_nbit, _ = screen.pixel_palette_options(output_pixel_nbit, xx)
#output_pixel_rgb = palette_rgb[output_pixel_4bit] output_pixel_nbit = palette_choices_nbit[(i & (1 << j)) >> j]
options_4bit[i, j] = output_pixel_4bit options_nbit[i, j] = output_pixel_nbit
#for k in range(3):
# options_rgb[i, j, k] = <float>output_pixel_rgb[k]
return options_4bit # , options_rgb return options_nbit
@cython.boundscheck(False) @cython.boundscheck(False)
@cython.wraparound(False) @cython.wraparound(False)
cdef int dither_lookahead(Dither* dither, float[:, ::1] palette_rgb, cdef int dither_lookahead(Dither* dither, float[:, ::1] palette_rgb,
float[:, :, ::1] image_rgb, int x, int y, unsigned char[:, ::1] options_4bit, float[:, :, ::1] image_rgb, int x, int y, unsigned char[:, ::1] options_nbit, int lookahead,
# float[:, :, ::1] options_rgb, unsigned char[:, ::1] distances, int x_res):
int lookahead, unsigned char[:, ::1] distances, int x_res):
cdef int i, j, k, l cdef int i, j, k, l
# Don't bother dithering past the lookahead horizon or edge of screen. # Don't bother dithering past the lookahead horizon or edge of screen.
@ -132,7 +106,7 @@ cdef int dither_lookahead(Dither* dither, float[:, ::1] palette_rgb,
# options_rgb choices are fixed, but we can still distribute quantization error # options_rgb choices are fixed, but we can still distribute quantization error
# from having made these choices, in order to compute the total error. # from having made these choices, in order to compute the total error.
for k in range(3): for k in range(3):
quant_error[k] = lah_image_rgb[j * lah_shape2 + k] - palette_rgb[options_4bit[i,j], k] quant_error[k] = lah_image_rgb[j * lah_shape2 + k] - palette_rgb[options_nbit[i,j], k]
apply_one_line(dither, xl, xr, j, lah_image_rgb, lah_shape2, quant_error) apply_one_line(dither, xl, xr, j, lah_image_rgb, lah_shape2, quant_error)
r = <long>lah_image_rgb[j * lah_shape2 + 0] r = <long>lah_image_rgb[j * lah_shape2 + 0]
@ -153,7 +127,8 @@ cdef int dither_lookahead(Dither* dither, float[:, ::1] palette_rgb,
return best return best
cdef void apply_one_line(Dither* dither, int xl, int xr, int x, float[] image, int image_shape1, float[] quant_error) nogil: cdef void apply_one_line(Dither* dither, int xl, int xr, int x, float[] image, int image_shape1,
float[] quant_error) nogil:
cdef int i, j cdef int i, j
cdef float error cdef float error
@ -187,13 +162,14 @@ cdef void apply(Dither* dither, int x_res, int y_res, int x, int y, float[:,:,::
@cython.boundscheck(False) @cython.boundscheck(False)
@cython.wraparound(False) @cython.wraparound(False)
def find_nearest_colour(float[::1] pixel_rgb, unsigned char[::1] options_4bit, unsigned char[:, ::1] options_rgb, unsigned char[:, ::1] distances): cdef unsigned char find_nearest_colour(float[::1] pixel_rgb, unsigned char[::1] options_nbit,
unsigned char[:, ::1] options_rgb, unsigned char[:, ::1] distances):
cdef int best, dist cdef int best, dist
cdef unsigned char bit4 cdef unsigned char bit4
cdef int best_dist = 2**8 cdef int best_dist = 2**8
cdef long flat cdef long flat
for i in range(options_4bit.shape[0]): for i in range(options_nbit.shape[0]):
flat = (<long>pixel_rgb[0] << 16) + (<long>pixel_rgb[1] << 8) + <long>pixel_rgb[2] flat = (<long>pixel_rgb[0] << 16) + (<long>pixel_rgb[1] << 8) + <long>pixel_rgb[2]
bit4 = options_nbit[i] bit4 = options_nbit[i]
dist = distances[flat, bit4] dist = distances[flat, bit4]
@ -201,7 +177,7 @@ def find_nearest_colour(float[::1] pixel_rgb, unsigned char[::1] options_4bit, u
best_dist = dist best_dist = dist
best = i best = i
return options_nbit[best], options_rgb[best, :] return options_nbit[best]
@cython.boundscheck(False) @cython.boundscheck(False)
@ -216,11 +192,12 @@ def dither_image(screen, float[:, :, ::1] image_rgb, dither, int lookahead, unsi
cdef int y, x, i cdef int y, x, i
cdef float[3] input_pixel_rgb cdef float[3] input_pixel_rgb
cdef float[3] quant_error cdef float[3] quant_error
cdef (unsigned char)[:, ::1] options_nbit cdef unsigned char [:, ::1] options_nbit
cdef float[:, :, ::1] options_rgb cdef float[:, :, ::1] options_rgb
cdef unsigned char [:, ::1] palette_choices_4bit cdef unsigned char [:, ::1] lookahead_palette_choices_nbit
cdef float[:, :, ::1] palette_choices_rgb cdef unsigned char [::1] palette_choices_nbit
cdef unsigned char output_pixel_4bit cdef unsigned char [:, ::1] palette_choices_rgb
cdef unsigned char output_pixel_nbit
cdef float[::1] output_pixel_rgb cdef float[::1] output_pixel_rgb
# Flatten python dither pattern array for more efficient access # Flatten python dither pattern array for more efficient access
@ -251,21 +228,22 @@ def dither_image(screen, float[:, :, ::1] image_rgb, dither, int lookahead, unsi
for i in range(3): for i in range(3):
input_pixel_rgb[i] = image_rgb[y,x,i] input_pixel_rgb[i] = image_rgb[y,x,i]
if lookahead: if lookahead:
palette_choices_4bit = lookahead_options(screen, lookahead, output_pixel_4bit, x % 4) lookahead_palette_choices_nbit = lookahead_options(screen, lookahead, output_pixel_nbit, x % 4)
best_idx = dither_lookahead( best_idx = dither_lookahead(
&cdither, palette_rgb, image_rgb, x, y, palette_choices_4bit, lookahead, distances, xres) &cdither, palette_rgb, image_rgb, x, y, lookahead_palette_choices_nbit, lookahead, distances,
output_pixel_4bit = palette_choices_4bit[best_idx, 0] xres)
output_pixel_rgb = palette_rgb[output_pixel_4bit] output_pixel_nbit = lookahead_palette_choices_nbit[best_idx, 0]
#else: else:
# palette_choices_4bit, palette_choices_rgb = screen.pixel_palette_options(output_pixel_4bit, x) palette_choices_nbit, palette_choices_rgb = screen.pixel_palette_options(output_pixel_nbit, x)
# output_pixel_4bit, output_pixel_rgb = \ output_pixel_nbit = find_nearest_colour(
# find_nearest_colour(input_pixel_rgb, palette_choices_4bit, palette_choices_rgb, distances) input_pixel_rgb, palette_choices_nbit, palette_choices_rgb, distances)
output_pixel_rgb = palette_rgb[output_pixel_nbit]
for i in range(3): for i in range(3):
quant_error[i] = input_pixel_rgb[i] - output_pixel_rgb[i] quant_error[i] = input_pixel_rgb[i] - output_pixel_rgb[i]
image_4bit[y, x] = output_pixel_4bit image_nbit[y, x] = output_pixel_nbit
apply(&cdither, xres, yres, x, y, image_rgb, quant_error) apply(&cdither, xres, yres, x, y, image_rgb, quant_error)
for i in range(3): for i in range(3):
image_rgb[y, x, i] = output_pixel_rgb[i] image_rgb[y, x, i] = output_pixel_rgb[i]
free(cdither.pattern) free(cdither.pattern)
return image_4bit, np.array(image_rgb) return image_nbit, np.array(image_rgb)

13
setup.py
View File

@ -1,16 +1,9 @@
from setuptools import setup, Extension from setuptools import setup
from Cython.Build import cythonize from Cython.Build import cythonize
import numpy
import Cython.Compiler.Options import Cython.Compiler.Options
Cython.Compiler.Options.annotate = True Cython.Compiler.Options.annotate = True
extensions = [
Extension("dither", ["dither.pyx"], include_dirs=[numpy.get_include()])
]
setup( setup(
name='dither', ext_modules=cythonize(["dither.pyx"], annotate=True)
ext_modules=cythonize(extensions), )
script_args = ["build_ext", "--inplace"]
)