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

task_image.c - Refactors to prepare it for JPEG support

This commit is contained in:
twinaphex 2016-05-11 04:10:42 +02:00
parent e6969f7ced
commit 5ad45ea17f
2 changed files with 74 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
tasks/task_image.c
View File

@ -102,15 +102,22 @@ static int rarch_main_data_image_process(
unsigned *height, unsigned *height,
int *retval) int *retval)
{ {
switch (nbio->image_type)
{
case IMAGE_TYPE_PNG:
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
if (!rpng_is_valid((rpng_t*)nbio->image.handle)) if (!rpng_is_valid((rpng_t*)nbio->image.handle))
return IMAGE_PROCESS_ERROR; return IMAGE_PROCESS_ERROR;
*retval = rpng_nbio_load_image_argb_process( *retval = rpng_nbio_load_image_argb_process(
(rpng_t*)nbio->image.handle, (rpng_t*)nbio->image.handle,
&nbio->image.ti.pixels, &nbio->image.ti.pixels,
width, height); width, height);
#endif #endif
break;
case IMAGE_TYPE_JPEG:
break;
}
nbio->image.ti.width = *width; nbio->image.ti.width = *width;
nbio->image.ti.height = *height; nbio->image.ti.height = *height;
@ -166,11 +173,17 @@ static int rarch_main_data_image_iterate_transfer(nbio_handle_t *nbio)
for (i = 0; i < nbio->image.pos_increment; i++) for (i = 0; i < nbio->image.pos_increment; i++)
{ {
switch (nbio->image_type)
{
case IMAGE_TYPE_PNG:
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
/* TODO/FIXME - add JPEG equivalents as well */ if (!rpng_nbio_load_image_argb_iterate((rpng_t*)nbio->image.handle))
if (!rpng_nbio_load_image_argb_iterate((rpng_t*)nbio->image.handle)) goto error;
goto error;
#endif #endif
break;
case IMAGE_TYPE_JPEG:
break;
}
} }
nbio->image.frame_count++; nbio->image.frame_count++;
@ -207,10 +220,16 @@ static void rarch_task_image_load_free_internal(nbio_handle_t *nbio)
{ {
nbio_image_handle_t *image = nbio ? &nbio->image : NULL; nbio_image_handle_t *image = nbio ? &nbio->image : NULL;
switch (nbio->image_type)
{
case IMAGE_TYPE_PNG:
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
/* TODO/FIXME - add JPEG equivalents as well */ rpng_nbio_load_image_free((rpng_t*)image->handle);
rpng_nbio_load_image_free((rpng_t*)image->handle);
#endif #endif
break;
case IMAGE_TYPE_JPEG:
break;
}
image->handle = NULL; image->handle = NULL;
image->cb = NULL; image->cb = NULL;
@ -229,17 +248,31 @@ static int cb_nbio_generic(nbio_handle_t *nbio, size_t *len)
if (!ptr) if (!ptr)
goto error; goto error;
switch (nbio->image_type)
{
case IMAGE_TYPE_PNG:
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
rpng_set_buf_ptr((rpng_t*)nbio->image.handle, (uint8_t*)ptr); rpng_set_buf_ptr((rpng_t*)nbio->image.handle, (uint8_t*)ptr);
#endif #endif
break;
case IMAGE_TYPE_JPEG:
break;
}
nbio->image.pos_increment = (*len / 2) ? (*len / 2) : 1; nbio->image.pos_increment = (*len / 2) ? (*len / 2) : 1;
nbio->image.processing_pos_increment = (*len / 4) ? (*len / 4) : 1; nbio->image.processing_pos_increment = (*len / 4) ? (*len / 4) : 1;
switch (nbio->image_type)
{
case IMAGE_TYPE_PNG:
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
if (!rpng_nbio_load_image_argb_start((rpng_t*)nbio->image.handle)) if (!rpng_nbio_load_image_argb_start((rpng_t*)nbio->image.handle))
goto error; goto error;
#endif #endif
break;
case IMAGE_TYPE_JPEG:
break;
}
nbio->image.is_blocking = false; nbio->image.is_blocking = false;
nbio->image.is_finished = false; nbio->image.is_finished = false;
@ -259,9 +292,16 @@ static int cb_nbio_image_menu_thumbnail(void *data, size_t len)
if (!nbio || !data) if (!nbio || !data)
return -1; return -1;
switch (nbio->image_type)
{
case IMAGE_TYPE_PNG:
#ifdef HAVE_RPNG #ifdef HAVE_RPNG
nbio->image.handle = rpng_alloc(); nbio->image.handle = rpng_alloc();
#endif #endif
break;
case IMAGE_TYPE_JPEG:
break;
}
nbio->image.cb = &cb_image_menu_thumbnail; nbio->image.cb = &cb_image_menu_thumbnail;
@ -338,22 +378,18 @@ bool rarch_task_push_image_load(const char *fullpath,
nbio->image.status = IMAGE_STATUS_TRANSFER; nbio->image.status = IMAGE_STATUS_TRANSFER;
if (strstr(fullpath, ".png")) if (strstr(fullpath, ".png"))
{ nbio->image_type = IMAGE_TYPE_PNG;
#ifdef HAVE_RPNG
switch (cb_type_hash)
{
case CB_MENU_WALLPAPER:
case CB_MENU_THUMBNAIL:
nbio->cb = &cb_nbio_image_menu_thumbnail;
break;
default:
break;
}
#endif
}
else if (strstr(fullpath, ".jpeg") || strstr(fullpath, ".jpg")) else if (strstr(fullpath, ".jpeg") || strstr(fullpath, ".jpg"))
nbio->image_type = IMAGE_TYPE_JPEG;
switch (cb_type_hash)
{ {
/* TODO/FIXME */ case CB_MENU_WALLPAPER:
case CB_MENU_THUMBNAIL:
nbio->cb = &cb_nbio_image_menu_thumbnail;
break;
default:
break;
} }
nbio_begin_read(handle); nbio_begin_read(handle);

10
tasks/tasks_internal.h
View File

@ -40,8 +40,15 @@ enum nbio_status_enum
NBIO_STATUS_TRANSFER_PARSE_FREE NBIO_STATUS_TRANSFER_PARSE_FREE
}; };
enum image_type_enum
{
IMAGE_TYPE_PNG = 0,
IMAGE_TYPE_JPEG
};
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
typedef struct { typedef struct
{
char *data; char *data;
size_t len; size_t len;
} http_transfer_data_t; } http_transfer_data_t;
@ -70,6 +77,7 @@ typedef struct nbio_image_handle
typedef struct nbio_handle typedef struct nbio_handle
{ {
enum image_type_enum image_type;
nbio_image_handle_t image; nbio_image_handle_t image;
bool is_finished; bool is_finished;
transfer_cb_t cb; transfer_cb_t cb;