emscripten_async_prepare_data

4 files changed, 108 insertions, 0 deletions

diff --git a/src/library_browser.js b/src/library_browser.js
index 673f1ff4..fb2fa16b 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -402,6 +402,28 @@ mergeInto(LibraryManager.library, {
     return 0;
   },
 
+  emscripten_async_prepare_data: function(data, size, suffix, onload, onerror) {
+    var _suffix = Pointer_stringify(suffix);
+    if (!Browser.asyncPrepareDataCounter) Browser.asyncPrepareDataCounter = 0;
+    var name = 'prepare_data_' + (Browser.asyncPrepareDataCounter++) + '.' + _suffix;
+    var cname = _malloc(name.length+1);
+    writeStringToMemory(name, cname);
+    FS.createPreloadedFile(
+      '',
+      name,
+      {{{ makeHEAPView('U8', 'data', 'data + size') }}},
+      true, true,
+      function() {
+        if (onload) FUNCTION_TABLE[onload](data, cname);
+      },
+      function() {
+        if (onerror) FUNCTION_TABLE[onerror](data);
+      },
+      true // don'tCreateFile - it's already there
+    );
+    return 0;
+  },
+
   emscripten_async_run_script__deps: ['emscripten_run_script'],
   emscripten_async_run_script: function(script, millis) {
     Module['noExitRuntime'] = true;
diff --git a/system/include/emscripten/emscripten.h b/system/include/emscripten/emscripten.h
index 078f87d2..94f1c860 100644
--- a/system/include/emscripten/emscripten.h
+++ b/system/include/emscripten/emscripten.h
@@ -197,6 +197,22 @@ void emscripten_async_wget(const char* url, const char* file, void (*onload)(con
 int emscripten_async_prepare(const char* file, void (*onload)(const char*), void (*onerror)(const char*));
 
 /*
+ * Data version of emscripten_async_prepare, which receives
+ * raw data as input instead of a filename (this can prevent
+ * the need to write data to a file first). onload and
+ * onerror are called back with the data pointer as the
+ * first parameter. onload also receives a second
+ * parameter, which is a 'fake' filename which you can
+ * then pass into IMG_Load (it is not an actual file,
+ * but it identifies this image for IMG_Load to be able
+ * to process it). Note that the user of this API is
+ * responsible for free()ing the memory allocated for
+ * the fake filename.
+ * @suffix The file suffix, e.g. 'png' or 'jpg'.
+ */
+void emscripten_async_prepare_data(char* data, int size, const char *suffix, void (*onload)(char*, const char*), void (*onerror)(char*));
+
+/*
  * Profiling tools.
  * INIT must be called first, with the maximum identifier that
  * will be used. BEGIN will add some code that marks
diff --git a/tests/runner.py b/tests/runner.py
index b11edf15..c36bf049 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -8603,6 +8603,11 @@ elif 'browser' in str(sys.argv):
       shutil.copyfile(path_from_root('tests', 'screenshot.jpg'), os.path.join(self.get_dir(), 'screenshot.not'))
       self.btest('sdl_image_prepare.c', reference='screenshot.jpg', args=['--preload-file', 'screenshot.not'])
 
+    def test_sdl_image_prepare_data(self):
+      # load an image file, get pixel data. Also O2 coverage for --preload-file
+      shutil.copyfile(path_from_root('tests', 'screenshot.jpg'), os.path.join(self.get_dir(), 'screenshot.not'))
+      self.btest('sdl_image_prepare_data.c', reference='screenshot.jpg', args=['--preload-file', 'screenshot.not'])
+
     def test_sdl_canvas(self):
       open(os.path.join(self.get_dir(), 'sdl_canvas.c'), 'w').write(self.with_report_result(open(path_from_root('tests', 'sdl_canvas.c')).read()))
 
diff --git a/tests/sdl_image_prepare_data.c b/tests/sdl_image_prepare_data.c
new file mode 100644
index 00000000..fdad16d1
--- /dev/null
+++ b/tests/sdl_image_prepare_data.c
@@ -0,0 +1,65 @@
+#include <stdio.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_image.h>
+#include <assert.h>
+#include <emscripten.h>
+
+SDL_Surface* screen;
+
+int testImage(const char* fileName) {
+  printf("IMG_Load: %s\n", fileName);
+  SDL_Surface *image = IMG_Load(fileName);
+  if (!image)
+  {
+     printf("IMG_Load: %s\n", IMG_GetError());
+     return 0;
+  }
+  assert(image->format->BitsPerPixel == 32);
+  assert(image->format->BytesPerPixel == 4);
+  assert(image->pitch == 4*image->w);
+  int result = image->w;
+
+  SDL_BlitSurface (image, NULL, screen, NULL);
+  SDL_FreeSurface (image);
+
+  return result;
+}
+
+void ready(char *data, const char *fileName) {
+  printf("ready! %s\n", fileName);
+
+  static int first = 1;
+  static const char *seenName;
+  if (first) {
+    first = 0;
+    seenName = fileName;
+  } else {
+    printf("%s ? %s == %d\n", fileName, seenName, strcmp(fileName, seenName));
+    assert(strcmp(fileName, seenName)); // different names
+
+    testImage(seenName);
+
+    free(seenName); // As the API docs say, we are responsible for freeing the 'fake' names we are given
+
+    SDL_Flip(screen);
+  }
+}
+
+int main() {
+  SDL_Init(SDL_INIT_VIDEO);
+  screen = SDL_SetVideoMode(600, 450, 32, SDL_SWSURFACE);
+
+  printf("prepare..\n");
+
+  #define SIZE 203164
+  FILE *f = open("screenshot.not", "rb");
+  char *buffer = malloc(SIZE);
+  fread(buffer, SIZE, 1, f);
+  fclose(f);
+
+  emscripten_async_prepare_data(buffer, SIZE, "jpg", ready, NULL);
+  emscripten_async_prepare_data(buffer, SIZE, "jpg", ready, NULL); // twice to see different filenames
+
+  return 0;
+}
+