diff --git a/gfx/video_filters/NULL.filt b/gfx/video_filters/NULL.filt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/gfx/video_filters/NULL.filt @@ -0,0 +1 @@ + diff --git a/gfx/video_filters/dot_matrix_3x.c b/gfx/video_filters/dot_matrix_3x.c index 9605b87c39..b4d7e5972b 100644 --- a/gfx/video_filters/dot_matrix_3x.c +++ b/gfx/video_filters/dot_matrix_3x.c @@ -29,24 +29,10 @@ /* Default grid colour: pure white */ #define DOT_MATRIX_3X_DEFAULT_GRID_COLOR 0xFFFFFF -#define DOT_MATRIX_3X_WEIGHT_10_6(c10, c6) (((c10 << 3) + (c10 << 1) + (c6 << 2) + (c6 << 1)) >> 4) - typedef struct { - struct - { - uint32_t r; - uint32_t g; - uint32_t b; - } xrgb8888; - - struct - { - uint16_t r; - uint16_t g; - uint16_t b; - } rgb565; - + uint32_t xrgb8888; + uint16_t rgb565; } dot_matrix_3x_grid_color_t; struct softfilter_thread_data @@ -96,15 +82,14 @@ static void dot_matrix_3x_initialize(struct filter_data *filt, config->get_hex(userdata, "grid_color", &grid_color, DOT_MATRIX_3X_DEFAULT_GRID_COLOR); - /* Split into 5bit RGB components */ - filt->grid_color.rgb565.r = (grid_color >> 19) & 0x1F; - filt->grid_color.rgb565.g = (grid_color >> 11) & 0x1F; - filt->grid_color.rgb565.b = (grid_color >> 3) & 0x1F; + /* Raw colour is already in XRGB8888 format */ + filt->grid_color.xrgb8888 = (uint32_t)grid_color; - /* Split into 8bit RGB components */ - filt->grid_color.xrgb8888.r = (grid_color >> 16) & 0xFF; - filt->grid_color.xrgb8888.g = (grid_color >> 8) & 0xFF; - filt->grid_color.xrgb8888.b = grid_color & 0xFF; + /* Convert to RGB565 */ + filt->grid_color.rgb565 = + (((grid_color >> 19) & 0x1F) << 11) | + (((grid_color >> 11) & 0x1F) << 6) | + ((grid_color >> 3) & 0x1F); } static void *dot_matrix_3x_generic_create(const struct softfilter_config *config, @@ -161,9 +146,7 @@ static void dot_matrix_3x_work_cb_rgb565(void *data, void *thread_data) uint16_t *output = (uint16_t*)thr->out_data; uint16_t in_stride = (uint16_t)(thr->in_pitch >> 1); uint16_t out_stride = (uint16_t)(thr->out_pitch >> 1); - uint16_t base_grid_r = filt->grid_color.rgb565.r; - uint16_t base_grid_g = filt->grid_color.rgb565.g; - uint16_t base_grid_b = filt->grid_color.rgb565.b; + uint16_t base_grid_color = filt->grid_color.rgb565; uint16_t x, y; for (y = 0; y < thr->height; ++y) @@ -172,17 +155,28 @@ static void dot_matrix_3x_work_cb_rgb565(void *data, void *thread_data) for (x = 0; x < thr->width; ++x) { - uint16_t *out_line_ptr = out_ptr; - uint16_t pixel_color = *(input + x); - uint16_t pixel_r = (pixel_color >> 11 & 0x1F); - uint16_t pixel_g = (pixel_color >> 6 & 0x1F); - uint16_t pixel_b = (pixel_color & 0x1F); + uint16_t *out_line_ptr = out_ptr; + uint16_t pixel_color = *(input + x); + /* Get grid colour - * > 10:6 mix of pixel_color:base_grid_color */ - uint16_t grid_r = DOT_MATRIX_3X_WEIGHT_10_6(pixel_r, base_grid_r); - uint16_t grid_g = DOT_MATRIX_3X_WEIGHT_10_6(pixel_g, base_grid_g); - uint16_t grid_b = DOT_MATRIX_3X_WEIGHT_10_6(pixel_b, base_grid_b); - uint16_t grid_color = (grid_r << 11) | (grid_g << 6) | grid_b; + * > 10:6 mix of pixel_color:base_grid_color + * > Achieved by combining a 50:50 mix with a 75:25 mix */ + + /* 50:50 mix of pixel_color:base_grid_color + * > Round down */ + uint16_t pixel50_grid50_color = (pixel_color + base_grid_color - + ((pixel_color ^ base_grid_color) & 0x821)) >> 1; + /* 75:25 mix of pixel_color:base_grid_color + * > Round down */ + uint16_t pixel75_grid25_color = (pixel_color + pixel50_grid50_color - + ((pixel_color ^ pixel50_grid50_color) & 0x821)) >> 1; + /* 10:6 mix of pixel_color:base_grid_color + * > Round up */ + uint16_t grid_color = (pixel50_grid50_color + pixel75_grid25_color + + ((pixel50_grid50_color ^ pixel75_grid25_color) & 0x821)) >> 1; + + /* c.f "Mixing Packed RGB Pixels Efficiently" + * http://blargg.8bitalley.com/info/rgb_mixing.html */ /* - Pixel layout (p = pixel, g = grid) - * Before: After: @@ -224,9 +218,7 @@ static void dot_matrix_3x_work_cb_xrgb8888(void *data, void *thread_data) uint32_t *output = (uint32_t*)thr->out_data; uint32_t in_stride = (uint32_t)(thr->in_pitch >> 2); uint32_t out_stride = (uint32_t)(thr->out_pitch >> 2); - uint32_t base_grid_r = filt->grid_color.xrgb8888.r; - uint32_t base_grid_g = filt->grid_color.xrgb8888.g; - uint32_t base_grid_b = filt->grid_color.xrgb8888.b; + uint32_t base_grid_color = filt->grid_color.xrgb8888; uint32_t x, y; for (y = 0; y < thr->height; ++y) @@ -235,17 +227,28 @@ static void dot_matrix_3x_work_cb_xrgb8888(void *data, void *thread_data) for (x = 0; x < thr->width; ++x) { - uint32_t *out_line_ptr = out_ptr; - uint32_t pixel_color = *(input + x); - uint32_t pixel_r = (pixel_color >> 16 & 0xFF); - uint32_t pixel_g = (pixel_color >> 8 & 0xFF); - uint32_t pixel_b = (pixel_color & 0xFF); + uint32_t *out_line_ptr = out_ptr; + uint32_t pixel_color = *(input + x); + /* Get grid colour - * > 10:6 mix of pixel_color:base_grid_color */ - uint32_t grid_r = DOT_MATRIX_3X_WEIGHT_10_6(pixel_r, base_grid_r); - uint32_t grid_g = DOT_MATRIX_3X_WEIGHT_10_6(pixel_g, base_grid_g); - uint32_t grid_b = DOT_MATRIX_3X_WEIGHT_10_6(pixel_b, base_grid_b); - uint32_t grid_color = (grid_r << 16) | (grid_g << 8) | grid_b; + * > 10:6 mix of pixel_color:base_grid_color + * > Achieved by combining a 50:50 mix with a 75:25 mix */ + + /* 50:50 mix of pixel_color:base_grid_color + * > Round down */ + uint32_t pixel50_grid50_color = (pixel_color + base_grid_color - + ((pixel_color ^ base_grid_color) & 0x1010101)) >> 1; + /* 75:25 mix of pixel_color:base_grid_color + * > Round down */ + uint32_t pixel75_grid25_color = (pixel_color + pixel50_grid50_color - + ((pixel_color ^ pixel50_grid50_color) & 0x1010101)) >> 1; + /* 10:6 mix of pixel_color:base_grid_color + * > Round up */ + uint32_t grid_color = (pixel50_grid50_color + pixel75_grid25_color + + ((pixel50_grid50_color ^ pixel75_grid25_color) & 0x1010101)) >> 1; + + /* c.f "Mixing Packed RGB Pixels Efficiently" + * http://blargg.8bitalley.com/info/rgb_mixing.html */ /* - Pixel layout (p = pixel, g = grid) - * Before: After: diff --git a/gfx/video_filters/dot_matrix_4x.c b/gfx/video_filters/dot_matrix_4x.c index c386955626..803529cd9a 100644 --- a/gfx/video_filters/dot_matrix_4x.c +++ b/gfx/video_filters/dot_matrix_4x.c @@ -29,24 +29,10 @@ /* Default grid colour: pure white */ #define DOT_MATRIX_4X_DEFAULT_GRID_COLOR 0xFFFFFF -#define DOT_MATRIX_3X_WEIGHT_10_6(c10, c6) (((c10 << 3) + (c10 << 1) + (c6 << 2) + (c6 << 1)) >> 4) - typedef struct { - struct - { - uint32_t r; - uint32_t g; - uint32_t b; - } xrgb8888; - - struct - { - uint16_t r; - uint16_t g; - uint16_t b; - } rgb565; - + uint32_t xrgb8888; + uint16_t rgb565; } dot_matrix_4x_grid_color_t; struct softfilter_thread_data @@ -96,15 +82,14 @@ static void dot_matrix_4x_initialize(struct filter_data *filt, config->get_hex(userdata, "grid_color", &grid_color, DOT_MATRIX_4X_DEFAULT_GRID_COLOR); - /* Split into 5bit RGB components */ - filt->grid_color.rgb565.r = (grid_color >> 19) & 0x1F; - filt->grid_color.rgb565.g = (grid_color >> 11) & 0x1F; - filt->grid_color.rgb565.b = (grid_color >> 3) & 0x1F; + /* Raw colour is already in XRGB8888 format */ + filt->grid_color.xrgb8888 = (uint32_t)grid_color; - /* Split into 8bit RGB components */ - filt->grid_color.xrgb8888.r = (grid_color >> 16) & 0xFF; - filt->grid_color.xrgb8888.g = (grid_color >> 8) & 0xFF; - filt->grid_color.xrgb8888.b = grid_color & 0xFF; + /* Convert to RGB565 */ + filt->grid_color.rgb565 = + (((grid_color >> 19) & 0x1F) << 11) | + (((grid_color >> 11) & 0x1F) << 6) | + ((grid_color >> 3) & 0x1F); } static void *dot_matrix_4x_generic_create(const struct softfilter_config *config, @@ -161,9 +146,7 @@ static void dot_matrix_4x_work_cb_rgb565(void *data, void *thread_data) uint16_t *output = (uint16_t*)thr->out_data; uint16_t in_stride = (uint16_t)(thr->in_pitch >> 1); uint16_t out_stride = (uint16_t)(thr->out_pitch >> 1); - uint16_t base_grid_r = filt->grid_color.rgb565.r; - uint16_t base_grid_g = filt->grid_color.rgb565.g; - uint16_t base_grid_b = filt->grid_color.rgb565.b; + uint16_t base_grid_color = filt->grid_color.rgb565; uint16_t x, y; for (y = 0; y < thr->height; ++y) @@ -172,23 +155,30 @@ static void dot_matrix_4x_work_cb_rgb565(void *data, void *thread_data) for (x = 0; x < thr->width; ++x) { - uint16_t *out_line_ptr = out_ptr; - uint16_t pixel_color = *(input + x); - uint16_t pixel_r = (pixel_color >> 11 & 0x1F); - uint16_t pixel_g = (pixel_color >> 6 & 0x1F); - uint16_t pixel_b = (pixel_color & 0x1F); - /* Get shadow colour - * > 10:6 mix of pixel_color:base_grid_color */ - uint16_t shadow_r = DOT_MATRIX_3X_WEIGHT_10_6(pixel_r, base_grid_r); - uint16_t shadow_g = DOT_MATRIX_3X_WEIGHT_10_6(pixel_g, base_grid_g); - uint16_t shadow_b = DOT_MATRIX_3X_WEIGHT_10_6(pixel_b, base_grid_b); - uint16_t shadow_color = (shadow_r << 11) | (shadow_g << 6) | shadow_b; + uint16_t *out_line_ptr = out_ptr; + uint16_t pixel_color = *(input + x); + /* Get grid colour - * > 50:50 mix of pixel_color:base_grid_color */ - uint16_t grid_r = (pixel_r + base_grid_r) >> 1; - uint16_t grid_g = (pixel_g + base_grid_g) >> 1; - uint16_t grid_b = (pixel_b + base_grid_b) >> 1; - uint16_t grid_color = (grid_r << 11) | (grid_g << 6) | grid_b; + * > 50:50 mix of pixel_color:base_grid_color + * > Round up */ + uint16_t grid_color = (pixel_color + base_grid_color + + ((pixel_color ^ base_grid_color) & 0x821)) >> 1; + + /* Get shadow colour + * > 10:6 mix of pixel_color:base_grid_color + * > Achieved by combining a 50:50 mix with a 75:25 mix */ + + /* 75:25 mix of pixel_color:base_grid_color + * > Round down */ + uint16_t pixel75_grid25_color = (pixel_color + grid_color - + ((pixel_color ^ grid_color) & 0x821)) >> 1; + /* 10:6 mix of pixel_color:base_grid_color + * > Round down */ + uint16_t shadow_color = (grid_color + pixel75_grid25_color - + ((grid_color ^ pixel75_grid25_color) & 0x821)) >> 1; + + /* c.f "Mixing Packed RGB Pixels Efficiently" + * http://blargg.8bitalley.com/info/rgb_mixing.html */ /* - Pixel layout (p = pixel, s = shadow, g = grid) - * Before: After: @@ -198,32 +188,39 @@ static void dot_matrix_4x_work_cb_rgb565(void *data, void *thread_data) * (s)(s)(s)(g) */ + uint16_t row_a_color[4]; + uint16_t row_b_color[4]; + uint16_t row_c_color[4]; + + row_a_color[0] = grid_color; + row_a_color[1] = pixel_color; + row_a_color[2] = pixel_color; + row_a_color[3] = pixel_color; + + row_b_color[0] = shadow_color; + row_b_color[1] = pixel_color; + row_b_color[2] = pixel_color; + row_b_color[3] = pixel_color; + + row_c_color[0] = shadow_color; + row_c_color[1] = shadow_color; + row_c_color[2] = shadow_color; + row_c_color[3] = grid_color; + /* Row 1: (g)(p)(p)(p) */ - *out_line_ptr = grid_color; - *(out_line_ptr + 1) = pixel_color; - *(out_line_ptr + 2) = pixel_color; - *(out_line_ptr + 3) = pixel_color; - out_line_ptr += out_stride; + memcpy(out_line_ptr, row_a_color, sizeof(row_a_color)); + out_line_ptr += out_stride; /* Row 2: (s)(p)(p)(p) */ - *out_line_ptr = shadow_color; - *(out_line_ptr + 1) = pixel_color; - *(out_line_ptr + 2) = pixel_color; - *(out_line_ptr + 3) = pixel_color; - out_line_ptr += out_stride; + memcpy(out_line_ptr, row_b_color, sizeof(row_b_color)); + out_line_ptr += out_stride; /* Row 3: (s)(p)(p)(p) */ - *out_line_ptr = shadow_color; - *(out_line_ptr + 1) = pixel_color; - *(out_line_ptr + 2) = pixel_color; - *(out_line_ptr + 3) = pixel_color; - out_line_ptr += out_stride; + memcpy(out_line_ptr, row_b_color, sizeof(row_b_color)); + out_line_ptr += out_stride; /* Row 4: (s)(s)(s)(g) */ - *out_line_ptr = shadow_color; - *(out_line_ptr + 1) = shadow_color; - *(out_line_ptr + 2) = shadow_color; - *(out_line_ptr + 3) = grid_color; + memcpy(out_line_ptr, row_c_color, sizeof(row_c_color)); out_ptr += 4; } @@ -241,9 +238,7 @@ static void dot_matrix_4x_work_cb_xrgb8888(void *data, void *thread_data) uint32_t *output = (uint32_t*)thr->out_data; uint32_t in_stride = (uint32_t)(thr->in_pitch >> 2); uint32_t out_stride = (uint32_t)(thr->out_pitch >> 2); - uint32_t base_grid_r = filt->grid_color.xrgb8888.r; - uint32_t base_grid_g = filt->grid_color.xrgb8888.g; - uint32_t base_grid_b = filt->grid_color.xrgb8888.b; + uint32_t base_grid_color = filt->grid_color.xrgb8888; uint32_t x, y; for (y = 0; y < thr->height; ++y) @@ -252,23 +247,30 @@ static void dot_matrix_4x_work_cb_xrgb8888(void *data, void *thread_data) for (x = 0; x < thr->width; ++x) { - uint32_t *out_line_ptr = out_ptr; - uint32_t pixel_color = *(input + x); - uint32_t pixel_r = (pixel_color >> 16 & 0xFF); - uint32_t pixel_g = (pixel_color >> 8 & 0xFF); - uint32_t pixel_b = (pixel_color & 0xFF); - /* Get shadow colour - * > 10:6 mix of pixel_color:base_grid_color */ - uint32_t shadow_r = DOT_MATRIX_3X_WEIGHT_10_6(pixel_r, base_grid_r); - uint32_t shadow_g = DOT_MATRIX_3X_WEIGHT_10_6(pixel_g, base_grid_g); - uint32_t shadow_b = DOT_MATRIX_3X_WEIGHT_10_6(pixel_b, base_grid_b); - uint32_t shadow_color = (shadow_r << 16) | (shadow_g << 8) | shadow_b; + uint32_t *out_line_ptr = out_ptr; + uint32_t pixel_color = *(input + x); + /* Get grid colour - * > 50:50 mix of pixel_color:base_grid_color */ - uint32_t grid_r = (pixel_r + base_grid_r) >> 1; - uint32_t grid_g = (pixel_g + base_grid_g) >> 1; - uint32_t grid_b = (pixel_b + base_grid_b) >> 1; - uint32_t grid_color = (grid_r << 16) | (grid_g << 8) | grid_b; + * > 50:50 mix of pixel_color:base_grid_color + * > Round up */ + uint32_t grid_color = (pixel_color + base_grid_color + + ((pixel_color ^ base_grid_color) & 0x1010101)) >> 1; + + /* Get shadow colour + * > 10:6 mix of pixel_color:base_grid_color + * > Achieved by combining a 50:50 mix with a 75:25 mix */ + + /* 75:25 mix of pixel_color:base_grid_color + * > Round down */ + uint32_t pixel75_grid25_color = (pixel_color + grid_color - + ((pixel_color ^ grid_color) & 0x1010101)) >> 1; + /* 10:6 mix of pixel_color:base_grid_color + * > Round down */ + uint32_t shadow_color = (grid_color + pixel75_grid25_color - + ((grid_color ^ pixel75_grid25_color) & 0x1010101)) >> 1; + + /* c.f "Mixing Packed RGB Pixels Efficiently" + * http://blargg.8bitalley.com/info/rgb_mixing.html */ /* - Pixel layout (p = pixel, s = shadow, g = grid) - * Before: After: @@ -278,32 +280,39 @@ static void dot_matrix_4x_work_cb_xrgb8888(void *data, void *thread_data) * (s)(s)(s)(g) */ + uint32_t row_a_color[4]; + uint32_t row_b_color[4]; + uint32_t row_c_color[4]; + + row_a_color[0] = grid_color; + row_a_color[1] = pixel_color; + row_a_color[2] = pixel_color; + row_a_color[3] = pixel_color; + + row_b_color[0] = shadow_color; + row_b_color[1] = pixel_color; + row_b_color[2] = pixel_color; + row_b_color[3] = pixel_color; + + row_c_color[0] = shadow_color; + row_c_color[1] = shadow_color; + row_c_color[2] = shadow_color; + row_c_color[3] = grid_color; + /* Row 1: (g)(p)(p)(p) */ - *out_line_ptr = grid_color; - *(out_line_ptr + 1) = pixel_color; - *(out_line_ptr + 2) = pixel_color; - *(out_line_ptr + 3) = pixel_color; - out_line_ptr += out_stride; + memcpy(out_line_ptr, row_a_color, sizeof(row_a_color)); + out_line_ptr += out_stride; /* Row 2: (s)(p)(p)(p) */ - *out_line_ptr = shadow_color; - *(out_line_ptr + 1) = pixel_color; - *(out_line_ptr + 2) = pixel_color; - *(out_line_ptr + 3) = pixel_color; - out_line_ptr += out_stride; + memcpy(out_line_ptr, row_b_color, sizeof(row_b_color)); + out_line_ptr += out_stride; /* Row 3: (s)(p)(p)(p) */ - *out_line_ptr = shadow_color; - *(out_line_ptr + 1) = pixel_color; - *(out_line_ptr + 2) = pixel_color; - *(out_line_ptr + 3) = pixel_color; - out_line_ptr += out_stride; + memcpy(out_line_ptr, row_b_color, sizeof(row_b_color)); + out_line_ptr += out_stride; /* Row 4: (s)(s)(s)(g) */ - *out_line_ptr = shadow_color; - *(out_line_ptr + 1) = shadow_color; - *(out_line_ptr + 2) = shadow_color; - *(out_line_ptr + 3) = grid_color; + memcpy(out_line_ptr, row_c_color, sizeof(row_c_color)); out_ptr += 4; } diff --git a/gfx/video_filters/gameboy4x.c b/gfx/video_filters/gameboy4x.c index 698993179a..501f247ebf 100644 --- a/gfx/video_filters/gameboy4x.c +++ b/gfx/video_filters/gameboy4x.c @@ -239,6 +239,9 @@ static void gameboy4x_work_cb_rgb565(void *data, void *thread_data) uint16_t out_shadow_color; uint16_t out_grid_color; uint16_t lut_index; + uint16_t row_a_color[4]; + uint16_t row_b_color[4]; + uint16_t row_c_color[4]; /* Calculate mean value of the 3 RGB * colour components */ @@ -266,32 +269,35 @@ static void gameboy4x_work_cb_rgb565(void *data, void *thread_data) * (s)(s)(s)(g) */ + row_a_color[0] = out_grid_color; + row_a_color[1] = out_pixel_color; + row_a_color[2] = out_pixel_color; + row_a_color[3] = out_pixel_color; + + row_b_color[0] = out_shadow_color; + row_b_color[1] = out_pixel_color; + row_b_color[2] = out_pixel_color; + row_b_color[3] = out_pixel_color; + + row_c_color[0] = out_shadow_color; + row_c_color[1] = out_shadow_color; + row_c_color[2] = out_shadow_color; + row_c_color[3] = out_grid_color; + /* Row 1: (g)(p)(p)(p) */ - *out_line_ptr = out_grid_color; - *(out_line_ptr + 1) = out_pixel_color; - *(out_line_ptr + 2) = out_pixel_color; - *(out_line_ptr + 3) = out_pixel_color; + memcpy(out_line_ptr, row_a_color, sizeof(row_a_color)); out_line_ptr += out_stride; /* Row 2: (s)(p)(p)(p) */ - *out_line_ptr = out_shadow_color; - *(out_line_ptr + 1) = out_pixel_color; - *(out_line_ptr + 2) = out_pixel_color; - *(out_line_ptr + 3) = out_pixel_color; + memcpy(out_line_ptr, row_b_color, sizeof(row_b_color)); out_line_ptr += out_stride; /* Row 3: (s)(p)(p)(p) */ - *out_line_ptr = out_shadow_color; - *(out_line_ptr + 1) = out_pixel_color; - *(out_line_ptr + 2) = out_pixel_color; - *(out_line_ptr + 3) = out_pixel_color; + memcpy(out_line_ptr, row_b_color, sizeof(row_b_color)); out_line_ptr += out_stride; /* Row 4: (s)(s)(s)(g) */ - *out_line_ptr = out_shadow_color; - *(out_line_ptr + 1) = out_shadow_color; - *(out_line_ptr + 2) = out_shadow_color; - *(out_line_ptr + 3) = out_grid_color; + memcpy(out_line_ptr, row_c_color, sizeof(row_c_color)); out_ptr += 4; } @@ -330,6 +336,9 @@ static void gameboy4x_work_cb_xrgb8888(void *data, void *thread_data) uint32_t out_shadow_color; uint32_t out_grid_color; uint32_t lut_index; + uint32_t row_a_color[4]; + uint32_t row_b_color[4]; + uint32_t row_c_color[4]; /* Calculate mean value of the 3 RGB * colour components */ @@ -357,32 +366,35 @@ static void gameboy4x_work_cb_xrgb8888(void *data, void *thread_data) * (s)(s)(s)(g) */ + row_a_color[0] = out_grid_color; + row_a_color[1] = out_pixel_color; + row_a_color[2] = out_pixel_color; + row_a_color[3] = out_pixel_color; + + row_b_color[0] = out_shadow_color; + row_b_color[1] = out_pixel_color; + row_b_color[2] = out_pixel_color; + row_b_color[3] = out_pixel_color; + + row_c_color[0] = out_shadow_color; + row_c_color[1] = out_shadow_color; + row_c_color[2] = out_shadow_color; + row_c_color[3] = out_grid_color; + /* Row 1: (g)(p)(p)(p) */ - *out_line_ptr = out_grid_color; - *(out_line_ptr + 1) = out_pixel_color; - *(out_line_ptr + 2) = out_pixel_color; - *(out_line_ptr + 3) = out_pixel_color; + memcpy(out_line_ptr, row_a_color, sizeof(row_a_color)); out_line_ptr += out_stride; /* Row 2: (s)(p)(p)(p) */ - *out_line_ptr = out_shadow_color; - *(out_line_ptr + 1) = out_pixel_color; - *(out_line_ptr + 2) = out_pixel_color; - *(out_line_ptr + 3) = out_pixel_color; + memcpy(out_line_ptr, row_b_color, sizeof(row_b_color)); out_line_ptr += out_stride; /* Row 3: (s)(p)(p)(p) */ - *out_line_ptr = out_shadow_color; - *(out_line_ptr + 1) = out_pixel_color; - *(out_line_ptr + 2) = out_pixel_color; - *(out_line_ptr + 3) = out_pixel_color; + memcpy(out_line_ptr, row_b_color, sizeof(row_b_color)); out_line_ptr += out_stride; /* Row 4: (s)(s)(s)(g) */ - *out_line_ptr = out_shadow_color; - *(out_line_ptr + 1) = out_shadow_color; - *(out_line_ptr + 2) = out_shadow_color; - *(out_line_ptr + 3) = out_grid_color; + memcpy(out_line_ptr, row_c_color, sizeof(row_c_color)); out_ptr += 4; } diff --git a/gfx/video_filters/grid2x.c b/gfx/video_filters/grid2x.c index ac13e39d54..d065dda773 100644 --- a/gfx/video_filters/grid2x.c +++ b/gfx/video_filters/grid2x.c @@ -119,20 +119,18 @@ static void grid2x_work_cb_xrgb8888(void *data, void *thread_data) uint32_t *out_ptr = output; for (x = 0; x < thr->width; ++x) { - /* Note: We process the 'padding' bits as though they - * matter (they don't), since this deals with any potential - * byte swapping issues */ uint32_t *out_line_ptr = out_ptr; uint32_t color = *(input + x); - uint32_t p = (color >> 24 & 0xFF); /* Padding bits */ - uint32_t r = (color >> 16 & 0xFF); - uint32_t g = (color >> 8 & 0xFF); - uint32_t b = (color & 0xFF); - uint32_t scanline_color = - ((p - (p >> 2)) << 24) | - ((r - (r >> 2)) << 16) | - ((g - (g >> 2)) << 8) | - ((b - (b >> 2)) ); + + /* Scanline colour is color * 0.75 + * > First pass: 50:50 mix of color:0 */ + uint32_t scanline_color = (color + (color & 0x1010101)) >> 1; + /* > Second pass: 50:50 mix of color:(color:0) + * => Gives ((1 + 0.5) / 2) = 0.75 */ + scanline_color = (color + scanline_color + ((color ^ scanline_color) & 0x1010101)) >> 1; + + /* c.f "Mixing Packed RGB Pixels Efficiently" + * http://blargg.8bitalley.com/info/rgb_mixing.html */ /* Row 1: */ *out_line_ptr = color; @@ -167,13 +165,16 @@ static void grid2x_work_cb_rgb565(void *data, void *thread_data) { uint16_t *out_line_ptr = out_ptr; uint16_t color = *(input + x); - uint16_t r = (color >> 11 & 0x1F); - uint16_t g = (color >> 6 & 0x1F); - uint16_t b = (color & 0x1F); - uint16_t scanline_color = - ((r - (r >> 2)) << 11) | - ((g - (g >> 2)) << 6) | - ((b - (b >> 2)) ); + + /* Scanline colour is color * 0.75 + * > First pass: 50:50 mix of color:0 */ + uint16_t scanline_color = (color + (color & 0x821)) >> 1; + /* > Second pass: 50:50 mix of color:(color:0) + * => Gives ((1 + 0.5) / 2) = 0.75 */ + scanline_color = (color + scanline_color + ((color ^ scanline_color) & 0x821)) >> 1; + + /* c.f "Mixing Packed RGB Pixels Efficiently" + * http://blargg.8bitalley.com/info/rgb_mixing.html */ /* Row 1: */ *out_line_ptr = color; diff --git a/gfx/video_filters/grid3x.c b/gfx/video_filters/grid3x.c index b3d20fbd15..35246511f7 100644 --- a/gfx/video_filters/grid3x.c +++ b/gfx/video_filters/grid3x.c @@ -119,20 +119,18 @@ static void grid3x_work_cb_xrgb8888(void *data, void *thread_data) uint32_t *out_ptr = output; for (x = 0; x < thr->width; ++x) { - /* Note: We process the 'padding' bits as though they - * matter (they don't), since this deals with any potential - * byte swapping issues */ uint32_t *out_line_ptr = out_ptr; uint32_t color = *(input + x); - uint32_t p = (color >> 24 & 0xFF); /* Padding bits */ - uint32_t r = (color >> 16 & 0xFF); - uint32_t g = (color >> 8 & 0xFF); - uint32_t b = (color & 0xFF); - uint32_t scanline_color = - ((p - (p >> 2)) << 24) | - ((r - (r >> 2)) << 16) | - ((g - (g >> 2)) << 8) | - ((b - (b >> 2)) ); + + /* Scanline colour is color * 0.75 + * > First pass: 50:50 mix of color:0 */ + uint32_t scanline_color = (color + (color & 0x1010101)) >> 1; + /* > Second pass: 50:50 mix of color:(color:0) + * => Gives ((1 + 0.5) / 2) = 0.75 */ + scanline_color = (color + scanline_color + ((color ^ scanline_color) & 0x1010101)) >> 1; + + /* c.f "Mixing Packed RGB Pixels Efficiently" + * http://blargg.8bitalley.com/info/rgb_mixing.html */ /* Row 1: */ *out_line_ptr = color; @@ -175,13 +173,16 @@ static void grid3x_work_cb_rgb565(void *data, void *thread_data) { uint16_t *out_line_ptr = out_ptr; uint16_t color = *(input + x); - uint16_t r = (color >> 11 & 0x1F); - uint16_t g = (color >> 6 & 0x1F); - uint16_t b = (color & 0x1F); - uint16_t scanline_color = - ((r - (r >> 2)) << 11) | - ((g - (g >> 2)) << 6) | - ((b - (b >> 2)) ); + + /* Scanline colour is color * 0.75 + * > First pass: 50:50 mix of color:0 */ + uint16_t scanline_color = (color + (color & 0x821)) >> 1; + /* > Second pass: 50:50 mix of color:(color:0) + * => Gives ((1 + 0.5) / 2) = 0.75 */ + scanline_color = (color + scanline_color + ((color ^ scanline_color) & 0x821)) >> 1; + + /* c.f "Mixing Packed RGB Pixels Efficiently" + * http://blargg.8bitalley.com/info/rgb_mixing.html */ /* Row 1: */ *out_line_ptr = color; diff --git a/gfx/video_filters/normal2x.c b/gfx/video_filters/normal2x.c index 6270346d72..e6f3f77b8a 100644 --- a/gfx/video_filters/normal2x.c +++ b/gfx/video_filters/normal2x.c @@ -121,15 +121,17 @@ static void normal2x_work_cb_xrgb8888(void *data, void *thread_data) { uint32_t *out_line_ptr = out_ptr; uint32_t color = *(input + x); + uint32_t row_color[2]; + + row_color[0] = color; + row_color[1] = color; /* Row 1 */ - *out_line_ptr = color; - *(out_line_ptr + 1) = color; - out_line_ptr += out_stride; + memcpy(out_line_ptr, row_color, sizeof(row_color)); + out_line_ptr += out_stride; /* Row 2 */ - *out_line_ptr = color; - *(out_line_ptr + 1) = color; + memcpy(out_line_ptr, row_color, sizeof(row_color)); out_ptr += 2; } @@ -155,15 +157,17 @@ static void normal2x_work_cb_rgb565(void *data, void *thread_data) { uint16_t *out_line_ptr = out_ptr; uint16_t color = *(input + x); + uint16_t row_color[2]; + + row_color[0] = color; + row_color[1] = color; /* Row 1 */ - *out_line_ptr = color; - *(out_line_ptr + 1) = color; - out_line_ptr += out_stride; + memcpy(out_line_ptr, row_color, sizeof(row_color)); + out_line_ptr += out_stride; /* Row 2 */ - *out_line_ptr = color; - *(out_line_ptr + 1) = color; + memcpy(out_line_ptr, row_color, sizeof(row_color)); out_ptr += 2; } diff --git a/gfx/video_filters/scanline2x.c b/gfx/video_filters/scanline2x.c index ad6e7cf7a7..675ec68f12 100644 --- a/gfx/video_filters/scanline2x.c +++ b/gfx/video_filters/scanline2x.c @@ -119,20 +119,18 @@ static void scanline2x_work_cb_xrgb8888(void *data, void *thread_data) uint32_t *out_ptr = output; for (x = 0; x < thr->width; ++x) { - /* Note: We process the 'padding' bits as though they - * matter (they don't), since this deals with any potential - * byte swapping issues */ uint32_t *out_line_ptr = out_ptr; uint32_t color = *(input + x); - uint32_t p = (color >> 24 & 0xFF); /* Padding bits */ - uint32_t r = (color >> 16 & 0xFF); - uint32_t g = (color >> 8 & 0xFF); - uint32_t b = (color & 0xFF); - uint32_t scanline_color = - ((p - (p >> 2)) << 24) | - ((r - (r >> 2)) << 16) | - ((g - (g >> 2)) << 8) | - ((b - (b >> 2)) ); + + /* Scanline colour is color * 0.75 + * > First pass: 50:50 mix of color:0 */ + uint32_t scanline_color = (color + (color & 0x1010101)) >> 1; + /* > Second pass: 50:50 mix of color:(color:0) + * => Gives ((1 + 0.5) / 2) = 0.75 */ + scanline_color = (color + scanline_color + ((color ^ scanline_color) & 0x1010101)) >> 1; + + /* c.f "Mixing Packed RGB Pixels Efficiently" + * http://blargg.8bitalley.com/info/rgb_mixing.html */ /* Row 1: Colour */ *out_line_ptr = color; @@ -167,13 +165,16 @@ static void scanline2x_work_cb_rgb565(void *data, void *thread_data) { uint16_t *out_line_ptr = out_ptr; uint16_t color = *(input + x); - uint16_t r = (color >> 11 & 0x1F); - uint16_t g = (color >> 6 & 0x1F); - uint16_t b = (color & 0x1F); - uint16_t scanline_color = - ((r - (r >> 2)) << 11) | - ((g - (g >> 2)) << 6) | - ((b - (b >> 2)) ); + + /* Scanline colour is color * 0.75 + * > First pass: 50:50 mix of color:0 */ + uint16_t scanline_color = (color + (color & 0x821)) >> 1; + /* > Second pass: 50:50 mix of color:(color:0) + * => Gives ((1 + 0.5) / 2) = 0.75 */ + scanline_color = (color + scanline_color + ((color ^ scanline_color) & 0x821)) >> 1; + + /* c.f "Mixing Packed RGB Pixels Efficiently" + * http://blargg.8bitalley.com/info/rgb_mixing.html */ /* Row 1: Colour */ *out_line_ptr = color;