search for: swfdecvideocodec

...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", GLOBAL_CFLAGS=&q...

...72..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 SwfdecAudioCodec swfdec_codec_ffmpeg_audio; +extern const SwfdecVideoCodec swfdec_codec_ffmpeg_video; #endif -extern const SwfdecVideoCodec swfdec_codec_gst_h263; +extern const SwfdecVideoCodec swf...

...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 swfdec_codec_screen; +extern const SwfdecVideoCodec...

...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 SwfdecVideoCodec swfdec_codec_ffmpeg_video; #endif -e...

...b/libswfdec/swfdec_codec_video.c index e088d00..bdcce56 100644 --- a/libswfdec/swfdec_codec_video.c +++ b/libswfdec/swfdec_codec_video.c @@ -27,6 +27,32 @@ #include "swfdec_debug.h" #include "swfdec_internal.h" +static SwfdecVideoDecoder * +swfdec_video_decoder_builtin_new (SwfdecVideoCodec codec) +{ + SwfdecVideoDecoder *ret; + + ret = swfdec_video_decoder_screen_new (codec); + if (ret == NULL) + ret = swfdec_video_decoder_vp6_alpha_new (codec); + + return ret; +} + +struct { + const char * name; + SwfdecVideoDecoder * (* func) (SwfdecVideoCodec); +} video_codecs[] = { + {...

...ate: Mon Oct 29 23:27:50 2007 +0100 initialize video decoder as NULL diff --git a/libswfdec/swfdec_codec_gst.c b/libswfdec/swfdec_codec_gst.c index 35f00e5..2873e84 100644 --- a/libswfdec/swfdec_codec_gst.c +++ b/libswfdec/swfdec_codec_gst.c @@ -593,7 +593,7 @@ swfdec_video_decoder_gst_new (SwfdecVideoCodec codec) g_assert (srccaps); sinkcaps = swfdec_video_decoder_get_sink_caps (codec); - player = g_slice_new (SwfdecGstVideo); + player = g_slice_new0 (SwfdecGstVideo); player->decoder.decode = swfdec_video_decoder_gst_decode; player->decoder.free = swfdec_video_decoder_gst_free;

...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 get the next_event time before...

...fmpeg", swfdec_audio_decoder_ffmpeg_new }, #endif diff --git a/libswfdec/swfdec_codec_video.c b/libswfdec/swfdec_codec_video.c index 93bc6dd..bfde110 100644 --- a/libswfdec/swfdec_codec_video.c +++ b/libswfdec/swfdec_codec_video.c @@ -44,12 +44,12 @@ struct { SwfdecVideoDecoder * (* func) (SwfdecVideoCodec); } video_codecs[] = { { "builtin", swfdec_video_decoder_builtin_new }, -#ifdef HAVE_FFMPEG - { "ffmpeg", swfdec_video_decoder_ffmpeg_new }, -#endif #ifdef HAVE_GST { "gst", swfdec_video_decoder_gst_new }, #endif +#ifdef HAVE_FFMPEG + { "ffmpeg", s...

...lement *sink) -{ - GstCaps *caps; - - caps = g_object_get_data (G_OBJECT (sink), "swfdec-caps"); - g_assert (caps); - if (!gst_element_link_filtered (src, sink, caps)) { - SWFDEC_ERROR ("no delayed link"); - } -} - static GstCaps * swfdec_video_decoder_get_sink_caps (SwfdecVideoCodec codec) { @@ -613,84 +530,37 @@ SwfdecVideoDecoder * swfdec_video_decoder_gst_new (SwfdecVideoCodec codec) { SwfdecGstVideo *player; - GstElement *fakesrc, *fakesink, *decoder; - GstCaps *caps; + GstCaps *srccaps, *sinkcaps; if (!gst_init_check (NULL, NULL, NULL)) return NULL;...

...L; SWFDEC_LOG ("codecs limited to \"%s\"", list); diff --git a/libswfdec/swfdec_codec_video.c b/libswfdec/swfdec_codec_video.c index 291c24d..93bc6dd 100644 --- a/libswfdec/swfdec_codec_video.c +++ b/libswfdec/swfdec_codec_video.c @@ -80,7 +80,7 @@ swfdec_video_decoder_new (SwfdecVideoCodec codec) break; } } else { - char **split = g_strsplit (list, ":", -1); + char **split = g_strsplit (list, ",", -1); guint i, j; ret = NULL; SWFDEC_LOG ("codecs limited to \"%s\"", list); commit 9552b2f74398a8e75ba78153b779a27455a...

...i++) { ret = audio_codecs[i].func (codec, format); if (ret) diff --git a/libswfdec/swfdec_codec_video.c b/libswfdec/swfdec_codec_video.c index bdcce56..291c24d 100644 --- a/libswfdec/swfdec_codec_video.c +++ b/libswfdec/swfdec_codec_video.c @@ -73,6 +73,7 @@ swfdec_video_decoder_new (SwfdecVideoCodec codec) list = g_getenv ("SWFDEC_CODEC"); if (list == NULL) { guint i; + ret = NULL; for (i = 0; video_codecs[i].name != NULL; i++) { ret = video_codecs[i].func (codec); if (ret) commit 3247196e467bdeafa5414229bdfd4722ac071ce9 Author: Pekka Lampila <pe...

...using the new lookup magic disable WARNING 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 comple...