adafruit-mirror/circuitpython
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

framebufferio: add "first pixel offset" and "row stride"

Browse source
This commit is contained in:
Jeff Epler 2020-08-06 14:28:10 -05:00
parent 8021f3b4cb
commit a33e48c065
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
shared-module/framebufferio/FramebufferDisplay.c
View file

@ -70,6 +70,15 @@ void common_hal_framebufferio_framebufferdisplay_construct(framebufferio_framebu
false // reverse_bytes_in_word false // reverse_bytes_in_word
); );
self->first_pixel_offset = self->framebuffer_protocol->get_first_pixel_offset
? self->framebuffer_protocol->get_first_pixel_offset(self->framebuffer)
: 0;
self->row_stride = self->framebuffer_protocol->get_row_stride
? self->framebuffer_protocol->get_row_stride(self->framebuffer)
: 0;
if (self->row_stride == 0) {
self->row_stride = self->core.width * self->core.colorspace.depth/8;
}
self->first_manual_refresh = !auto_refresh; self->first_manual_refresh = !auto_refresh;
self->native_frames_per_second = self->framebuffer_protocol->get_native_frames_per_second(self->framebuffer); self->native_frames_per_second = self->framebuffer_protocol->get_native_frames_per_second(self->framebuffer);
@ -209,11 +218,13 @@ STATIC bool _refresh_area(framebufferio_framebufferdisplay_obj_t* self, const di
uint8_t *buf = (uint8_t *)self->bufinfo.buf, *endbuf = buf + self->bufinfo.len; uint8_t *buf = (uint8_t *)self->bufinfo.buf, *endbuf = buf + self->bufinfo.len;
(void)endbuf; // Hint to compiler that endbuf is "used" even if NDEBUG (void)endbuf; // Hint to compiler that endbuf is "used" even if NDEBUG
buf += self->first_pixel_offset;
uint8_t *dest = self->bufinfo.buf + (subrectangle.y1 * self->core.width + subrectangle.x1) * self->core.colorspace.depth / 8; size_t rowstride = self->row_stride;
uint8_t *dest = buf + subrectangle.y1 * rowstride + subrectangle.x1 * self->core.colorspace.depth / 8;
uint8_t *src = (uint8_t*)buffer; uint8_t *src = (uint8_t*)buffer;
size_t rowsize = (subrectangle.x2 - subrectangle.x1) * self->core.colorspace.depth / 8; size_t rowsize = (subrectangle.x2 - subrectangle.x1) * self->core.colorspace.depth / 8;
size_t rowstride = self->core.width * self->core.colorspace.depth/8;
for (uint16_t i = subrectangle.y1; i < subrectangle.y2; i++) { for (uint16_t i = subrectangle.y1; i < subrectangle.y2; i++) {
assert(dest >= buf && dest < endbuf && dest+rowsize <= endbuf); assert(dest >= buf && dest < endbuf && dest+rowsize <= endbuf);
memcpy(dest, src, rowsize); memcpy(dest, src, rowsize);
@ -230,9 +241,9 @@ STATIC bool _refresh_area(framebufferio_framebufferdisplay_obj_t* self, const di
STATIC void _refresh_display(framebufferio_framebufferdisplay_obj_t* self) { STATIC void _refresh_display(framebufferio_framebufferdisplay_obj_t* self) {
displayio_display_core_start_refresh(&self->core); displayio_display_core_start_refresh(&self->core);
self->framebuffer_protocol->get_bufinfo(self->framebuffer, &self->bufinfo);
const displayio_area_t* current_area = _get_refresh_areas(self); const displayio_area_t* current_area = _get_refresh_areas(self);
if (current_area) { if (current_area) {
self->framebuffer_protocol->get_bufinfo(self->framebuffer, &self->bufinfo);
while (current_area != NULL) { while (current_area != NULL) {
_refresh_area(self, current_area); _refresh_area(self, current_area);
current_area = current_area->next; current_area = current_area->next;

5
shared-module/framebufferio/FramebufferDisplay.h
View file

@ -48,6 +48,7 @@ typedef struct {
uint64_t last_refresh_call; uint64_t last_refresh_call;
uint16_t native_frames_per_second; uint16_t native_frames_per_second;
uint16_t native_ms_per_frame; uint16_t native_ms_per_frame;
uint16_t first_pixel_offset, row_stride;
bool auto_refresh; bool auto_refresh;
bool first_manual_refresh; bool first_manual_refresh;
} framebufferio_framebufferdisplay_obj_t; } framebufferio_framebufferdisplay_obj_t;
@ -70,6 +71,8 @@ typedef bool (*framebuffer_set_auto_brightness_fun)(mp_obj_t, bool);
typedef bool (*framebuffer_get_auto_brightness_fun)(mp_obj_t); typedef bool (*framebuffer_get_auto_brightness_fun)(mp_obj_t);
typedef int (*framebuffer_get_width_fun)(mp_obj_t); typedef int (*framebuffer_get_width_fun)(mp_obj_t);
typedef int (*framebuffer_get_height_fun)(mp_obj_t); typedef int (*framebuffer_get_height_fun)(mp_obj_t);
typedef int (*framebuffer_get_row_stride_fun)(mp_obj_t);
typedef int (*framebuffer_get_first_pixel_offset_fun)(mp_obj_t);
typedef int (*framebuffer_get_color_depth_fun)(mp_obj_t); typedef int (*framebuffer_get_color_depth_fun)(mp_obj_t);
typedef int (*framebuffer_get_bytes_per_cell_fun)(mp_obj_t); typedef int (*framebuffer_get_bytes_per_cell_fun)(mp_obj_t);
typedef int (*framebuffer_get_native_frames_per_second_fun)(mp_obj_t); typedef int (*framebuffer_get_native_frames_per_second_fun)(mp_obj_t);
@ -86,6 +89,8 @@ typedef struct _framebuffer_p_t {
framebuffer_get_native_frames_per_second_fun get_native_frames_per_second; framebuffer_get_native_frames_per_second_fun get_native_frames_per_second;
framebuffer_get_brightness_fun get_brightness; framebuffer_get_brightness_fun get_brightness;
framebuffer_set_brightness_fun set_brightness; framebuffer_set_brightness_fun set_brightness;
framebuffer_get_row_stride_fun get_row_stride;
framebuffer_get_first_pixel_offset_fun get_first_pixel_offset;
framebuffer_get_auto_brightness_fun get_auto_brightness; framebuffer_get_auto_brightness_fun get_auto_brightness;
framebuffer_set_auto_brightness_fun set_auto_brightness; framebuffer_set_auto_brightness_fun set_auto_brightness;
} framebuffer_p_t; } framebuffer_p_t;