search for: swfdec_player_add_action

...y and we don't hit assertions that want the action count to be empty. The patch also adds some debugging. diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 2f7deef..76c93e7 100644 --- a/libswfdec/swfdec_player.c +++ b/libswfdec/swfdec_player.c @@ -207,6 +207,7 @@ swfdec_player_add_action (SwfdecPlayer * g_return_if_fail (action_func != NULL); action = swfdec_ring_buffer_push (player->actions); + SWFDEC_LOG ("adding action %p %p %p", object, action_func, action_data); if (action == NULL) { /* FIXME: limit number of actions to not get inf loops due to sc...

Hi, Im trying to thumbnail a swf file based on this found at http://www.mail-archive.com/swfdec at lists.freedesktop.org/msg00821.html. #include <stdlib.h> #include <stdio.h> #include <swfdec/swfdec.h> #include <cairo.h> void swfdec_player_save (SwfdecPlayer *player, guint width, guint height, const char *filename) { cairo_surface_t *surface; cairo_t *cr;

...ie_perform_one_action (SwfdecSpriteMovie *movie, guint tag, Swf sprite->init_action = swfdec_script_new_from_bits (&bits, name, SWFDEC_AS_CONTEXT (player)->version); g_free (name); if (sprite->init_action) { - g_print ("Executing init action for sprite %u\n", id); swfdec_player_add_action_script (player, mov, sprite->init_action, 0); } } commit 5bf1eac786f898737cfa60fe05eabb380720c577 Merge: 2fd2b47... d625a49... Author: Benjamin Otte <otte at gnome.org> Date: Thu Oct 25 11:37:18 2007 +0200 Merge branch 'master' of ssh://company at git.freedesktop.or...

...ece%253Asportime_300x250%26tclk%3D%255Byour-click-command-here%255D&template=%2Fservices%2FUltraEditor%2FUltraAdImage.xml' This is the pattern of the messages i get on the console: SWFDEC: FIXME: swfdec_text_field_movie.c(1201): swfdec_text_field_movie_iterate: I'm pretty sure this is swfdec_player_add_action()'d [...] SWFDEC: FIXME: swfdec_text_field_movie.c(1201): swfdec_text_field_movie_iterate: I'm pretty sure this is swfdec_player_add_action()'d SWFDEC: WARN : swfdec_movie.c(1676): swfdec_movie_set_static_properties: trying to set events on a SwfdecButtonMovie, not allowed This is from...

Hey, In case someone filters commit mails or doesn't read 1MB blobs, I've just merged the result of me getting annoyed at various stuff. Unfortunately, this grew a bit out of hand and ended up being very huge. I expect this merge to have broken lots of things, so if you find stuff that used to work and now doesn't work (or even crashes), please poke me about it. What does this patch

http://bugs.freedesktop.org/show_bug.cgi?id=14346 Summary: swfdec-mozilla 100% CPU usage with some animations Product: swfdec Version: 0.5.5 Platform: x86-64 (AMD64) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: plugin AssignedTo: swfdec at lists.freedesktop.org

...- swfdec_loader_target_parse (loader->target, loader); -} - -void -swfdec_loader_queue_parse (SwfdecLoader *loader) -{ - g_return_if_fail (SWFDEC_IS_LOADER (loader)); - g_return_if_fail (loader->target != NULL); - - /* HACK: using player as action object makes them get auto-removed */ - swfdec_player_add_action (loader->player, loader->player, swfdec_loader_do_parse, loader); -} - /** PUBLIC API ***/ /** @@ -346,6 +370,7 @@ swfdec_loader_new_from_file (const char g_error_free (error); } else { swfdec_loader_set_size (loader, buf->length); + swfdec_loader_open (loader, 0);...

...ist *walk; - - g_assert (frame < mov->n_frames); - - player = SWFDEC_ROOT_MOVIE (mov->root)->player; - SWFDEC_LOG ("queueing goto %u for %p %d", frame, mov, - SWFDEC_CHARACTER (SWFDEC_SPRITE_MOVIE (mov)->sprite)->id); - - g_assert (frame <= G_MAXINT); - - swfdec_player_add_action (player, mov, - swfdec_sprite_movie_do_goto_frame, GUINT_TO_POINTER (frame)); - - /* tell all relevant movies that they won't survive this */ - for (walk = mov->list; walk; walk = walk->next) { - SwfdecMovie *cur = walk->data; - if (frame < cur->content->sequence-...

libswfdec/swfdec_player.c | 3 +++ 1 file changed, 3 insertions(+) New commits: commit f82b818ab4cf2148fafbb9eec5a27622ccd680d7 Author: Benjamin Otte <otte at gnome.org> Date: Sun Oct 14 17:04:21 2007 +0200 lock the player when handling keys ooooops diff --git a/libswfdec/swfdec_player.c b/libswfdec/swfdec_player.c index 32254ab..4980b21 100644 ---

...from /usr/lib/libglib-2.0.so.0 #3 0xb75c5f09 in g_log () from /usr/lib/libglib-2.0.so.0 #4 0xb75c5f80 in g_assert_warning () from /usr/lib/libglib-2.0.so.0 #5 0xb04bd949 in swfdec_player_do_add_action (player=0xa35cf00, importance=2, act=0xbfee55e4) at swfdec_player.c:383 #6 0xb04bdb8f in swfdec_player_add_action (player=0xa35cf00, movie=0xadfdbe0, type=SWFDEC_EVENT_UNLOAD, importance=2) at swfdec_player.c:412 #7 0xb04ae6b8 in swfdec_movie_queue_script (movie=0xadfdbe0, condition=SWFDEC_EVENT_UNLOAD) at swfdec_movie.c:469 #8 0xb04aeb16 in swfdec_movie_do_remove (movie=0xadfdbe0) at swfdec_mo...

...SWFDEC_IS_ROOT_MOVIE (root)); @@ -196,9 +190,8 @@ swfdec_root_movie_load (SwfdecRootMovie } else { SwfdecLoader *loader = swfdec_loader_load (root->loader, url); if (loader) { - SwfdecRootMovie *added = swfdec_player_add_level_from_loader (root->player, depth, loader, NULL); - swfdec_player_add_action (root->player, SWFDEC_MOVIE (added), - swfdec_root_movie_do_parse, NULL); + swfdec_player_add_level_from_loader (root->player, depth, loader, NULL); + swfdec_loader_queue_parse (loader); } else { SWFDEC_WARNING ("didn't get a loader for url \"%s\" at depth %...

...else { SwfdecLoader *loader = swfdec_loader_load (root->loader, url); if (loader) { - SwfdecRootMovie *added = swfdec_player_add_level_from_loader (root->player, depth, loader); + SwfdecRootMovie *added = swfdec_player_add_level_from_loader (root->player, depth, loader, NULL); swfdec_player_add_action (root->player, SWFDEC_MOVIE (added), swfdec_root_movie_do_parse, NULL); } else {

...} else { - const char *name = swfdec_event_type_get_name (condition); - if (name != NULL && - swfdec_as_object_has_function (SWFDEC_AS_OBJECT (movie), name)) - ret = TRUE; + g_return_if_reached (); } player = SWFDEC_PLAYER (SWFDEC_AS_OBJECT (movie)->context); swfdec_player_add_action (player, movie, condition, importance); - return ret; } /* NB: coordinates are in movie's coordiante system. Use swfdec_movie_get_mouse diff --git a/libswfdec/swfdec_movie.h b/libswfdec/swfdec_movie.h index 363d4b1..183e022 100644 --- a/libswfdec/swfdec_movie.h +++ b/libswfdec/swfdec_movie...

...buffer); + + SWFDEC_LOG ("%p: executing %uth tag %s in frame %u", movie, movie->next_action - 1, + swfdec_swf_decoder_get_tag_name (tag), mov->frame); + switch (tag) { + case SWFDEC_TAG_DOACTION: SWFDEC_LOG ("SCRIPT action"); if (!skip_scripts) { - swfdec_player_add_action (player, mov, swfdec_sprite_movie_run_script, action->data); + SwfdecScript *script = swfdec_swf_decoder_get_script ( + SWFDEC_SWF_DECODER (mov->swf->decoder), buffer->data); + g_assert (script); + swfdec_player_add_action (player, mov, swfdec_sprite_movie_run_script, script);...

...ecMovie *mov) { SwfdecSpriteMovie *movie = SWFDEC_SPRITE_MOVIE (mov); @@ -501,6 +536,9 @@ swfdec_sprite_movie_iterate (SwfdecMovie if (mov->will_be_removed) return; + if (movie->sprite != NULL && movie->frame == 0) + swfdec_sprite_movie_do_init_movie (movie); + swfdec_player_add_action (player, movie, swfdec_sprite_movie_do_enter_frame, NULL); if (movie->playing && movie->sprite != NULL) { if (movie->frame == movie->n_frames) @@ -588,38 +626,6 @@ new_decoder: } static void -swfdec_sprite_movie_init_movie (SwfdecMovie *mov) -{ - SwfdecSpriteMovie *...

...ie), condition, 0)) + return FALSE; + } else { + const char *name = swfdec_event_type_get_name (condition); + if (name == NULL || + !swfdec_scriptable_can_execute (SWFDEC_SCRIPTABLE (movie), name)) + return FALSE; + } player = SWFDEC_ROOT_MOVIE (movie->root)->player; swfdec_player_add_action (player, movie, swfdec_movie_execute_script, diff-tree e472a12007feae2e81d257b5f1e826cc68d7586a (from ce1244ddd18afd0ce1b83999304ac5b9282c7564) Author: Benjamin Otte <otte@gnome.org> Date: Tue Mar 6 13:03:53 2007 +0100 output trace messages in the window requires some refacto...

...ov->frame) { - mov->frame--; - } else { - SWFDEC_FIXME ("how to handle movies without a ShowFrame tag?"); - } /* now try to copy eventual movies */ if (old) { SwfdecMovie *prev, *cur; @@ -479,12 +471,18 @@ swfdec_sprite_movie_iterate (SwfdecMovie return; swfdec_player_add_action (player, movie, swfdec_sprite_movie_do_enter_frame, NULL); - if (!mov->stopped && movie->sprite != NULL) { - goto_frame = swfdec_sprite_get_next_frame (movie->sprite, mov->frame); - swfdec_sprite_movie_goto (mov, goto_frame); + if (movie->playing && movie->...

..._object_call (SWFDEC_AS_OBJECT (movie), SWFDEC_AS_STR_constructor, 0, NULL, NULL); @@ -457,7 +458,7 @@ swfdec_movie_queue_script (SwfdecMovie * return FALSE; } - player = SWFDEC_ROOT_MOVIE (movie->root)->player; + player = SWFDEC_PLAYER (SWFDEC_AS_OBJECT (movie)->context); swfdec_player_add_action (player, movie, swfdec_movie_do_execute_script, GUINT_TO_POINTER (condition)); return TRUE; @@ -557,7 +558,7 @@ swfdec_movie_get_mouse (SwfdecMovie *mov g_return_if_fail (x != NULL); g_return_if_fail (y != NULL); - player = SWFDEC_ROOT_MOVIE (movie->root)->player; + playe...

...movie_iterate (SwfdecMovie *mov) { SwfdecSpriteMovie *movie = SWFDEC_SPRITE_MOVIE (mov); + SwfdecPlayer *player = SWFDEC_PLAYER (SWFDEC_AS_OBJECT (mov)->context); guint goto_frame; if (mov->will_be_removed) return; - swfdec_movie_queue_script (mov, SWFDEC_EVENT_ENTER); + swfdec_player_add_action (player, movie, swfdec_sprite_movie_do_enter_frame, NULL); if (!mov->stopped && movie->sprite != NULL) { goto_frame = swfdec_sprite_get_next_frame (movie->sprite, mov->frame); swfdec_sprite_movie_goto (mov, goto_frame); @@ -256,6 +258,7 @@ swfdec_sprite_movie_iterat...

...SWFDEC_LOG ("SCRIPT action"); if (!skip_scripts) { SwfdecScript *script = swfdec_swf_decoder_get_script ( - SWFDEC_SWF_DECODER (mov->swf->decoder), buffer->data); + SWFDEC_SWF_DECODER (mov->resource->decoder), buffer->data); g_assert (script); swfdec_player_add_action (player, mov, swfdec_sprite_movie_run_script, script); } @@ -435,10 +437,10 @@ swfdec_sprite_movie_goto (SwfdecSpriteMovie *movie, guint goto_frame) while (n) { guint tag; SwfdecBuffer *buffer; + SwfdecResource *resource = swfdec_movie_get_own_resource (mov); /* FIXME: T...