slightly faster image load

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/e17/libs/eet@14696 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 3e8351c..3fb463f 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -2,10 +2,16 @@ MAINTAINERCLEANFILES = Makefile.in
 
 INCLUDES = -I$(top_srcdir)/src/lib
 
-bin_PROGRAMS = eet
+bin_PROGRAMS = eet eet_bench
 
 eet_SOURCES = \
 eet_main.c
 
 eet_LDADD = $(top_builddir)/src/lib/libeet.la
 eet_DEPENDENCIES = $(top_builddir)/src/lib/libeet.la
+
+eet_bench_SOURCES = \
+eet_bench_main.c
+
+eet_bench_LDADD = $(top_builddir)/src/lib/libeet.la
+eet_bench_DEPENDENCIES = $(top_builddir)/src/lib/libeet.la

diff --git a/src/bin/eet_bench_main.c b/src/bin/eet_bench_main.c
new file mode 100644 (file)
index 0000000..88aa364
--- /dev/null
+++ b/src/bin/eet_bench_main.c
@@ -0,0 +1,114 @@
+#include "Eet.h"
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <limits.h>
+#include <fnmatch.h>
+#include <sys/time.h>
+#include <time.h>
+
+double
+get_time(void)
+{
+   struct timeval      timev;
+   
+   gettimeofday(&timev, NULL);
+   return (double)timev.tv_sec + (((double)timev.tv_usec) / 1000000);
+}
+
+int
+main(int argc, char **argv)
+{
+   char *file;
+   Eet_File *ef;
+   char **items;
+   int items_num;
+   int i;
+   double t1, t2;
+   
+   file = argv[1];
+   ef = eet_open(file, EET_FILE_MODE_READ);
+   if (ef)
+     {
+       items = eet_list(ef, "images/*", &items_num);
+       for (i = 0; i < items_num; i++)
+         items[i] = strdup(items[i]);
+       eet_close(ef);
+     }
+   else
+     {
+       printf("EEK. cannot load %s\n", file);
+       exit(-1);
+     }
+   
+   t1 = get_time();
+   ef = eet_open(file, EET_FILE_MODE_READ);
+   if (ef)
+     {
+       for (i = 0; i < items_num; i++)
+         {
+            int w, h, alpha, compress, quality, lossy;
+            void *data;
+            
+            if (eet_data_image_header_read(ef, items[i], &w, &h, &alpha, &compress, &quality, &lossy))
+              {
+                 data = eet_data_image_read(ef, items[i], &w, &h, &alpha, &compress, &quality, &lossy);
+                 if (data) free(data);
+                 else
+                   {
+                      printf("failure reading %s (%i/%i\n", items[i], i, items_num);
+                      exit(-1);
+                   }
+              }
+            else
+              {
+                 printf("failure reading header %s (%i/%i\n", items[i], i, items_num);
+                 exit(-1);
+              }
+         }
+     }
+   eet_close(ef);
+   t2 = get_time();
+   printf("1 open/close: %i img headers + data in %3.3f sec (%3.3f img/sec)\n",
+         items_num,
+         t2 - t1,
+         (double)items_num / (t2 - t1));
+   t1 = get_time();
+   for (i = 0; i < items_num; i++)
+     {
+       int w, h, alpha, compress, quality, lossy;
+       void *data;
+       
+       ef = eet_open(file, EET_FILE_MODE_READ);
+       if (ef)
+         {
+            if (eet_data_image_header_read(ef, items[i], &w, &h, &alpha, &compress, &quality, &lossy))
+              {
+                 data = eet_data_image_read(ef, items[i], &w, &h, &alpha, &compress, &quality, &lossy);
+                 if (data) free(data);
+                 else
+                   {
+                      printf("failure reading %s (%i/%i\n", items[i], i, items_num);
+                      exit(-1);
+                   }
+              }
+            else
+              {
+                 printf("failure reading header %s (%i/%i\n", items[i], i, items_num);
+                 exit(-1);
+              }
+            eet_close(ef);
+         }
+     }
+   t2 = get_time();
+   printf("many open/close: %i img headers + data in %3.3f sec (%3.3f img/sec)\n",
+         items_num,
+         t2 - t1,
+         (double)items_num / (t2 - t1));
+   return 0;
+}

diff --git a/src/lib/eet_image.c b/src/lib/eet_image.c
index d2515c4..5c6da89 100644 (file)
--- a/src/lib/eet_image.c
+++ b/src/lib/eet_image.c
@@ -154,6 +154,7 @@ eet_data_image_jpeg_rgb_decode(void *data, int size, int *w, int *h)
    jpeg_create_decompress(&cinfo);
    jpeg_stdio_src(&cinfo, f);
    jpeg_read_header(&cinfo, TRUE);
+   cinfo.dct_method = JDCT_FASTEST;
    cinfo.do_fancy_upsampling = FALSE;
    cinfo.do_block_smoothing = FALSE;
    jpeg_start_decompress(&cinfo);
@@ -274,6 +275,7 @@ eet_data_image_jpeg_alpha_decode(void *data, int size, unsigned int *d, int *w,
    jpeg_create_decompress(&cinfo);
    jpeg_stdio_src(&cinfo, f);
    jpeg_read_header(&cinfo, TRUE);
+   cinfo.dct_method = JDCT_FASTEST;
    cinfo.do_fancy_upsampling = FALSE;
    cinfo.do_block_smoothing = FALSE;
    jpeg_start_decompress(&cinfo);