search for: sound_block

...0200 use the right frame when creating an audio stream diff --git a/libswfdec/swfdec_sprite_movie.c b/libswfdec/swfdec_sprite_movie.c index 6152535..8658bd3 100644 --- a/libswfdec/swfdec_sprite_movie.c +++ b/libswfdec/swfdec_sprite_movie.c @@ -618,7 +618,7 @@ new_decoder: if (current->sound_block) { movie->sound_stream = swfdec_audio_stream_new (player, - movie->sprite, movie->frame); + movie->sprite, movie->frame - 1); movie->sound_frame = movie->frame; } return TRUE;

...gt;actions instead of SwfdecSwfDecoder. diff --git a/libswfdec/swfdec_sprite.c b/libswfdec/swfdec_sprite.c index 9786f3b..fb3b111 100644 --- a/libswfdec/swfdec_sprite.c +++ b/libswfdec/swfdec_sprite.c @@ -59,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, SwfdecSprite...

...guint i, j, tag; + SwfdecBuffer *buffer; SwfdecSound *sound = NULL; for (i = 0; i < s->n_frames; i++) { SwfdecSpriteFrame *frame = &s->frames[i]; - if (frame->actions == NULL) - continue; if (frame->sound_head != sound && frame->sound_block != NULL) { sound = frame->sound_head; @@ -105,40 +105,55 @@ dump_sprite (SwfdecSprite *s) SWFDEC_AUDIO_OUT_IS_STEREO (sound->original_format) ? "mono" : "stereo", sound->width ? 16 : 8); } - for (j = 0; j < frame->actions->len; j++...

..._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, frame); sprite->frames[frame].sound_skip = skip; sprite->frames[frame].sound_block = chunk; diff --git a/libswfdec/swfdec_swf_decoder.c b/libswfdec/swfdec_swf_decoder.c index 28223f0..5f3b2e0 100644 --- a/libswfdec/swfdec_swf_decoder.c +++ b/libswfdec/swfdec_swf_decoder.c @@ -134,7 +134,7 @@ swfdec_swf_decoder_deflate (SwfdecSwfDecoder * s, SwfdecBuffer *buffer) guint max =...

...swfdec/swfdec_sprite_movie.c @@ -293,9 +293,11 @@ new_decoder: g_object_unref (movie->sound_stream); } - movie->sound_stream = swfdec_audio_stream_new (player, - movie->sprite, movie->current_frame); - movie->sound_frame = movie->current_frame; + if (current->sound_block) { + movie->sound_stream = swfdec_audio_stream_new (player, + movie->sprite, movie->current_frame); + movie->sound_frame = movie->current_frame; + } return TRUE; } diff-tree e869d0ff88487c7f8998b190b849d7cb174fcaa4 (from f62be51acb786924ee781a1114c51852dc6816ac) Author:...

...-- a/libswfdec/swfdec_sprite_movie.c +++ b/libswfdec/swfdec_sprite_movie.c @@ -542,6 +542,7 @@ new_decoder: if (movie->sound_stream) { swfdec_audio_remove (movie->sound_stream); g_object_unref (movie->sound_stream); + movie->sound_stream = NULL; } if (current->sound_block) { diff-tree a031f4b7e379e364e82101dd02924cc1b1137b56 (from 90c2424294478b3d5d004e7066fa6db20ae65f22) Author: Benjamin Otte <otte at gnome.org> Date: Mon Jul 2 23:59:45 2007 +0100 add the movie to the context at any time This avoids crashes when functions like _get_variable()...

...pped) { + !movie->playing) { if (movie->sound_stream) { swfdec_audio_remove (movie->sound_stream); g_object_unref (movie->sound_stream); @@ -525,8 +523,8 @@ swfdec_sprite_movie_iterate_end (SwfdecM } if (movie->sound_stream == NULL && current->sound_block == NULL) goto exit; - SWFDEC_LOG ("iterating audio (from %u to %u)", movie->sound_frame, mov->frame); - if (movie->sound_frame + 1 != mov->frame) + SWFDEC_LOG ("iterating audio (from %u to %u)", movie->sound_frame, movie->frame); + if (movie->sound_...

...ream->decoder); stream->decoder = NULL; if (buffer) swfdec_buffer_unref (buffer); @@ -68,7 +68,7 @@ swfdec_audio_stream_decode_one (SwfdecAu /* FIXME: with this method and mad not giving out full samples, we end up * putting silence too early */ if (frame->sound_block) { - buffer = swfdec_sound_decode_buffer (stream->sound, stream->decoder, frame->sound_block); + buffer = swfdec_audio_codec_decode (stream->codec, stream->decoder, frame->sound_block); if (buffer == NULL) continue; } else { @@ -79,7 +79,7 @@ swfdec_audio_s...

...c/swfdec_sprite.h index 779cd43..1812302 100644 --- a/libswfdec/swfdec_sprite.h +++ b/libswfdec/swfdec_sprite.h @@ -59,7 +59,7 @@ struct _SwfdecSpriteFrame SwfdecSound *sound_head; /* sound head for this frame */ int sound_skip; /* samples to skip - maybe even backwards */ SwfdecBuffer *sound_block; /* sound chunk to play here or NULL for none */ - unsigned int sound_samples; /* number of samples in this frame */ + guint sound_samples; /* number of samples in this frame */ GSList *sound; /* list of SwfdecSoundChunk events to start playing here */ /* visuals */ @@ -71,11 +71,11...

...c/swfdec_sprite.h index 779cd43..1812302 100644 --- a/libswfdec/swfdec_sprite.h +++ b/libswfdec/swfdec_sprite.h @@ -59,7 +59,7 @@ struct _SwfdecSpriteFrame SwfdecSound *sound_head; /* sound head for this frame */ int sound_skip; /* samples to skip - maybe even backwards */ SwfdecBuffer *sound_block; /* sound chunk to play here or NULL for none */ - unsigned int sound_samples; /* number of samples in this frame */ + guint sound_samples; /* number of samples in this frame */ GSList *sound; /* list of SwfdecSoundChunk events to start playing here */ /* visuals */ @@ -71,11 +71,11...

...%u frames\n", s->n_frames); - } else { - guint i, j, tag; - SwfdecBuffer *buffer; - SwfdecSound *sound = NULL; - - for (i = 0; i < s->n_frames; i++) { - SwfdecSpriteFrame *frame = &s->frames[i]; - if (frame->sound_head != sound && - frame->sound_block != NULL) { - sound = frame->sound_head; - for (j = i; j < s->n_frames; j++) { - SwfdecSpriteFrame *cur = &s->frames[i]; - if (cur->sound_head != sound) - break; - } - if (sound) - g_print (" %4u -%4u sound: %s %s\n", i, j, - get_audio_format_name (so...