search for: swfdecsprite

...current contents while parsing for faster lookup when tags affect them diff --git a/libswfdec/swfdec_sprite.c b/libswfdec/swfdec_sprite.c index af7e913..84e6973 100644 --- a/libswfdec/swfdec_sprite.c +++ b/libswfdec/swfdec_sprite.c @@ -50,6 +50,10 @@ swfdec_sprite_dispose (GObject *object) SwfdecSprite * sprite = SWFDEC_SPRITE (object); unsigned int i; + if (sprite->live_content) { + g_hash_table_destroy (sprite->live_content); + sprite->live_content = NULL; + } if (sprite->frames) { for (i = 0; i < sprite->n_frames; i++) { g_free (sprite->frames[i...

...#include "swfdec_debug.h" -#include "swfdec_player_internal.h" -#include "swfdec_script.h" -#include "swfdec_swf_decoder.h" - -G_DEFINE_TYPE (SwfdecRootSprite, swfdec_root_sprite, SWFDEC_TYPE_SPRITE) - -void -swfdec_root_sprite_dispose (GObject *object) -{ - SwfdecSprite *sprite = SWFDEC_SPRITE (object); - SwfdecRootSprite *root = SWFDEC_ROOT_SPRITE (object); - guint i,j; - - if (root->root_actions) { - for (i = 0; i < sprite->n_frames; i++) { - GArray *array = root->root_actions[i]; - if (array) { - for (j = 0; j < array->len; j++...

...9,32 +59,18 @@ swfdec_sprite_dispose (GObject *object) if (sprite->frames[i].sound_block) { swfdec_buffer_unref (sprite->frames[i].sound_block); } - if (sprite->frames[i].actions) { - guint j; - for (j = 0; j < sprite->frames[i].actions->len; j++) { - SwfdecSpriteAction *action = - &g_array_index (sprite->frames[i].actions, SwfdecSpriteAction, j); - switch (action->type) { - case SWFDEC_SPRITE_ACTION_SCRIPT: - swfdec_script_unref (action->data); - break; - case SWFDEC_SPRITE_ACTION_ADD: - case SWFDEC_SPRITE_ACTION_...

...SwfdecAudioOut format); diff --git a/libswfdec/swfdec_sprite.c b/libswfdec/swfdec_sprite.c index a993ece..1c6a43f 100644 --- a/libswfdec/swfdec_sprite.c +++ b/libswfdec/swfdec_sprite.c @@ -48,7 +48,7 @@ static void swfdec_sprite_dispose (GObject *object) { SwfdecSprite * sprite = SWFDEC_SPRITE (object); - unsigned int i; + guint i; if (sprite->live_content) { g_hash_table_destroy (sprite->live_content); @@ -97,7 +97,7 @@ swfdec_sprite_dispose (GObject *object) } void -swfdec_sprite_add_sound_chunk (SwfdecSprite * sprite, unsigned int frame,...

...+ +#include "swfdec_root_sprite.h" +#include "swfdec_debug.h" +#include "swfdec_script.h" +#include "swfdec_swf_decoder.h" + +G_DEFINE_TYPE (SwfdecRootSprite, swfdec_root_sprite, SWFDEC_TYPE_SPRITE) + +void +swfdec_root_sprite_dispose (GObject *object) +{ + SwfdecSprite *sprite = SWFDEC_SPRITE (object); + SwfdecRootSprite *root = SWFDEC_ROOT_SPRITE (object); + guint i,j; + + if (root->root_actions) { + for (i = 0; i < sprite->n_frames; i++) { + GArray *array = root->root_actions[i]; + if (array) { + for (j = 0; j < array->len; j++...

...include <libswfdec/swfdec_swf_decoder.h> #include <libswfdec/swfdec_swf_instance.h> +#include <libswfdec/swfdec_tag.h> #include <libswfdec/swfdec_text.h> static gboolean verbose = FALSE; @@ -78,18 +79,17 @@ dump_sound (SwfdecSound *sound) } static void -dump_sprite (SwfdecSprite *s) +dump_sprite (SwfdecSwfDecoder *dec, SwfdecSprite *s) { if (!verbose) { g_print (" %u frames\n", s->n_frames); } else { - guint i, j; + guint i, j, tag; + SwfdecBuffer *buffer; SwfdecSound *sound = NULL; for (i = 0; i < s->n_frames; i++) {...

...SwfdecAudioOut format); diff --git a/libswfdec/swfdec_sprite.c b/libswfdec/swfdec_sprite.c index a993ece..1c6a43f 100644 --- a/libswfdec/swfdec_sprite.c +++ b/libswfdec/swfdec_sprite.c @@ -48,7 +48,7 @@ static void swfdec_sprite_dispose (GObject *object) { SwfdecSprite * sprite = SWFDEC_SPRITE (object); - unsigned int i; + guint i; if (sprite->live_content) { g_hash_table_destroy (sprite->live_content); @@ -97,7 +97,7 @@ swfdec_sprite_dispose (GObject *object) } void -swfdec_sprite_add_sound_chunk (SwfdecSprite * sprite, unsigned int frame,...

Here are some patches I made yesterday. They add three actions: duplicateClip, removeClip and With, one method Math.abs and bug fixes. All base off 'as' branch. Please have a look if you are going to apply them because I'm quite new in swfdec development. BTW, how can I implement createEmptyMovieClip? I have no idea how to create an SwfdecMovie properly. I also need to add the

...with non-sprite movies diff --git a/libswfdec/swfdec_sprite_movie.c b/libswfdec/swfdec_sprite_movie.c index d42aac3..457644e 100644 --- a/libswfdec/swfdec_sprite_movie.c +++ b/libswfdec/swfdec_sprite_movie.c @@ -555,24 +555,27 @@ static void swfdec_sprite_movie_init_movie (SwfdecMovie *mov) { SwfdecSpriteMovie *movie = SWFDEC_SPRITE_MOVIE (mov); - SwfdecAsContext *context; - SwfdecAsObject *constructor; - const char *name; + SwfdecAsContext *context = SWFDEC_AS_OBJECT (movie)->context; + SwfdecAsObject *constructor = NULL; - g_assert (movie->sprite->parse_frame > 0); g_assert...

.../* FIXME: do a find on player here */ + } + g_return_val_if_fail (graphic == NULL || SWFDEC_IS_GRAPHIC (graphic), NULL); - swfdec_movie_set_name (movie); + /* create the right movie */ + if (graphic == NULL) { + movie = g_object_new (SWFDEC_TYPE_SPRITE_MOVIE, NULL); + size = sizeof (SwfdecSpriteMovie); + } else { + SwfdecGraphicClass *klass = SWFDEC_GRAPHIC_GET_CLASS (graphic); + g_return_val_if_fail (klass->create_movie != NULL, NULL); + movie = klass->create_movie (graphic, &size); + } + /* register it to the VM */ + /* FIXME: It'd be nice if we'd not overu...

...c_sprite.c index cd678a9..de35c50 100644 --- a/libswfdec/swfdec_sprite.c +++ b/libswfdec/swfdec_sprite.c @@ -32,6 +32,7 @@ #include "swfdec_sound.h" #include "swfdec_sprite_movie.h" #include "swfdec_swf_decoder.h" +#include "swfdec_tag.h" G_DEFINE_TYPE (SwfdecSprite, swfdec_sprite, SWFDEC_TYPE_GRAPHIC) @@ -159,7 +160,7 @@ swfdec_get_clipeventflags (SwfdecSwfDeco } int -tag_show_frame (SwfdecSwfDecoder * s) +tag_show_frame (SwfdecSwfDecoder * s, guint tag) { SWFDEC_DEBUG("show_frame %d of id %d", s->parse_sprite->parse_frame, SW...

...prite_movie.c b/libswfdec/swfdec_sprite_movie.c index d5545df..22e0458 100644 --- a/libswfdec/swfdec_sprite_movie.c +++ b/libswfdec/swfdec_sprite_movie.c @@ -32,6 +32,38 @@ #include "swfdec_script.h" #include "swfdec_sprite.h" +/*** SWFDEC_SPRITE_INFO ***/ + +typedef struct _SwfdecSpriteInfo SwfdecSpriteInfo; +struct _SwfdecSpriteInfo { + gboolean init_action_has_run; /* TRUE if init actions have been run */ +}; + +static void +swfdec_sprite_info_free (gpointer infop) +{ + SwfdecSpriteInfo *info = infop; + + g_free (info); +} + +static SwfdecSpriteInfo * +swfdec_sprite_info_ge...

...;decoded == NULL) { - g_printerr ("not a sound event. For streams use the sprite."); + g_printerr ("not a sound event. For extraction of streams extract the sprite.\n"); return FALSE; } wav = encode_wav (sound->decoded); @@ -97,7 +97,7 @@ export_sprite_sound (SwfdecSprite *sprit break; } if (i >= sprite->n_frames) { - g_printerr ("No sound in sprite %u", SWFDEC_CHARACTER (sprite)->id); + g_printerr ("No sound in sprite %u\n", SWFDEC_CHARACTER (sprite)->id); return FALSE; } audio = swfdec_audio_stream_new...

...LOG ("performing root actions for frame %u", root->root_actions_performed); root->root_actions_performed++; + if (!sprite->root_actions) + return; + array = sprite->root_actions[frame]; + if (array == NULL) + return; + for (i = 0; i < array->len; i++) { + SwfdecSpriteAction *action = &g_array_index (array, SwfdecSpriteAction, i); + switch (action->type) { + case SWFDEC_ROOT_ACTION_INIT_SCRIPT: + swfdec_script_execute (action->data, SWFDEC_SCRIPTABLE (root)); + break; + case SWFDEC_ROOT_ACTION_EXPORT: + break; + default: + g_assert_not...

...le_lookup (instance->export_names, character); } diff --git a/libswfdec/swfdec_sprite_movie.c b/libswfdec/swfdec_sprite_movie.c index e8d4062..10fc011 100644 --- a/libswfdec/swfdec_sprite_movie.c +++ b/libswfdec/swfdec_sprite_movie.c @@ -363,7 +363,6 @@ swfdec_sprite_movie_perform_one_action (SwfdecSpriteMovie *movie, guint tag, Swf SWFDEC_ERROR ("cannot export id %u, no name was given", id); } else { SWFDEC_LOG ("exporting %s %u as %s", G_OBJECT_TYPE_NAME (object), id, name); - g_print ("exporting %s %u as %s\n", G_OBJECT_TYPE_NAME (object), id, nam...

...decoded); + wav = encode_wav (buffer, format); if (!g_file_set_contents (filename, (char *) wav->data, wav->length, &error)) { g_printerr ("Couldn't save sound to file \"%s\": %s\n", filename, error->message); @@ -133,7 +148,7 @@ export_sprite_sound (SwfdecSprite *sprite, const char *filename) } buffer = swfdec_buffer_queue_pull (queue, depth); swfdec_buffer_queue_unref (queue); - wav = encode_wav (buffer); + wav = encode_wav (buffer, swfdec_audio_format_new (44100, 2, TRUE)); swfdec_buffer_unref (buffer); if (!g_file_set_contents (filename...

..., tmp->length); } /* only assign here, the decoding code checks this variable */ diff --git a/libswfdec/swfdec_sprite.c b/libswfdec/swfdec_sprite.c index ae61642..f7bc576 100644 --- a/libswfdec/swfdec_sprite.c +++ b/libswfdec/swfdec_sprite.c @@ -87,7 +87,7 @@ swfdec_sprite_add_sound_chunk (SwfdecSprite * sprite, guint frame, swfdec_buffer_unref (chunk); return; } - SWFDEC_LOG ("adding %u samples in %u bytes to frame %u", n_samples, + SWFDEC_LOG ("adding %u samples in %"G_GSIZE_FORMAT" bytes to frame %u", n_samples, chunk ? chunk->length : 0...

...libswfdec/swfdec_tag.c index e7c8aa8..f4497f2 100644 --- a/libswfdec/swfdec_tag.c +++ b/libswfdec/swfdec_tag.c @@ -190,35 +190,30 @@ tag_func_define_text_2 (SwfdecSwfDecoder int tag_func_define_sprite (SwfdecSwfDecoder * s) { - SwfdecBits *bits = &s->b; SwfdecBits parse; int id; SwfdecSprite *sprite; int ret; - SwfdecBits save_bits; + guint tag; - save_bits = s->b; + parse = s->b; - id = swfdec_bits_get_u16 (bits); + id = swfdec_bits_get_u16 (&parse); sprite = swfdec_swf_decoder_create_character (s, id, SWFDEC_TYPE_SPRITE); if (!sprite) return SWFDEC_S...

...8018c1f5f8394ef9) Author: Benjamin Otte <otte at gnome.org> Date: Thu Jun 14 09:55:42 2007 +0200 add has_color_transform and has_transform field to SwfdecContent SwfdecContent needs to die, but that's another big reorg patch I'm scared of atm. As far as I see it, a SwfdecSprite should just save all displaylist tags (the stuff that's called actions right now) verbatim in a long list of buffers and whenever we execute these tags, we just iterate through this list and parse the tags. This makes startup extremely fast (no need to parse anything) and fits e...

...wfdec_decoder.h> -#include <swfdec_render.h> -#include <swfdec_sprite.h> -#include <swfdec_buffer.h> -#include <ucontext.h> -#include <sys/mman.h> - -#if 0 -void * smash_checker (void * (func) (void *), void *priv); -void *go(void *priv); -#endif - -void dump_sprite(SwfdecSprite *s); - -static void buffer_free (SwfdecBuffer *buffer, void *priv) -{ - g_free (buffer->data); -} - -int main (int argc, char *argv[]) -{ - gsize length; - int ret; - char *fn = "it.swf"; - SwfdecDecoder *s; - int i; - char *contents; - SwfdecBuffer *buffer; - int n_frames; -...