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

Fixed

Browse Source
This commit is contained in:
kris 2021-02-05 00:08:14 +00:00
parent f4cc7dac40
commit 049c334950
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dither.pyx
View File

@ -4,8 +4,7 @@
cimport cython cimport cython
import functools import functools
import numpy as np import numpy as np
cimport numpy as np # cimport numpy as np
# from cython.parallel import prange
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
@ -58,19 +57,19 @@ cdef int dither_bounds_yb(Dither *dither, int y_res, int y) nogil:
@cython.wraparound(False) @cython.wraparound(False)
@functools.lru_cache(None) @functools.lru_cache(None)
def lookahead_options(screen, lookahead, last_pixel_4bit, x): def lookahead_options(screen, lookahead, last_pixel_4bit, x):
options_4bit = np.empty([2 ** lookahead, lookahead], dtype=np.uint8) options_4bit = np.empty((2 ** lookahead, lookahead), dtype=np.uint8)
options_rgb = np.empty([2 ** lookahead, lookahead, 3], dtype=np.float) options_rgb = np.empty((2 ** lookahead, lookahead, 3), dtype=np.float32)
for i in range(2 ** lookahead): for i in range(2 ** lookahead):
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, palette_choices_rgb = \ palette_choices_4bit, palette_choices_rgb = \
screen.pixel_palette_options(output_pixel_4bit, xx) screen.pixel_palette_options(output_pixel_4bit, xx)
# output_pixel_4bit = palette_choices_4bit[(i & (1 << j)) >> j] output_pixel_4bit = palette_choices_4bit[(i & (1 << j)) >> j]
# output_pixel_rgb = np.array( output_pixel_rgb = np.array(
# palette_choices_rgb[(i & (1 << j)) >> j]) palette_choices_rgb[(i & (1 << j)) >> j])
options_4bit[i, j] = palette_choices_4bit[(i & (1 << j)) >> j] # output_pixel_4bit options_4bit[i, j] = output_pixel_4bit
options_rgb[i, j, :] = palette_choices_rgb[(i & (1 << j)) >> j] #output_pixel_rgb options_rgb[i, j, :] = output_pixel_rgb
return options_nbit, options_rgb return options_nbit, options_rgb
@ -78,8 +77,8 @@ def lookahead_options(screen, lookahead, last_pixel_4bit, x):
@cython.boundscheck(False) @cython.boundscheck(False)
@cython.wraparound(False) @cython.wraparound(False)
cdef int dither_lookahead(Dither* dither, cdef int dither_lookahead(Dither* dither,
Image* image_rgb, int x, int y, np.ndarray[np.uint8_t, ndim=2] options_4bit, Image* image_rgb, int x, int y, unsigned char[:, ::1] options_4bit,
np.ndarray[np.float_t, ndim=3] options_rgb, int lookahead, unsigned char[:, ::1] distances, int x_res): float[:, :, ::1] options_rgb, int lookahead, unsigned char[:, ::1] distances, int x_res):
cdef int xl = dither_bounds_xl(dither, x) cdef int xl = dither_bounds_xl(dither, x)
cdef int xr = dither_bounds_xr(dither, x_res, x) cdef int xr = dither_bounds_xr(dither, x_res, x)
@ -116,7 +115,7 @@ cdef int dither_lookahead(Dither* dither,
# the total error # the total error
for k in range(3): for k in range(3):
quant_error[k] = lah_image_rgb[i * lah_shape1 * lah_shape2 + j * lah_shape2 + k] - options_rgb[i, j, k] quant_error[k] = lah_image_rgb[i * lah_shape1 * lah_shape2 + j * lah_shape2 + k] - options_rgb[i, j, k]
apply_one_line(dither, xl, xr, j, &lah_image_rgb[j * lah_shape1 * lah_shape2], lah_shape2, quant_error) apply_one_line(dither, xl, xr, j, &lah_image_rgb[i * lah_shape1 * lah_shape2], lah_shape2, quant_error)
cdef unsigned char bit4 cdef unsigned char bit4
cdef int best cdef int best
@ -129,9 +128,9 @@ cdef int dither_lookahead(Dither* dither,
total_error = 0 total_error = 0
for j in range(lookahead): for j in range(lookahead):
# Clip lah_image_rgb into 0..255 range to prepare for computing colour distance # Clip lah_image_rgb into 0..255 range to prepare for computing colour distance
r = <long>clip(lah_image_rgb[i * lah_shape1 * lah_shape2 + j * lah_shape2 + 0], 0, 255) r = <long>lah_image_rgb[i * lah_shape1 * lah_shape2 + j * lah_shape2 + 0]
g = <long>clip(lah_image_rgb[i * lah_shape1 * lah_shape2 + j * lah_shape2 + 1], 0, 255) g = <long>lah_image_rgb[i * lah_shape1 * lah_shape2 + j * lah_shape2 + 1]
b = <long>clip(lah_image_rgb[i * lah_shape1 * lah_shape2 + j * lah_shape2 + 2], 0, 255) b = <long>lah_image_rgb[i * lah_shape1 * lah_shape2 + j * lah_shape2 + 2]
flat = (r << 16) + (g << 8) + b flat = (r << 16) + (g << 8) + b
bit4 = options_nbit[i, j] bit4 = options_nbit[i, j]
@ -156,7 +155,7 @@ cdef void apply_one_line(Dither* dither, int xl, int xr, int x, float[] image, i
image[i * image_shape1 + j] = clip(image[i * image_shape1 + j] + error, 0, 255) image[i * image_shape1 + j] = clip(image[i * image_shape1 + j] + error, 0, 255)
cdef apply(Dither* dither, int x_res, int y_res, int x, int y, Image* image, float[] quant_error): cdef void apply(Dither* dither, int x_res, int y_res, int x, int y, Image* image, float[] quant_error):
cdef int i, j, k cdef int i, j, k
cdef int yt = dither_bounds_yt(dither, y) cdef int yt = dither_bounds_yt(dither, y)