From 9fccefe9496834ac94a372792ee3b126b5c184e7 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 17 May 2005 10:47:02 +0000 Subject: [PATCH] gst/: Fix passthrough in ffmpegcolorspace. Original commit message from CVS: * gst-libs/gst/audio/gstaudiofilter.c: (gst_audiofilter_link), (gst_audiofilter_chain): * gst-libs/gst/audio/gstaudiosink.c: (gst_audioringbuffer_get_type), (gst_audioringbuffer_class_init), (audioringbuffer_thread_func), (gst_audioringbuffer_init), (gst_audioringbuffer_acquire), (gst_audioringbuffer_release), (gst_audioringbuffer_play), (gst_audioringbuffer_stop), (gst_audioringbuffer_delay), (gst_audiosink_class_init), (gst_audiosink_create_ringbuffer): * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_chain), (gst_audio_convert_caps_remove_format_info), (gst_audio_convert_getcaps), (gst_audio_convert_setcaps), (gst_audio_convert_fixate), (gst_audio_convert_channels): * gst/ffmpegcolorspace/gstffmpegcolorspace.c: (gst_ffmpegcsp_getcaps), (gst_ffmpegcsp_configure_context), (gst_ffmpegcsp_setcaps), (gst_ffmpegcsp_chain): Fix passthrough in ffmpegcolorspace. Fix memset in audiosink on wrong memory. --- ChangeLog | 21 +++++++++++++++++++++ gst-libs/gst/audio/gstaudiosink.c | 2 +- gst/ffmpegcolorspace/gstffmpegcolorspace.c | 3 +-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b00c16..e290aa4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2005-05-17 Wim Taymans + + * gst-libs/gst/audio/gstaudiofilter.c: (gst_audiofilter_link), + (gst_audiofilter_chain): + * gst-libs/gst/audio/gstaudiosink.c: + (gst_audioringbuffer_get_type), (gst_audioringbuffer_class_init), + (audioringbuffer_thread_func), (gst_audioringbuffer_init), + (gst_audioringbuffer_acquire), (gst_audioringbuffer_release), + (gst_audioringbuffer_play), (gst_audioringbuffer_stop), + (gst_audioringbuffer_delay), (gst_audiosink_class_init), + (gst_audiosink_create_ringbuffer): + * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_chain), + (gst_audio_convert_caps_remove_format_info), + (gst_audio_convert_getcaps), (gst_audio_convert_setcaps), + (gst_audio_convert_fixate), (gst_audio_convert_channels): + * gst/ffmpegcolorspace/gstffmpegcolorspace.c: + (gst_ffmpegcsp_getcaps), (gst_ffmpegcsp_configure_context), + (gst_ffmpegcsp_setcaps), (gst_ffmpegcsp_chain): + Fix passthrough in ffmpegcolorspace. + Fix memset in audiosink on wrong memory. + 2005-05-16 David Schleef * gst/playback/gststreaminfo.c: (cb_probe): Port from GstData diff --git a/gst-libs/gst/audio/gstaudiosink.c b/gst-libs/gst/audio/gstaudiosink.c index a3c2e23..b924bed 100644 --- a/gst-libs/gst/audio/gstaudiosink.c +++ b/gst-libs/gst/audio/gstaudiosink.c @@ -255,7 +255,7 @@ gst_audioringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec) spec->segtotal++; buf->data = gst_buffer_new_and_alloc (spec->segtotal * spec->segsize); - memset (GST_BUFFER_DATA (buf), 0, GST_BUFFER_SIZE (buf)); + memset (GST_BUFFER_DATA (buf->data), 0, GST_BUFFER_SIZE (buf->data)); sink->thread = g_thread_create ((GThreadFunc) audioringbuffer_thread_func, buf, TRUE, diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c index c492cf7..61c388d 100644 --- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c +++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c @@ -254,8 +254,7 @@ gst_ffmpegcsp_setcaps (GstPad * pad, GstCaps * caps) otherpeer = gst_pad_get_peer (otherpad); if (otherpeer) { /* check passthrough */ - //if (gst_pad_accept_caps (otherpeer, caps)) { - if (FALSE) { + if (gst_pad_accept_caps (otherpeer, caps)) { *other_prefered = gst_caps_ref (caps); } else { GstCaps *othercaps; -- 2.7.4