search for: swfdecaudio

...Don't return double from swfdec_audio_event_get_envelop_volume diff --git a/libswfdec/swfdec_audio_event.c b/libswfdec/swfdec_audio_event.c index 3c3b603..13fb588 100644 --- a/libswfdec/swfdec_audio_event.c +++ b/libswfdec/swfdec_audio_event.c @@ -50,32 +50,32 @@ swfdec_audio_event_iterate (SwfdecAudio *audio, guint remove) return 0; } -static double +static guint16 swfdec_audio_event_get_envelop_volume (SwfdecAudioEvent *event, guint pos, guint offset, guint channel) { double distance; - g_return_val_if_fail (SWFDEC_IS_AUDIO_EVENT (event), 1); - g_return_val_if_fail (pos &l...

...* Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <string.h> +#include "swfdec_audio_load.h" +#include "swfdec_debug.h" +#include "swfdec_sprite.h" +#include "swfdec_tag.h" + + +G_DEFINE_TYPE (SwfdecAudioLoad, swfdec_audio_load, SWFDEC_TYPE_AUDIO_STREAM) + +static void +swfdec_audio_load_dispose (GObject *object) +{ + SwfdecAudioLoad *stream = SWFDEC_AUDIO_LOAD (object); + + if (stream->load != NULL) { + g_object_unref (stream->load); + stream->load = NULL; + } + + G_OBJECT_CLASS...

...file was written + * for. + */ + +/*** DEFINITIONS ***/ + +struct _SwfdecPlayback { + SwfdecPlayer * player; + GList * streams; /* all Stream objects */ + GMainContext * context; /* context we work in */ +}; + +typedef struct { + SwfdecPlayback * sound; /* reference to sound object */ + SwfdecAudio * audio; /* the audio we play back */ + int dsp_fd; + int fragsize; /* Audio fragment size */ + GSource * source; /* source for writing data */ + guint offset; /* offset into sound */ +} Stream; + +/* Size of one of our audio samples, in bytes */ +#define SAMPLESIZE 2 +#define CHANNE...

...come to Linux sound in the 21st century. - */ - -/*** DEFINITIONS ***/ - -typedef struct { - SwfdecPlayer * player; - GList * streams; /* all Stream objects */ - GMainContext * context; /* context we work in */ -} Sound; - -typedef struct { - Sound * sound; /* reference to sound object */ - SwfdecAudio * audio; /* the audio we play back */ - snd_pcm_t * pcm; /* the pcm we play back to */ - GSource ** sources; /* sources for writing data */ - guint n_sources; /* number of sources */ - guint offset; /* offset into sound */ -} Stream; - -#define ALSA_TRY(func,msg) G_STMT_START{ \ - in...

...l Stream objects */ + GMainContext * context; /* glib context we work in */ + pa_glib_mainloop * pa_mainloop; /* PA to glib mainloop connection */ + pa_context * pa; /* PA context for sound rendering */ +}; + +typedef struct { + SwfdecPlayback * sound; /* reference to sound object */ + SwfdecAudio * audio; /* the audio we play back */ + guint offset; /* offset into sound */ + pa_stream * pa; /* PA stream */ + pa_cvolume volume; /* Volume control. Not yet used. */ + gboolean no_more; +} Stream; + +/* Size of one of our audio samples, in bytes */ +#define SAMPLESIZE 2 +#define C...

...matic server mode being disabled. diff --git a/libswfdec-gtk/swfdec_playback_pa.c b/libswfdec-gtk/swfdec_playback_pa.c index d47fcb4..825775b 100644 --- a/libswfdec-gtk/swfdec_playback_pa.c +++ b/libswfdec-gtk/swfdec_playback_pa.c @@ -163,6 +163,13 @@ swfdec_stream_open (SwfdecPlayback *sound, SwfdecAudio *audio) stream->audio = g_object_ref (audio); sound->streams = g_list_prepend (sound->streams, stream); + /* If we failed to initialize the context, don't try to create the stream. + * We still have to get put in the list, because swfdec_playback.c expects + * to find it i...

...e.org> Date: Thu Oct 11 18:37:42 2007 +0200 add deug message diff --git a/libswfdec/swfdec_audio_event.c b/libswfdec/swfdec_audio_event.c index a82182d..8520bf9 100644 --- a/libswfdec/swfdec_audio_event.c +++ b/libswfdec/swfdec_audio_event.c @@ -154,6 +154,7 @@ swfdec_audio_event_decode (SwfdecAudioEv } } event->n_samples = event->decoded->length / bytes_per_sample * granule; + SWFDEC_LOG ("total 44100Hz samples: %u", event->n_samples); } static SwfdecAudioEvent * diff-tree 40854374b86f321fb816ce505f2ef170f59dfaf1 (from 9a75550335d3a4ea2276c7573634d12a81fc...

...fdec_codec_video.h \ swfdec_color.h \ swfdec_connection.h \ diff --git a/libswfdec/swfdec_audio_flv.c b/libswfdec/swfdec_audio_flv.c index feb6b57..bdca2c2 100644 --- a/libswfdec/swfdec_audio_flv.c +++ b/libswfdec/swfdec_audio_flv.c @@ -35,10 +35,8 @@ swfdec_audio_flv_dispose (GObject *objec SwfdecAudioFlv *flv = SWFDEC_AUDIO_FLV (object); if (flv->decoder != NULL) { - SwfdecBuffer *buffer = swfdec_audio_codec_finish (flv->codec, flv->decoder); + swfdec_audio_decoder_free (flv->decoder); flv->decoder = NULL; - if (buffer) - swfdec_buffer_unref (buffer); }...

...0644 --- a/doc/swfdec-docs.sgml +++ b/doc/swfdec-docs.sgml @@ -8,6 +8,7 @@ <chapter> <title>Public API</title> + <xi:include href="xml/Enumerations.xml"/> <xi:include href="xml/SwfdecPlayer.xml"/> <xi:include href="xml/SwfdecAudio.xml"/> <xi:include href="xml/SwfdecBuffer.xml"/> diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt index 4a45ff4..e0bb55f 100644 --- a/doc/swfdec-sections.txt +++ b/doc/swfdec-sections.txt @@ -4,6 +4,7 @@ SwfdecAudio swfdec_audio_render <SUBSECTION St...

...come to Linux sound in the 21st century. - */ - -/*** DEFINITIONS ***/ - -typedef struct { - SwfdecPlayer * player; - GList * streams; /* all Stream objects */ - GMainContext * context; /* context we work in */ -} Sound; - -typedef struct { - Sound * sound; /* reference to sound object */ - SwfdecAudio * audio; /* the audio we play back */ - snd_pcm_t * pcm; /* the pcm we play back to */ - GSource ** sources; /* sources for writing data */ - guint n_sources; /* number of sources */ - guint offset; /* offset into sound */ -} Stream; - -#define ALSA_TRY(func,msg) G_STMT_START{ \ - in...

...uct _SwfdecPlayback { SwfdecPlayer * player; GList * streams; /* all Stream objects */ GMainContext * context; /* context we work in */ -} Sound; +}; typedef struct { - Sound * sound; /* reference to sound object */ + SwfdecPlayback * sound; /* reference to sound object */ SwfdecAudio * audio; /* the audio we play back */ snd_pcm_t * pcm; /* the pcm we play back to */ GSource ** sources; /* sources for writing data */ @@ -193,7 +193,7 @@ swfdec_stream_start (Stream *stream) } static void -swfdec_stream_open (Sound *sound, SwfdecAudio *audio) +swfdec_stream_open (S...

...we advance gint16, not guint8 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; } }

...on Oct 29 23:29:32 2007 +0200 Fix a crash when sound had no samples diff --git a/libswfdec/swfdec_audio_event.c b/libswfdec/swfdec_audio_event.c index 8520bf9..e0e5e93 100644 --- a/libswfdec/swfdec_audio_event.c +++ b/libswfdec/swfdec_audio_event.c @@ -59,6 +59,9 @@ swfdec_audio_event_render (SwfdecAudio *audio, gint16* dest, guint loop; guint samples; + if (event->n_samples == 0) + return; + loop = event->loop + offset / event->n_samples; offset %= event->n_samples; for (; loop < event->n_loops && n_samples > 0; loop++) {

...offset; + } // don't accept arguments when not constructing if (!cx->frame->construct) diff --git a/libswfdec/swfdec_audio.c b/libswfdec/swfdec_audio.c index f94ea53..e9a5e5f 100644 --- a/libswfdec/swfdec_audio.c +++ b/libswfdec/swfdec_audio.c @@ -92,6 +92,8 @@ swfdec_audio_init (SwfdecAudio *audio) void swfdec_audio_add (SwfdecAudio *audio, SwfdecPlayer *player) { + SwfdecPlayerPrivate *priv; + g_return_if_fail (SWFDEC_IS_AUDIO (audio)); g_return_if_fail (audio->player == NULL); if (player == NULL) @@ -100,7 +102,8 @@ swfdec_audio_add (SwfdecAudio *audio, SwfdecPlayer...

Hello, list ! Here is diff of changes, i had to make to get swfdec running on OpenBSD 4.2-current. Regards Valery. P.S. Please cc me, i am not subscribed to the list -------------- next part -------------- A non-text attachment was scrubbed... Name: swfdec.diff Type: application/octet-stream Size: 11628 bytes Desc: not available Url :

...akes up 150% of my time already. Cheers, Benjamin [1] http://gitweb.freedesktop.org/?p=swfdec.git;a=blob;f=libswfdec/swfdec_codec.h [2] http://brajeshwar.com/reference/as2/NetStream.html [3] http://brajeshwar.com/reference/as2/Sound.html [4] http://swfdec.freedesktop.org/documentation/swfdec/SwfdecAudio.html [5] http://swfdec.freedesktop.org/documentation/swfdec/SwfdecPlayer.html#SwfdecPlayer-audio-added [6] http://swfdec.freedesktop.org/documentation/swfdec/

...amp;movie->sprite->frames[mov->frame]; /* first start all event sounds */ /* FIXME: is this correct? */ - if (movie->sound_frame != movie->current_frame) { + if (movie->sound_frame != mov->frame) { for (walk = current->sound; walk; walk = walk->next) { SwfdecAudio *audio = swfdec_audio_event_new (player, walk->data); if (audio) @@ -290,8 +513,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)",...

...Date: Thu Oct 11 12:00:28 2007 +0200 fix lookup of files to compare with diff --git a/test/sound/sound.c b/test/sound/sound.c index 2053446..cdb6f01 100644 --- a/test/sound/sound.c +++ b/test/sound/sound.c @@ -95,8 +95,11 @@ typedef struct { static void audio_added (SwfdecPlayer *player, SwfdecAudio *audio, TestData *data) { - char *name = g_strdup_printf ("%s.%u.%u.raw", data->filename, data->current_frame, data->current_frame_audio); + char *basename = g_path_get_basename (data->filename); + char *name = g_strdup_printf ("%s.%u.%u.raw", basename, data->...

...vie at mouse, FALSE for movie's (0,0) */ SwfdecRect mouse_drag_rect; /* clipping rectangle for movements */ + double mouse_drag_x; /* offset of mouse in x direction */ + double mouse_drag_y; /* offset of mouse in y direction */ /* audio */ GList * audio; /* list of playing SwfdecAudio */

...mp;msecs, NULL); + swfdec_net_stream_video_goto (stream, msecs); + /* FIXME: this needs to be implemented correctly, but requires changes to audio handling: + * - creating a new audio stream will cause attachAudio scripts to lose information + * - implementing seek on audio stream requires a SwfdecAudio::changed signal so audio + * backends can react correctly. + */ + if (stream->audio) { + SWFDEC_WARNING ("FIXME: restarting audio after seek"); + swfdec_audio_remove (stream->audio); + g_object_unref (stream->audio); + stream->audio = swfdec_audio_flv_new (s...