search for: gint16

...fdec/swfdec_codec_adpcm.c +++ b/libswfdec/swfdec_codec_adpcm.c @@ -79,7 +79,7 @@ swfdec_audio_decoder_adpcm_decode_chunk (SwfdecBits *bits, guint n_bits, guint c len = swfdec_bits_left (bits) / channels / n_bits; len = MIN (len, 4095); ret = swfdec_buffer_new_and_alloc ((len + 1) * sizeof (gint16) * channels); - out = (gint16 *) ret->data; + out = (gint16 *) (void *) ret->data; /* output initial value */ SWFDEC_LOG ("decoding %u samples", len + 1); for (ch = 0; ch < channels; ch++) diff --git a/libswfdec/swfdec_codec_audio.c b/libswfdec/swfdec_codec_audio.c ind...

...&data[32] = GUINT16_TO_LE (i); + /* bytes per second */ + i *= swfdec_audio_format_get_rate (format); + *(guint32 *) &data[28] = GUINT32_TO_LE (i); + *(guint32 *) &data[40] = GUINT32_TO_LE (buffer->length); data += 44; - for (i = 0; i < buffer->length; i += 2) { - *(gint16 *) (data + i) = GINT16_TO_LE (*(gint16* )(buffer->data + i)); + if (swfdec_audio_format_is_16bit (format)) { + for (i = 0; i < buffer->length; i += 2) { + *(gint16 *) (data + i) = GINT16_TO_LE (*(gint16* )(buffer->data + i)); + } + } else { + memcpy (data, buffer->dat...

...came from + * + * Compares the 2 buffers for every 5.5kHz and complains with a useful + * error message if they don't match. + * + * Returns: TRUE if the 2 files are equal + **/ static gboolean audio_diff (SwfdecBuffer *compare, SwfdecBuffer *original, const char *filename) { - guint i; - gint16 *comp_data, *org_data; + guint i, length; + gint16 *comp_data, *comp_end, *org_data; /* must hold since we are rendering it */ - g_assert (compare->length % 2 == 0); - if (original->length % 2 != 0) { + g_assert (compare->length % 4 == 0); + if (original->length % 4 != 0) {...

libswfdec/swfdec_audio_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9ff9f7c59692d71e905abc09108b22f0b4780092 Author: Benjamin Otte <otte at gnome.org> Date: Tue Oct 30 11:47:55 2007 +0100 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, gi...

...nvelope[pos].volume[channel] * (offset / distance)) / 32768.0; + return event->envelope[pos - 1].volume[channel] * (1 - offset / distance) + + event->envelope[pos].volume[channel] * (offset / distance); } static void @@ -119,13 +119,13 @@ swfdec_audio_event_render (SwfdecAudio *audio, gint16* dest, guint start, event->envelope[pos].offset <= global_offset + (i / 2)) pos++; if (channels == 1) { - dest[i] *= swfdec_audio_event_get_envelop_volume (event, pos, + dest[i] *= (swfdec_audio_event_get_envelop_volume (event, pos, global_offset + (i / 2), 0) * 0....

...n width, SwfdecAudioOut format) -{ - guint ret = format; - if (!width) - ret |= U8_FLAG; - return GUINT_TO_POINTER (ret); -} - -static SwfdecBuffer * -swfdec_codec_uncompressed_decode_8bit (SwfdecBuffer *buffer) -{ - SwfdecBuffer *ret = swfdec_buffer_new_and_alloc (buffer->length * 2); - gint16 *out = (gint16 *) ret->data; - guint8 *in = buffer->data; - guint count = buffer->length; - guint i; - - for (i = 0; i < count; i++) { - *out = ((gint16) *in << 8) ^ (-1); - out++; - in++; - } - return ret; -} - -static SwfdecBuffer * -swfdec_codec_uncompressed_deco...

...< 2 && ogg_sync_pageout(&od.oy, &od.og) == 1) { @@ -219,9 +219,11 @@ vorbis_synthesis(&od.vb, &od.op); vorbis_synthesis_blockin(&od.vd, &od.vb); if((samples = vorbis_synthesis_pcmout(&od.vd, &pcm)) > 0) { + gint16 *outptr = pcmout; + for(s = 0; s < samples; s++) for(c = 0; c < od.vi.channels; c++) - pcmout[(s * od.vi.channels + c) * sizeof(gshort)] = pcm[c][s] * 32767; + *(outptr++) = pcm[c][s] * 32767; vorbis_audio_out(...

...lt;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. - **/ -void -sw...

...remove audio when buffering and no audio was available diff --git a/swfdec/swfdec_audio_stream.c b/swfdec/swfdec_audio_stream.c index acdef91..62bff62 100644 --- a/swfdec/swfdec_audio_stream.c +++ b/swfdec/swfdec_audio_stream.c @@ -120,24 +120,25 @@ swfdec_audio_stream_render (SwfdecAudio *audio, gint16* dest, return rendered - start; } -static void +static gboolean swfdec_audio_stream_check_buffering (SwfdecAudioStream *stream) { SwfdecAudioStreamClass *klass; SwfdecBuffer *buffer; - if (!stream->buffering) - return; + if (!stream->buffering || stream->done) + ret...

...ipt.c index b736136..8f86eea 100644 --- a/libswfdec/swfdec_script.c +++ b/libswfdec/swfdec_script.c @@ -776,7 +776,7 @@ swfdec_action_jump (JSContext *cx, guint SWFDEC_ERROR ("Jump action length invalid (is %u, should be 2", len); return JS_FALSE; } - cx->fp->pc += 4 + GINT16_FROM_LE (*((gint16*) data)); + cx->fp->pc += 5 + GINT16_FROM_LE (*((gint16*) data)); return JS_TRUE; } @@ -792,7 +792,7 @@ swfdec_action_if (JSContext *cx, guint a d = swfdec_action_to_number (cx, cx->fp->sp[-1]); cx->fp->sp--; if (d != 0) - cx->fp->pc +...

...007 +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++) {

...coder * 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_buffer_re...

...h (gconstpointer bytecode, guint action, + const guint8 *data, guint len, gpointer user_data) +{ + State *state = user_data; + + if (action == 0x99 || action == 0x9d) { + guint offset = (guint8 *) bytecode - state->script->buffer->data; + guint jump_offset = offset + 5 + GINT16_FROM_LE (*((gint16 *) data)); + offset = lookup_offset (state->actions, offset); + jump_offset = lookup_offset (state->actions, jump_offset); + *((gint16 *) &state->buffer->data[offset + 3]) = + GINT16_TO_LE (jump_offset - offset - 5); + } + if (action == 0x8a || ac...

...t;Failed to get output buffer availability\n"); + free(frag); + return FALSE; + } + g_assert(spaceinfo.fragsize == stream->fragsize); + + if (spaceinfo.fragments == 0) + break; + + memset (frag, 0, stream->fragsize); + swfdec_audio_render (stream->audio, (gint16 *)frag, stream->offset, + stream->fragsize / SAMPLESIZE / CHANNELS); + + ret = write (stream->dsp_fd, frag, stream->fragsize); + if (ret != stream->fragsize) { + g_printerr ("Failed to write fragment\n"); + free(frag); + return FALSE; + } + + s...

...coder * 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_buffer_re...

...h 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 as the cha...

...swfdec_audio_format_get_rate (format); - *(guint32 *) (void *) &data[28] = GUINT32_TO_LE (i); - *(guint32 *) (void *) &data[40] = GUINT32_TO_LE (buffer->length); - data += 44; - if (swfdec_audio_format_is_16bit (format)) { - for (i = 0; i < buffer->length; i += 2) { - *(gint16 *) (void *) (data + i) = GINT16_TO_LE (*(gint16* ) (void *) (buffer->data + i)); - } - } else { - memcpy (data, buffer->data, buffer->length); - } - return wav; -} - -static gboolean -export_sound (SwfdecSound *sound, const char *filename) -{ - GError *error = NULL; - SwfdecBuff...

...d to allocate fragment of size %d\n", bytes); + return; + } + + /* Set up our fragment and render swfdec's audio into it. The swfdec audio + * decoder renders deltas from the existing data in the fragment. + */ + memset (frag, 0, bytes); + swfdec_audio_render (stream->audio, (gint16 *)frag, stream->offset, + samples); + + /* Send the new fragment out the PA stream */ + err = pa_stream_write (pa, frag, bytes, NULL, 0, PA_SEEK_RELATIVE); + if (err != 0) { + g_printerr ("Failed to write fragment to PA stream: %s\n", + pa_strerror(pa_context_errno(strea...

...: JSVAL_FALSE; + return JS_TRUE; +} + +static void +swfdec_action_jump (SwfdecAsContext *cx, guint action, const guint8 *data, guint len) +{ + if (len != 2) { + SWFDEC_ERROR ("Jump action length invalid (is %u, should be 2", len); + return JS_FALSE; + } + cx->fp->pc += 5 + GINT16_FROM_LE (*((gint16*) data)); + return JS_TRUE; +} + +static void +swfdec_action_if (SwfdecAsContext *cx, guint action, const guint8 *data, guint len) +{ + double d; + + if (len != 2) { + SWFDEC_ERROR ("Jump action length invalid (is %u, should be 2", len); + return JS_FALSE; +...

...double y, int button); +gboolean swfdec_player_key_press (SwfdecPlayer * player, + SwfdecKey key); +gboolean swfdec_player_key_release (SwfdecPlayer * player, + SwfdecKey key); /* audio - see swfdec_audio.c */ void swfdec_player_render_audio (SwfdecPlayer * player, gint16 * dest, diff --git a/libswfdec/swfdec_player_internal.h b/libswfdec/swfdec_player_internal.h index 0667e20..b02e573 100644 --- a/libswfdec/swfdec_player_internal.h +++ b/libswfdec/swfdec_player_internal.h @@ -121,6 +121,9 @@ struct _SwfdecPlayerClass void (* advance) (SwfdecPlayer * player,...