From 6ac43533191e2dbd8fce778344e14dae46caa09b Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 7 Jan 2004 13:18:08 +0000 Subject: Fix for instantiate-test (see core). Also remove dead code from jpegenc (which still needs fixing, but that's lower o... Original commit message from CVS: 2004-01-07 Ronald Bultje * ext/audiofile/gstafsink.c: (gst_afsink_init), (gst_afsink_chain), (gst_afsink_handle_event): * ext/jpeg/gstjpegenc.c: (gst_jpegenc_init): * gst/avi/gstavimux.c: (gst_avimux_request_new_pad): * sys/dxr3/dxr3audiosink.c: (dxr3audiosink_init): * sys/dxr3/dxr3spusink.c: (dxr3spusink_init): * sys/dxr3/dxr3videosink.c: (dxr3videosink_init): Fix for instantiate-test (see core). Also remove dead code from jpegenc (which still needs fixing, but that's lower on my TODO list...). * sys/v4l2/gstv4l2src.c: (gst_v4l2src_getcaps): Never return NULL as caps. --- ext/jpeg/gstjpegenc.c | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'ext') diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c index 1be4f36a..853e09eb 100644 --- a/ext/jpeg/gstjpegenc.c +++ b/ext/jpeg/gstjpegenc.c @@ -53,8 +53,6 @@ static void gst_jpegenc_init (GstJpegEnc *jpegenc); static void gst_jpegenc_chain (GstPad *pad, GstData *_data); static GstPadLinkReturn gst_jpegenc_link (GstPad *pad, const GstCaps *caps); -static GstData *gst_jpegenc_get (GstPad *pad); - static void gst_jpegenc_resync (GstJpegEnc *jpegenc); static GstElementClass *parent_class = NULL; @@ -164,7 +162,6 @@ gst_jpegenc_init (GstJpegEnc *jpegenc) gst_element_add_pad(GST_ELEMENT(jpegenc),jpegenc->sinkpad); gst_pad_set_chain_function(jpegenc->sinkpad,gst_jpegenc_chain); gst_pad_set_link_function(jpegenc->sinkpad, gst_jpegenc_link); - gst_pad_set_get_function(jpegenc->sinkpad,gst_jpegenc_get); jpegenc->srcpad = gst_pad_new("src",GST_PAD_SRC); gst_element_add_pad(GST_ELEMENT(jpegenc),jpegenc->srcpad); @@ -276,31 +273,6 @@ gst_jpegenc_resync (GstJpegEnc *jpegenc) GST_DEBUG ("gst_jpegenc_resync: resync done"); } -static GstData* -gst_jpegenc_get (GstPad *pad) -{ - GstJpegEnc *jpegenc; - GstBuffer *newbuf; - - GST_DEBUG ("gst_jpegenc_chain: pull buffer"); - - g_return_val_if_fail (pad != NULL, NULL); - g_return_val_if_fail (GST_IS_PAD (pad), NULL); - - jpegenc = GST_JPEGENC (GST_OBJECT_PARENT (pad)); - - if (jpegenc->buffer == NULL || GST_BUFFER_REFCOUNT_VALUE(jpegenc->buffer) != 1) { - if (jpegenc->buffer) gst_buffer_unref(jpegenc->buffer); - GST_DEBUG ("gst_jpegenc_chain: new buffer"); - newbuf = jpegenc->buffer = gst_buffer_new(); - GST_BUFFER_DATA(newbuf) = g_malloc(jpegenc->bufsize); - GST_BUFFER_SIZE(newbuf) = jpegenc->bufsize; - } - gst_buffer_ref(jpegenc->buffer); - - return GST_DATA (jpegenc->buffer); -} - static void gst_jpegenc_chain (GstPad *pad, GstData *_data) { -- cgit