summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2004-01-11 22:03:52 +0000
committerDavid Schleef <ds@schleef.org>2004-01-11 22:03:52 +0000
commit4ec54daec56cff8b5dec3138621b3d66e47d1ef9 (patch)
tree1f93f392a7cfbb7761f52a05a53d6846ac68ebe7
parent6d53140c73dae77bd15cdcbc28b35fbee2b0ddda (diff)
ext/divx/gstdivxenc.c: remove bogus gst_caps_is_fixed() test
Original commit message from CVS: * ext/divx/gstdivxenc.c: remove bogus gst_caps_is_fixed() test * gst/debug/efence.c: (gst_efence_chain), (gst_fenced_buffer_new), (gst_fenced_buffer_default_copy): Fix for rename of buffer private structure members. * gst/effectv/gstwarp.c: (gst_warptv_setup): Don't reset the time value during a resize/renegotiation. * gst/videofilter/gstvideofilter.c: (gst_videofilter_chain): use gst_pad_alloc_buffer(); * sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_get), (gst_v4lmjpegsrc_buffer_free): Fix for rename of buffer private structure members. * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_get), (gst_v4lsrc_buffer_free): Fix for rename of buffer private structure members. * sys/ximage/ximagesink.c: (gst_ximagesink_chain), (gst_ximagesink_buffer_free), (gst_ximagesink_buffer_alloc): Fix for rename of buffer private structure members. * sys/xvimage/xvimagesink.c: (gst_xvimagesink_chain), (gst_xvimagesink_buffer_free), (gst_xvimagesink_buffer_alloc): Fix for rename of buffer private structure members.
-rw-r--r--ChangeLog22
-rw-r--r--gst/debug/efence.c12
-rw-r--r--gst/effectv/gstwarp.c3
-rw-r--r--gst/videofilter/gstvideofilter.c7
4 files changed, 34 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index d484c0a9..bac54f60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2004-01-11 David Schleef <ds@schleef.org>
+
+ * ext/divx/gstdivxenc.c: remove bogus gst_caps_is_fixed() test
+ * gst/debug/efence.c: (gst_efence_chain), (gst_fenced_buffer_new),
+ (gst_fenced_buffer_default_copy): Fix for rename of buffer private
+ structure members.
+ * gst/effectv/gstwarp.c: (gst_warptv_setup): Don't reset the time
+ value during a resize/renegotiation.
+ * gst/videofilter/gstvideofilter.c: (gst_videofilter_chain): use
+ gst_pad_alloc_buffer();
+ * sys/v4l/gstv4lmjpegsrc.c: (gst_v4lmjpegsrc_get),
+ (gst_v4lmjpegsrc_buffer_free): Fix for rename of buffer private
+ structure members.
+ * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_get), (gst_v4lsrc_buffer_free):
+ Fix for rename of buffer private structure members.
+ * sys/ximage/ximagesink.c: (gst_ximagesink_chain),
+ (gst_ximagesink_buffer_free), (gst_ximagesink_buffer_alloc):
+ Fix for rename of buffer private structure members.
+ * sys/xvimage/xvimagesink.c: (gst_xvimagesink_chain),
+ (gst_xvimagesink_buffer_free), (gst_xvimagesink_buffer_alloc):
+ Fix for rename of buffer private structure members.
+
2004-01-11 Arwed v. Merkatz <v.merkatz@gmx.net>
reviewed by: David Schleef <ds@schleef.org>
diff --git a/gst/debug/efence.c b/gst/debug/efence.c
index 56b8ba76..cee04c3e 100644
--- a/gst/debug/efence.c
+++ b/gst/debug/efence.c
@@ -213,8 +213,8 @@ gst_efence_chain (GstPad *pad, GstData *_data)
GST_BUFFER_TIMESTAMP (copy) = GST_BUFFER_TIMESTAMP (buffer);
GST_BUFFER_DURATION (copy) = GST_BUFFER_DURATION (buffer);
GST_BUFFER_OFFSET (copy) = GST_BUFFER_OFFSET (buffer);
- GST_BUFFER_BUFFERPOOL (copy) = NULL;
- GST_BUFFER_POOL_PRIVATE (copy) = NULL;
+ GST_BUFFER_FREE_DATA_FUNC (copy) = NULL;
+ GST_BUFFER_PRIVATE (copy) = NULL;
gst_buffer_unref(buffer);
gst_pad_push (efence->srcpad, GST_DATA (copy));
@@ -305,8 +305,8 @@ GstBuffer *gst_fenced_buffer_new(void)
GST_BUFFER_TIMESTAMP (newbuf) = GST_CLOCK_TIME_NONE;
GST_BUFFER_DURATION (newbuf) = GST_CLOCK_TIME_NONE;
GST_BUFFER_OFFSET (newbuf) = GST_BUFFER_OFFSET_NONE;
- GST_BUFFER_BUFFERPOOL (newbuf) = NULL;
- GST_BUFFER_POOL_PRIVATE (newbuf) = NULL;
+ GST_BUFFER_FREE_DATA_FUNC (newbuf) = NULL;
+ GST_BUFFER_PRIVATE (newbuf) = NULL;
GST_DEBUG ("new buffer=%p", newbuf);
@@ -364,8 +364,8 @@ GstBuffer* gst_fenced_buffer_default_copy (GstBuffer *buffer)
GST_BUFFER_TIMESTAMP (copy) = GST_BUFFER_TIMESTAMP (buffer);
GST_BUFFER_DURATION (copy) = GST_BUFFER_DURATION (buffer);
GST_BUFFER_OFFSET (copy) = GST_BUFFER_OFFSET (buffer);
- GST_BUFFER_BUFFERPOOL (copy) = NULL;
- GST_BUFFER_POOL_PRIVATE (copy) = NULL;
+ GST_BUFFER_FREE_DATA_FUNC (copy) = NULL;
+ GST_BUFFER_PRIVATE (copy) = NULL;
return copy;
}
diff --git a/gst/effectv/gstwarp.c b/gst/effectv/gstwarp.c
index 95c72c1d..63319938 100644
--- a/gst/effectv/gstwarp.c
+++ b/gst/effectv/gstwarp.c
@@ -247,7 +247,10 @@ static void gst_warptv_setup(GstVideofilter *videofilter)
warptv->width = width;
warptv->height = height;
+#if 0
+ /* FIXME this should be reset in PAUSE->READY, not here */
warptv->tval = 0;
+#endif
g_free (warptv->disttable);
g_free (warptv->offstable);
diff --git a/gst/videofilter/gstvideofilter.c b/gst/videofilter/gstvideofilter.c
index 39c40f1b..d26014d9 100644
--- a/gst/videofilter/gstvideofilter.c
+++ b/gst/videofilter/gstvideofilter.c
@@ -329,11 +329,10 @@ gst_videofilter_chain (GstPad *pad, GstData *_data)
size, videofilter->from_buf_size);
}
- outbuf = gst_buffer_new();
- /* FIXME: handle bufferpools */
- GST_BUFFER_SIZE(outbuf) = videofilter->to_buf_size;
- GST_BUFFER_DATA(outbuf) = g_malloc (videofilter->to_buf_size);
+ outbuf = gst_pad_alloc_buffer(videofilter->srcpad, GST_BUFFER_OFFSET_NONE,
+ videofilter->to_buf_size);
GST_BUFFER_TIMESTAMP(outbuf) = GST_BUFFER_TIMESTAMP(buf);
+ GST_BUFFER_DURATION(outbuf) = GST_BUFFER_DURATION(buf);
g_return_if_fail(videofilter->format);
GST_DEBUG ("format %s",videofilter->format->fourcc);