From 4efcd46cbf5445df1b52ef78968e6d679b30879f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Fri, 13 Jun 2014 17:45:32 +0900 Subject: [PATCH] Eet: Add INF message about how slow ETC2 encoding is --- src/lib/eet/eet_image.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/eet/eet_image.c b/src/lib/eet/eet_image.c index f3db7eecd8..3d6b95341e 100644 --- a/src/lib/eet/eet_image.c +++ b/src/lib/eet/eet_image.c @@ -732,7 +732,6 @@ eet_data_image_etc2_decode(const void *data, unsigned int etc_block_size; Eet_Colorspace file_cspace; Eina_Bool compress, blockless; - Eina_Bool r = EINA_FALSE; m = data; @@ -1104,6 +1103,7 @@ eet_data_image_etc1_compressed_convert(int *size, Eet_Colorspace cspace; Eina_Binbuf *r; void *result; + const char *codec; r = eina_binbuf_new(); if (!r) return NULL; @@ -1137,16 +1137,19 @@ eet_data_image_etc1_compressed_convert(int *size, cspace = EET_COLORSPACE_ETC1; etc_block_size = 8; header[5] = 0; + codec = "ETC1"; break; case EET_IMAGE_ETC2_RGB: cspace = EET_COLORSPACE_RGB8_ETC2; etc_block_size = 8; header[5] = 1; + codec = "ETC2 (RGB)"; break; case EET_IMAGE_ETC2_RGBA: cspace = EET_COLORSPACE_RGBA8_ETC2_EAC; etc_block_size = 16; header[5] = 2; + codec = "ETC2 (RGBA)"; break; default: abort(); } @@ -1157,6 +1160,10 @@ eet_data_image_etc1_compressed_convert(int *size, // header[7]: options (unused) header[7] = 0; + // Encoding being super slow, let's inform the user first. + // FIXME: Ctrl+C must be handled + INF("Encoding %dx%d image to %s, this may take a while...", w, h, codec); + // Write header eina_binbuf_append_length(r, header, sizeof (header)); eina_binbuf_append_length(r, (unsigned char*) &width, sizeof (width));