search for: swfdecaudiocodec

...| 3 ++- 34 files changed, 141 insertions(+), 95 deletions(-) New commits: commit 00ff0677e32eda7c9cd22d807c2ab71b7d92ebb6 Author: Pekka Lampila <pekka.lampila at iki.fi> Date: Thu Nov 8 12:09:18 2007 +0200 Add warnings flags: -Wswitch-enum -Wswitch-default Remove SwfdecAudioCodec and SwfdecVideoCodec enums and use guint with defines instead diff --git a/configure.ac b/configure.ac index fc48f5c..882a129 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl if we support them, we set them unconditionally AS_COMPILER_FLAG(-Wall, GLOBAL_CFLAGS="-Wall&qu...

..." and "gst". Other values are ignored. diff --git a/libswfdec/swfdec_codec_audio.c b/libswfdec/swfdec_codec_audio.c index a42dba8..bdf33f3 100644 --- a/libswfdec/swfdec_codec_audio.c +++ b/libswfdec/swfdec_codec_audio.c @@ -109,6 +109,35 @@ swfdec_audio_decoder_uncompressed_new (SwfdecAudioCodec type, SwfdecAudioFormat /*** PUBLIC API ***/ +static SwfdecAudioDecoder * +swfdec_audio_decoder_builtin_new (SwfdecAudioCodec codec, SwfdecAudioFormat format) +{ + SwfdecAudioDecoder *ret; + + ret = swfdec_audio_decoder_uncompressed_new (codec, format); + if (ret == NULL) + ret = swfdec_...

...codec_get_format (stream->codec, stream->decoder); swfdec_audio_add (SWFDEC_AUDIO (stream), player); diff --git a/libswfdec/swfdec_codec.c b/libswfdec/swfdec_codec.c index 1875572..8affa1c 100644 --- a/libswfdec/swfdec_codec.c +++ b/libswfdec/swfdec_codec.c @@ -34,19 +34,17 @@ extern const SwfdecAudioCodec swfdec_cod #endif #ifdef HAVE_FFMPEG -extern const SwfdecAudioCodec swfdec_codec_ffmpeg_adpcm; -extern const SwfdecAudioCodec swfdec_codec_ffmpeg_mp3; -extern const SwfdecVideoCodec swfdec_codec_ffmpeg_h263; -extern const SwfdecVideoCodec swfdec_codec_ffmpeg_screen; +extern const SwfdecAudioCod...

...bswfdec/swfdec_audio_flv.h index 5a41edc..8e4c5a5 100644 --- a/libswfdec/swfdec_audio_flv.h +++ b/libswfdec/swfdec_audio_flv.h @@ -41,15 +41,13 @@ struct _SwfdecAudioFlv SwfdecFlvDecoder * flvdecoder; /* decoder we play back */ SwfdecAudioFormat format; /* codec format of audio */ - const SwfdecAudioCodec *codec; /* codec in use */ gboolean width; /* width of audio */ SwfdecAudioOut in; /* input format of data */ - SwfdecAudioOut out; /* output format of codec */ - gpointer decoder; /* decoder used for playback */ + SwfdecAudioDecoder * decoder; /* decoder used for playback */...

...ot;, &channels)) { + SWFDEC_ERROR ("invalid caps"); + player->error = TRUE; + return FALSE; + } + + player->decoder.format = swfdec_audio_format_new (rate, channels, depth == 16 ? TRUE : FALSE); + return TRUE; +} + SwfdecAudioDecoder * swfdec_audio_decoder_gst_new (SwfdecAudioCodec type, SwfdecAudioFormat format) { @@ -389,7 +423,7 @@ swfdec_audio_decoder_gst_new (SwfdecAudioCodec type, SwfdecAudioFormat format) g_assert (srccaps); player = g_slice_new0 (SwfdecGstAudio); - player->decoder.format = swfdec_audio_format_new (44100, 2, TRUE); + player->decoder.fo...

...swfdec_codec_video.h \ swfdec_color.h \ swfdec_connection.h \ swfdec_debug.h \ diff --git a/libswfdec/swfdec_codec.c b/libswfdec/swfdec_codec.c index 8affa1c..32ad9cc 100644 --- a/libswfdec/swfdec_codec.c +++ b/libswfdec/swfdec_codec.c @@ -27,7 +27,6 @@ /*** DECODER LIST ***/ extern const SwfdecAudioCodec swfdec_codec_adpcm; -extern const SwfdecVideoCodec swfdec_codec_screen; #ifdef HAVE_MAD extern const SwfdecAudioCodec swfdec_codec_mad; @@ -35,11 +34,8 @@ extern const SwfdecAudioCodec swfdec_cod #ifdef HAVE_FFMPEG extern const SwfdecAudioCodec swfdec_codec_ffmpeg_audio; -extern const Swfde...

...S) -lz \ + $(MAD_LIBS) $(FFMPEG_LIBS) $(GST_LIBS) public_headers = \ swfdec.h \ diff --git a/libswfdec/swfdec_codec.c b/libswfdec/swfdec_codec.c index d0f048f..1875572 100644 --- a/libswfdec/swfdec_codec.c +++ b/libswfdec/swfdec_codec.c @@ -27,6 +27,7 @@ /*** DECODER LIST ***/ extern const SwfdecAudioCodec swfdec_codec_adpcm; +extern const SwfdecVideoCodec swfdec_codec_screen; #ifdef HAVE_MAD extern const SwfdecAudioCodec swfdec_codec_mad; @@ -39,7 +40,7 @@ extern const SwfdecVideoCodec swfdec_cod extern const SwfdecVideoCodec swfdec_codec_ffmpeg_screen; #endif -extern const SwfdecVideoCodec...

...0 indent diff --git a/libswfdec/swfdec_codec_audio.h b/libswfdec/swfdec_codec_audio.h index 157eadf..8a0f4f1 100644 --- a/libswfdec/swfdec_codec_audio.h +++ b/libswfdec/swfdec_codec_audio.h @@ -49,7 +49,7 @@ struct _SwfdecAudioDecoder { SwfdecAudioDecoder * swfdec_audio_decoder_new (SwfdecAudioCodec codec, SwfdecAudioFormat format); void swfdec_audio_decoder_free (SwfdecAudioDecoder * decoder); -SwfdecAudioFormat swfdec_audio_decoder_get_format (SwfdecAudioDecoder * decoder); +SwfdecAudioFormat swfdec_audio_decoder_get_format (SwfdecAudioDecoder * decoder); void swfdec_au...

...restart Merge branch 'master' of ssh://company@git.freedesktop.org/git/swfdec Shift in the right direction (oops) DO the right check when testing if the file is playable Merge branch 'master' of ssh://company@git.freedesktop.org/git/swfdec s/SwfdecCodec/SwfdecAudioCodec/ and introduce SwfdecVideoCodec add swfdec_bits_get_bu16 Make the z_stream part of the SwfdecDecoder struct rate == 0 is allowed now fix wrong type in macros remove \n from debugging messages fix RGB555 images append the right SwfdecContent to the list...

...8 2007 +0100 make GStreamer the default backend diff --git a/libswfdec/swfdec_codec_audio.c b/libswfdec/swfdec_codec_audio.c index 5e8b9aa..77ae76b 100644 --- a/libswfdec/swfdec_codec_audio.c +++ b/libswfdec/swfdec_codec_audio.c @@ -126,12 +126,12 @@ struct { SwfdecAudioDecoder * (* func) (SwfdecAudioCodec, SwfdecAudioFormat); } audio_codecs[] = { { "builtin", swfdec_audio_decoder_builtin_new }, -#ifdef HAVE_MAD - { "mad", swfdec_audio_decoder_mad_new }, -#endif #ifdef HAVE_GST { "gst", swfdec_audio_decoder_gst_new }, #endif +#ifdef HAVE_MAD + { "mad&quot...

...*player = (SwfdecGstAudio *) dec; + GstBuffer *buf; + + if (player->error) + return NULL; + buf = swfdec_gst_decoder_pull (&player->resample); + if (buf == NULL) + return NULL; + return swfdec_buffer_new_from_gst (buf); } SwfdecAudioDecoder * swfdec_audio_decoder_gst_new (SwfdecAudioCodec type, SwfdecAudioFormat format) { SwfdecGstAudio *player; - GstElement *fakesrc, *fakesink, *decoder, *convert; - GstBus *bus; - GstCaps *caps; + GstCaps *srccaps, *sinkcaps; if (!gst_init_check (NULL, NULL, NULL)) return NULL; switch (type) { case SWFDEC_AUDIO_CODEC_MP3...

..._H_ #include <libswfdec/swfdec_audio_internal.h> +#include <libswfdec/swfdec_codec.h> G_BEGIN_DECLS @@ -42,6 +43,7 @@ struct _SwfdecAudioStream SwfdecSprite * sprite; /* sprite we're playing back */ SwfdecSound * sound; /* sound we're playing */ + const SwfdecAudioCodec *codec; /* codec used by this stream */ gpointer decoder; /* decoder used for this frame */ SwfdecAudioOut format; /* format used by decoder */ unsigned int playback_skip; /* number of samples to skip at the beginning of queue */ diff --git a/libswfdec/swfdec_sound.c b/libswfdec/swfdec_...

...mpile warnings in swfdec_video_decoder_new and swfdec_audio_decoder_new diff --git a/libswfdec/swfdec_codec_audio.c b/libswfdec/swfdec_codec_audio.c index bdf33f3..7c4ab8a 100644 --- a/libswfdec/swfdec_codec_audio.c +++ b/libswfdec/swfdec_codec_audio.c @@ -160,6 +160,7 @@ swfdec_audio_decoder_new (SwfdecAudioCodec codec, SwfdecAudioFormat format) list = g_getenv ("SWFDEC_CODEC"); if (list == NULL) { guint i; + ret = NULL; for (i = 0; audio_codecs[i].name != NULL; i++) { ret = audio_codecs[i].func (codec, format); if (ret) diff --git a/libswfdec/swfdec_codec_video....

...k_queue; /* all the samples we've decoded so far */ }; diff --git a/libswfdec/swfdec_audio_stream.h b/libswfdec/swfdec_audio_stream.h index 8758462..9d31b3c 100644 --- a/libswfdec/swfdec_audio_stream.h +++ b/libswfdec/swfdec_audio_stream.h @@ -46,9 +46,9 @@ struct _SwfdecAudioStream const SwfdecAudioCodec *codec; /* codec used by this stream */ gpointer decoder; /* decoder used for this frame */ SwfdecAudioOut format; /* format used by decoder */ - unsigned int playback_skip; /* number of samples to skip at the beginning of queue */ + guint playback_skip; /* number of samples to skip at...

...k_queue; /* all the samples we've decoded so far */ }; diff --git a/libswfdec/swfdec_audio_stream.h b/libswfdec/swfdec_audio_stream.h index 8758462..9d31b3c 100644 --- a/libswfdec/swfdec_audio_stream.h +++ b/libswfdec/swfdec_audio_stream.h @@ -46,9 +46,9 @@ struct _SwfdecAudioStream const SwfdecAudioCodec *codec; /* codec used by this stream */ gpointer decoder; /* decoder used for this frame */ SwfdecAudioOut format; /* format used by decoder */ - unsigned int playback_skip; /* number of samples to skip at the beginning of queue */ + guint playback_skip; /* number of samples to skip at...

...G messages by default add tests for setTarget action changes fix swfdec_as_context_startup() to work on non-SwfdecPlayer objects giving VP6 a one-byte clamp size is NetStream specific, treat it like that. SwfdecVideoFormat => SwfdecVideoCodec SwfdecAudioFormat => SwfdecAudioCodec SwfdcAudioOut => SwfdecAudioFormat memleak rework video handling make GStreamer backend actually work, not just compile implement colorspace conversion without ffmpeg get rid of ffmpeg colorspace conversion completely make it compile again after name cha...