mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-29 20:35:40 +00:00
configure.ac: Require CVS of core for new API in collectpads.
Original commit message from CVS: * configure.ac: Require CVS of core for new API in collectpads. * gst/adder/gstadder.c: Use new API to make adder sparse stream aware.
This commit is contained in:
parent
5fc67f8bd3
commit
054842ca82
3 changed files with 49 additions and 18 deletions
|
@ -1,3 +1,11 @@
|
|||
2008-02-18 Stefan Kost <ensonic@users.sf.net>
|
||||
|
||||
* configure.ac:
|
||||
Require CVS of core for new API in collectpads.
|
||||
|
||||
* gst/adder/gstadder.c:
|
||||
Use new API to make adder sparse stream aware.
|
||||
|
||||
2008-02-18 Wim Taymans <wim.taymans@collabora.co.uk>
|
||||
|
||||
* gst/playback/gstplaybin2.c: (pad_added_cb), (pad_removed_cb),
|
||||
|
|
|
@ -54,7 +54,7 @@ dnl AS_LIBTOOL_TAGS
|
|||
AM_PROG_LIBTOOL
|
||||
|
||||
dnl *** required versions of GStreamer stuff ***
|
||||
GST_REQ=0.10.15.1
|
||||
GST_REQ=0.10.17.1
|
||||
|
||||
dnl *** autotools stuff ****
|
||||
|
||||
|
|
|
@ -701,6 +701,7 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
|
|||
GstBuffer *outbuf;
|
||||
GstFlowReturn ret;
|
||||
gpointer outbytes;
|
||||
gboolean empty = TRUE;
|
||||
|
||||
adder = GST_ADDER (user_data);
|
||||
|
||||
|
@ -724,18 +725,22 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
|
|||
GstCollectData *data;
|
||||
guint8 *bytes;
|
||||
guint len;
|
||||
GstBuffer *inbuf;
|
||||
|
||||
data = (GstCollectData *) collected->data;
|
||||
|
||||
/* get pointer to copy size bytes */
|
||||
len = gst_collect_pads_read (pads, data, &bytes, size);
|
||||
/* length 0 means EOS or an empty buffer so we still need to flush in
|
||||
/* get a subbuffer of size bytes */
|
||||
inbuf = gst_collect_pads_take_buffer (pads, data, size);
|
||||
/* NULL means EOS or an empty buffer so we still need to flush in
|
||||
* case of an empty buffer. */
|
||||
if (len == 0) {
|
||||
if (inbuf == NULL) {
|
||||
GST_LOG_OBJECT (adder, "channel %p: no bytes available", data);
|
||||
goto next;
|
||||
}
|
||||
|
||||
bytes = GST_BUFFER_DATA (inbuf);
|
||||
len = GST_BUFFER_SIZE (inbuf);
|
||||
|
||||
if (outbuf == NULL) {
|
||||
GST_LOG_OBJECT (adder, "channel %p: making output buffer of %d bytes",
|
||||
data, size);
|
||||
|
@ -746,23 +751,37 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
|
|||
outbytes = GST_BUFFER_DATA (outbuf);
|
||||
gst_buffer_set_caps (outbuf, GST_PAD_CAPS (adder->srcpad));
|
||||
|
||||
/* clear if we are only going to fill a partial buffer */
|
||||
if (G_UNLIKELY (size > len))
|
||||
if (!GST_BUFFER_FLAG_IS_SET (inbuf, GST_BUFFER_FLAG_GAP)) {
|
||||
/* clear if we are only going to fill a partial buffer */
|
||||
if (G_UNLIKELY (size > len))
|
||||
memset (outbytes, 0, size);
|
||||
|
||||
GST_LOG_OBJECT (adder, "channel %p: copying %d bytes from data %p",
|
||||
data, len, bytes);
|
||||
|
||||
/* and copy the data into it */
|
||||
memcpy (outbytes, bytes, len);
|
||||
empty = FALSE;
|
||||
} else {
|
||||
GST_LOG_OBJECT (adder, "channel %p: zeroing %d bytes from data %p",
|
||||
data, len, bytes);
|
||||
memset (outbytes, 0, size);
|
||||
|
||||
GST_LOG_OBJECT (adder, "channel %p: copying %d bytes from data %p",
|
||||
data, len, bytes);
|
||||
|
||||
/* and copy the data into it */
|
||||
memcpy (outbytes, bytes, len);
|
||||
}
|
||||
} else {
|
||||
GST_LOG_OBJECT (adder, "channel %p: mixing %d bytes from data %p",
|
||||
data, len, bytes);
|
||||
/* other buffers, need to add them */
|
||||
adder->func ((gpointer) outbytes, (gpointer) bytes, len);
|
||||
if (!GST_BUFFER_FLAG_IS_SET (inbuf, GST_BUFFER_FLAG_GAP)) {
|
||||
GST_LOG_OBJECT (adder, "channel %p: mixing %d bytes from data %p",
|
||||
data, len, bytes);
|
||||
/* other buffers, need to add them */
|
||||
adder->func ((gpointer) outbytes, (gpointer) bytes, len);
|
||||
empty = FALSE;
|
||||
} else {
|
||||
GST_LOG_OBJECT (adder, "channel %p: skipping %d bytes from data %p",
|
||||
data, len, bytes);
|
||||
}
|
||||
}
|
||||
next:
|
||||
gst_collect_pads_flush (pads, data, len);
|
||||
if (inbuf)
|
||||
gst_buffer_unref (inbuf);
|
||||
}
|
||||
|
||||
/* can only happen when no pads to collect or all EOS */
|
||||
|
@ -810,6 +829,10 @@ gst_adder_collected (GstCollectPads * pads, gpointer user_data)
|
|||
GST_BUFFER_DURATION (outbuf) = adder->timestamp -
|
||||
GST_BUFFER_TIMESTAMP (outbuf);
|
||||
|
||||
/* if we only processed silence, mark output again as silence */
|
||||
if (empty)
|
||||
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_FLAG_GAP);
|
||||
|
||||
/* send it out */
|
||||
GST_LOG_OBJECT (adder, "pushing outbuf, timestamp %" GST_TIME_FORMAT,
|
||||
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (outbuf)));
|
||||
|
|
Loading…
Reference in a new issue