search for: decoded_format

...x 352d6ae..64e22a3 100644 --- a/libswfdec/swfdec_sound.c +++ b/libswfdec/swfdec_sound.c @@ -194,6 +194,7 @@ swfdec_sound_get_decoded (SwfdecSound *sound, SwfdecAudioFormat *format) while ((tmp = swfdec_audio_decoder_pull (decoder))) { swfdec_buffer_queue_push (queue, tmp); } + sound->decoded_format = swfdec_audio_decoder_get_format (decoder); swfdec_audio_decoder_free (decoder); depth = swfdec_buffer_queue_get_depth (queue); if (depth == 0) { @@ -204,7 +205,6 @@ swfdec_sound_get_decoded (SwfdecSound *sound, SwfdecAudioFormat *format) tmp = swfdec_buffer_queue_pull (queue, depth);...

...to write out the stream data to stdout - nice way to get an mp3 file :) */ //write (1, (void *) chunk->data, chunk->length); @@ -208,7 +208,7 @@ swfdec_sound_get_decoded (SwfdecSound *sound, SwfdecAudioFormat *format) sample_bytes = swfdec_audio_format_get_bytes_per_sample (sound->decoded_format); n_samples = sound->n_samples / swfdec_audio_format_get_granularity (sound->decoded_format); - SWFDEC_LOG ("after decoding, got %u samples, should get %u and skip %u", + SWFDEC_LOG ("after decoding, got %"G_GSIZE_FORMAT" samples, should get %u and skip %u&quo...

...c == NULL) + codec = swfdec_codec_get_audio (sound->format); + if (codec == NULL) return NULL; - decoder = swfdec_sound_init_decoder (sound); + decoder = swfdec_audio_codec_init (codec, sound->width, sound->original_format); if (decoder == NULL) return NULL; - sound->decoded_format = swfdec_sound_get_decoder_format (sound, decoder); + sound->decoded_format = swfdec_audio_codec_get_format (codec, decoder); sample_bytes = 2 * SWFDEC_AUDIO_OUT_N_CHANNELS (sound->decoded_format); /* FIXME: The size is only a guess */ swfdec_cached_load (SWFDEC_CACHED (sound), soun...

...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 --git a/libswfdec/swfdec_audio_event.c b/libswfdec/swfde...

...c_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; } }

...codec == NULL) - return NULL; - decoder = swfdec_audio_codec_init (codec, sound->format, sound->width, sound->original_format); + decoder = swfdec_audio_decoder_new (sound->format, sound->width, sound->original_format); if (decoder == NULL) return NULL; - sound->decoded_format = swfdec_audio_codec_get_format (codec, decoder); + sound->decoded_format = swfdec_audio_decoder_get_format (decoder); sample_bytes = 2 * SWFDEC_AUDIO_OUT_N_CHANNELS (sound->decoded_format); /* FIXME: The size is only a guess */ swfdec_cached_load (SWFDEC_CACHED (sound), sound->n...

...d *s if (codec == NULL) return NULL; - decoder = swfdec_audio_codec_init (codec, sound->width, sound->original_format); + decoder = swfdec_audio_codec_init (codec, sound->format, sound->width, sound->original_format); if (decoder == NULL) return NULL; sound->decoded_format = swfdec_audio_codec_get_format (codec, decoder); diff --git a/libswfdec/swfdec_video.c b/libswfdec/swfdec_video.c index a044606..70afa13 100644 --- a/libswfdec/swfdec_video.c +++ b/libswfdec/swfdec_video.c @@ -127,7 +127,7 @@ swfdec_video_input_new (SwfdecVideo *vid return NULL; input = g_...

...otal number of samples when decoded to 44100kHz */ - unsigned int skip; /* samples to skip at start */ + guint n_samples; /* total number of samples when decoded to 44100kHz */ + guint skip; /* samples to skip at start */ SwfdecBuffer * encoded; /* encoded data */ SwfdecAudioOut decoded_format; /* format of decoded data */ @@ -89,14 +89,14 @@ int tag_func_define_button_sound (Swfdec void swfdec_sound_render (SwfdecSound * sound, gint16 * dest, - unsigned int offset, - unsigned int len); + guint offset, + guint len); void swfdec_s...

...sound buffer may be bigger due to mp3 not having sample boundaries */ - if (tmp->length > sound->n_samples * sample_bytes) { - SwfdecBuffer *tmp2 = swfdec_buffer_new_subbuffer (tmp, 0, sound->n_samples * sample_bytes); + if (tmp->length * SWFDEC_AUDIO_OUT_GRANULARITY (sound->decoded_format) + > sound->n_samples * sample_bytes) { + SwfdecBuffer *tmp2 = swfdec_buffer_new_subbuffer (tmp, 0, + sound->n_samples * sample_bytes / SWFDEC_AUDIO_OUT_GRANULARITY (sound->decoded_format)); swfdec_buffer_unref (tmp); tmp = tmp2; } - if (tmp->length < sound...

...otal number of samples when decoded to 44100kHz */ - unsigned int skip; /* samples to skip at start */ + guint n_samples; /* total number of samples when decoded to 44100kHz */ + guint skip; /* samples to skip at start */ SwfdecBuffer * encoded; /* encoded data */ SwfdecAudioOut decoded_format; /* format of decoded data */ @@ -89,14 +89,14 @@ int tag_func_define_button_sound (Swfdec void swfdec_sound_render (SwfdecSound * sound, gint16 * dest, - unsigned int offset, - unsigned int len); + guint offset, + guint len); void swfdec_s...