search for: swfdec_sound_buffer_rend

...wfdecAudio * loop = event->loop + offset / event->n_samples; offset %= event->n_samples; - if (loop >= event->n_loops) - return; for (; loop < event->n_loops && n_samples > 0; loop++) { samples = MIN (n_samples, event->n_samples - offset); swfdec_sound_buffer_render (dest, event->decoded, event->decoded_format, diff-tree 9a75550335d3a4ea2276c7573634d12a81fc030b (from 45c38d22b5cca2eb87f7662a7156d6f36284de2e) Author: Benjamin Otte <otte at gnome.org> Date: Thu Oct 11 18:28:27 2007 +0200 return a correct number of remaining samples diff --g...

...Whoops, SEGV galore ahead :o diff --git a/libswfdec/swfdec_audio_event.c b/libswfdec/swfdec_audio_event.c index e0e5e93..7f85974 100644 --- a/libswfdec/swfdec_audio_event.c +++ b/libswfdec/swfdec_audio_event.c @@ -69,7 +69,7 @@ swfdec_audio_event_render (SwfdecAudio *audio, gint16* dest, swfdec_sound_buffer_render (dest, event->decoded, event->decoded_format, loop == 0 ? NULL : event->decoded, offset, samples); n_samples -= samples; - dest += samples * 4; + dest += samples * 2; offset = 0; } }

...wfdec_audio_decoder_get_format (flv->decoder)); if (start) { if (samples <= start) { start -= samples; @@ -157,7 +150,9 @@ swfdec_audio_flv_render (SwfdecAudio *au SWFDEC_LOG ("rendering %u samples", samples); } samples = MIN (samples, n_samples); - swfdec_sound_buffer_render (dest, buffer, flv->out, previous, start, samples); + swfdec_sound_buffer_render (dest, buffer, + swfdec_audio_decoder_get_format (flv->decoder), previous, start, + samples); start = 0; n_samples -= samples; dest += 2 * samples; @@ -175,12 +170,14 @@ swfdec_audio_flv_ite...

...9e89 Author: Benjamin Otte <otte at gnome.org> Date: Mon Oct 15 17:19:28 2007 +0200 that function is unused diff --git a/libswfdec/swfdec_sound.c b/libswfdec/swfdec_sound.c index f086849..8bf57e5 100644 --- a/libswfdec/swfdec_sound.c +++ b/libswfdec/swfdec_sound.c @@ -552,27 +552,3 @@ swfdec_sound_buffer_render (gint16 *dest, const SwfdecBuffer *source, } } -/** - * swfdec_sound_render: - * @sound: a #SwfdecSound - * @dest: target to add to - * @offset: offset in samples into the data - * @n_samples: amount of samples to render - * - * Renders the given sound onto the existing data in @dest. - **/...

http://bugs.freedesktop.org/show_bug.cgi?id=13167 Summary: crash firefox if you close tab while playing flash files Product: swfdec Version: unspecified Platform: Other OS/Version: All Status: NEW Severity: normal Priority: medium Component: library AssignedTo: swfdec at lists.freedesktop.org

...gfaults with quite some Flash movies. And it wasn't ALSA's fault, I should stop blaming anything on ALSA... diff --git a/libswfdec/swfdec_sound.c b/libswfdec/swfdec_sound.c index 7f302c1..85e3bb8 100644 --- a/libswfdec/swfdec_sound.c +++ b/libswfdec/swfdec_sound.c @@ -518,10 +518,10 @@ swfdec_sound_buffer_render (gint16 *dest src += channels * (offset / rate); offset %= rate; if (offset) { + offset = rate - offset; /* NB: dest will be pointing to uninitialized memory now */ dest -= offset * 2; n_samples += offset; - offset = rate - offset; } /* this is almost the same...

...unc_start_sound (SwfdecSwfDecoder * int tag_func_define_button_sound (SwfdecSwfDecoder * s) { - unsigned int i; - unsigned int id; + guint i; + guint id; SwfdecButton *button; id = swfdec_bits_get_u16 (&s->b); @@ -500,7 +500,7 @@ swfdec_sound_buffer_get_n_samples (const void swfdec_sound_buffer_render (gint16 *dest, const SwfdecBuffer *source, SwfdecAudioOut format, const SwfdecBuffer *previous, - unsigned int offset, unsigned int n_samples) + guint offset, guint n_samples) { guint i, j; guint channels = SWFDEC_AUDIO_OUT_N_CHANNELS (format); @@ -611,7 +611,7 @@ swfdec_sound...

...->draws, g_object_ref (style->draw)); } else { SWFDEC_WARNING ("linestyle %u has no path", i); diff --git a/libswfdec/swfdec_sound.c b/libswfdec/swfdec_sound.c index dffe212..ef0641e 100644 --- a/libswfdec/swfdec_sound.c +++ b/libswfdec/swfdec_sound.c @@ -549,9 +549,9 @@ swfdec_sound_buffer_render (gint16 *dest, const SwfdecBuffer *source, } } if (channels == 2) { - swfdec_sound_buffer_render_stereo (dest, (const gint16 *) source->data, offset, n_samples, rate); + swfdec_sound_buffer_render_stereo (dest, (const void *) source->data, offset, n_samples, rate); } els...

...unc_start_sound (SwfdecSwfDecoder * int tag_func_define_button_sound (SwfdecSwfDecoder * s) { - unsigned int i; - unsigned int id; + guint i; + guint id; SwfdecButton *button; id = swfdec_bits_get_u16 (&s->b); @@ -500,7 +500,7 @@ swfdec_sound_buffer_get_n_samples (const void swfdec_sound_buffer_render (gint16 *dest, const SwfdecBuffer *source, SwfdecAudioOut format, const SwfdecBuffer *previous, - unsigned int offset, unsigned int n_samples) + guint offset, guint n_samples) { guint i, j; guint channels = SWFDEC_AUDIO_OUT_N_CHANNELS (format); @@ -611,7 +611,7 @@ swfdec_sound...

...und *sound, gint16 *dest, unsigned int offset, unsigned int n_samples) { + SwfdecBuffer *buffer; + SwfdecAudioOut format; g_return_if_fail (SWFDEC_IS_SOUND (sound)); - g_return_if_fail (sound->decoded != NULL); + /* FIXME: I need a return_if_fail for !created_by_define_sound */ - swfdec_sound_buffer_render (dest, sound->decoded, sound->decoded_format, + buffer = swfdec_sound_get_decoded (sound, &format); + if (buffer == NULL) + return; + swfdec_sound_buffer_render (dest, buffer, format, NULL, offset, n_samples); } diff --git a/libswfdec/swfdec_sound.h b/libswfdec/swfdec_so...