ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(task_image.c )Cleanups

This commit is contained in:
twinaphex 2016-05-13 15:18:40 +02:00
parent acbc9116e3
commit 42adb48d9c
1 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
tasks/task_image.c
View File

@ -61,23 +61,24 @@ static int cb_image_menu_upload_generic(void *data, size_t len)
{ {
unsigned r_shift, g_shift, b_shift, a_shift; unsigned r_shift, g_shift, b_shift, a_shift;
nbio_handle_t *nbio = (nbio_handle_t*)data; nbio_handle_t *nbio = (nbio_handle_t*)data;
nbio_image_handle_t *image = nbio ? (nbio_image_handle_t*)nbio->image : NULL;
if (!nbio) if (!nbio || !image)
return -1; return -1;
if (nbio->image->processing_final_state == IMAGE_PROCESS_ERROR || if (image->processing_final_state == IMAGE_PROCESS_ERROR ||
nbio->image->processing_final_state == IMAGE_PROCESS_ERROR_END) image->processing_final_state == IMAGE_PROCESS_ERROR_END)
return -1; return -1;
video_texture_image_set_color_shifts(&r_shift, &g_shift, &b_shift, video_texture_image_set_color_shifts(&r_shift, &g_shift, &b_shift,
&a_shift); &a_shift);
video_texture_image_color_convert(r_shift, g_shift, b_shift, video_texture_image_color_convert(r_shift, g_shift, b_shift,
a_shift, &nbio->image->ti); a_shift, &image->ti);
nbio->image->is_blocking_on_processing = false; image->is_blocking_on_processing = false;
nbio->image->is_blocking = true; image->is_blocking = true;
nbio->image->is_finished = true; image->is_finished = true;
nbio->is_finished = true; nbio->is_finished = true;
return 0; return 0;
@ -85,10 +86,12 @@ static int cb_image_menu_upload_generic(void *data, size_t len)
static int task_image_iterate_transfer_parse(nbio_handle_t *nbio) static int task_image_iterate_transfer_parse(nbio_handle_t *nbio)
{ {
if (nbio->image->handle && nbio->image->cb) nbio_image_handle_t *image = (nbio_image_handle_t*)nbio->image;
if (image->handle && image->cb)
{ {
size_t len = 0; size_t len = 0;
nbio->image->cb(nbio, len); image->cb(nbio, len);
} }
return 0; return 0;
@ -113,16 +116,17 @@ static int task_image_process(
unsigned *width, unsigned *width,
unsigned *height) unsigned *height)
{ {
nbio_image_handle_t *image = (nbio_image_handle_t*)nbio->image;
int retval = image_transfer_process( int retval = image_transfer_process(
nbio->image->handle, image->handle,
nbio->image_type, nbio->image_type,
&nbio->image->ti.pixels, nbio->image->size, width, height); &image->ti.pixels, image->size, width, height);
if (retval == IMAGE_PROCESS_ERROR) if (retval == IMAGE_PROCESS_ERROR)
return IMAGE_PROCESS_ERROR; return IMAGE_PROCESS_ERROR;
nbio->image->ti.width = *width; image->ti.width = *width;
nbio->image->ti.height = *height; image->ti.height = *height;
return retval; return retval;
} }
@ -130,7 +134,8 @@ static int task_image_process(
static int cb_image_menu_generic(nbio_handle_t *nbio) static int cb_image_menu_generic(nbio_handle_t *nbio)
{ {
unsigned width = 0, height = 0; unsigned width = 0, height = 0;
if (!nbio) nbio_image_handle_t *image = nbio ? (nbio_image_handle_t*)nbio->image : NULL;
if (!nbio || !image)
return -1; return -1;
switch (task_image_process(nbio, switch (task_image_process(nbio,
@ -143,8 +148,8 @@ static int cb_image_menu_generic(nbio_handle_t *nbio)
break; break;
} }
nbio->image->is_blocking_on_processing = true; image->is_blocking_on_processing = true;
nbio->image->is_finished = false; image->is_finished = false;
return 0; return 0;
} }
@ -152,11 +157,12 @@ static int cb_image_menu_generic(nbio_handle_t *nbio)
static int cb_image_menu_thumbnail(void *data, size_t len) static int cb_image_menu_thumbnail(void *data, size_t len)
{ {
nbio_handle_t *nbio = (nbio_handle_t*)data; nbio_handle_t *nbio = (nbio_handle_t*)data;
nbio_image_handle_t *image = nbio ? (nbio_image_handle_t*)nbio->image : NULL;
if (cb_image_menu_generic(nbio) != 0) if (cb_image_menu_generic(nbio) != 0)
return -1; return -1;
nbio->image->cb = &cb_image_menu_upload_generic; image->cb = &cb_image_menu_upload_generic;
return 0; return 0;
} }
@ -165,11 +171,12 @@ static int task_image_iterate_process_transfer(nbio_handle_t *nbio)
{ {
unsigned i, width = 0, height = 0; unsigned i, width = 0, height = 0;
int retval = 0; int retval = 0;
nbio_image_handle_t *image = nbio ? (nbio_image_handle_t*)nbio->image : NULL;
if (!nbio) if (!nbio)
return -1; return -1;
for (i = 0; i < nbio->image->processing_pos_increment; i++) for (i = 0; i < image->processing_pos_increment; i++)
{ {
retval = task_image_process(nbio, retval = task_image_process(nbio,
&width, &height); &width, &height);
@ -180,23 +187,24 @@ static int task_image_iterate_process_transfer(nbio_handle_t *nbio)
if (retval == IMAGE_PROCESS_NEXT) if (retval == IMAGE_PROCESS_NEXT)
return 0; return 0;
nbio->image->processing_final_state = retval; image->processing_final_state = retval;
return -1; return -1;
} }
static int task_image_iterate_transfer(nbio_handle_t *nbio) static int task_image_iterate_transfer(nbio_handle_t *nbio)
{ {
unsigned i; unsigned i;
nbio_image_handle_t *image = nbio ? (nbio_image_handle_t*)nbio->image : NULL;
if (!nbio) if (!nbio || !image)
goto error; goto error;
if (nbio->image->is_finished) if (image->is_finished)
return 0; return 0;
for (i = 0; i < nbio->image->pos_increment; i++) for (i = 0; i < image->pos_increment; i++)
{ {
if (!image_transfer_iterate(nbio->image->handle, nbio->image_type)) if (!image_transfer_iterate(image->handle, nbio->image_type))
goto error; goto error;
} }
@ -225,8 +233,9 @@ static void rarch_task_image_load_free_internal(nbio_handle_t *nbio)
static int cb_nbio_generic(nbio_handle_t *nbio, size_t *len) static int cb_nbio_generic(nbio_handle_t *nbio, size_t *len)
{ {
void *ptr = NULL; void *ptr = NULL;
nbio_image_handle_t *image = nbio ? nbio->image : NULL;
if (!nbio->image->handle) if (!image || !image->handle)
goto error; goto error;
ptr = nbio_get_ptr(nbio->handle, len); ptr = nbio_get_ptr(nbio->handle, len);
@ -234,17 +243,17 @@ static int cb_nbio_generic(nbio_handle_t *nbio, size_t *len)
if (!ptr) if (!ptr)
goto error; goto error;
image_transfer_set_buffer_ptr(nbio->image->handle, nbio->image_type, ptr); image_transfer_set_buffer_ptr(image->handle, nbio->image_type, ptr);
nbio->image->size = *len; image->size = *len;
nbio->image->pos_increment = (*len / 2) ? (*len / 2) : 1; image->pos_increment = (*len / 2) ? (*len / 2) : 1;
nbio->image->processing_pos_increment = (*len / 4) ? (*len / 4) : 1; image->processing_pos_increment = (*len / 4) ? (*len / 4) : 1;
if (!image_transfer_start(nbio->image->handle, nbio->image_type)) if (!image_transfer_start(image->handle, nbio->image_type))
goto error; goto error;
nbio->image->is_blocking = false; image->is_blocking = false;
nbio->image->is_finished = false; image->is_finished = false;
nbio->is_finished = true; nbio->is_finished = true;
return 0; return 0;
@ -257,22 +266,23 @@ error:
static int cb_nbio_image_menu_thumbnail(void *data, size_t len) static int cb_nbio_image_menu_thumbnail(void *data, size_t len)
{ {
nbio_handle_t *nbio = (nbio_handle_t*)data; nbio_handle_t *nbio = (nbio_handle_t*)data;
nbio_image_handle_t *image = nbio ? nbio->image : NULL;
if (!nbio || !data) if (!nbio || !data || !image)
return -1; return -1;
nbio->image->handle = image_transfer_new(nbio->image_type); image->handle = image_transfer_new(nbio->image_type);
nbio->image->size = len; image->size = len;
if (!nbio->image->handle) if (!image->handle)
goto error; goto error;
nbio->image->cb = &cb_image_menu_thumbnail; image->cb = &cb_image_menu_thumbnail;
return cb_nbio_generic(nbio, &len); return cb_nbio_generic(nbio, &len);
error: error:
nbio->image->handle = 0; image->handle = 0;
return -1; return -1;
} }