mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

Small cleanups

Browse source 
Original commit message from CVS:
Small cleanups
This commit is contained in:
Wim Taymans 2002-11-27 23:14:33 +00:00
parent 0b4910ce65
commit c925bc7de0
4 changed files with 24 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gst/elements/gstfdsrc.c
View file

@ -113,9 +113,10 @@ gst_fdsrc_class_init (GstFdSrcClass *klass)
} }
static void gst_fdsrc_init(GstFdSrc *fdsrc) { static void gst_fdsrc_init(GstFdSrc *fdsrc) {
fdsrc->srcpad = gst_pad_new("src",GST_PAD_SRC); fdsrc->srcpad = gst_pad_new ("src", GST_PAD_SRC);
gst_pad_set_get_function(fdsrc->srcpad,gst_fdsrc_get);
gst_element_add_pad(GST_ELEMENT(fdsrc),fdsrc->srcpad); gst_pad_set_get_function (fdsrc->srcpad, gst_fdsrc_get);
gst_element_add_pad (GST_ELEMENT (fdsrc), fdsrc->srcpad);
fdsrc->fd = 0; fdsrc->fd = 0;
fdsrc->curoffset = 0; fdsrc->curoffset = 0;
@ -176,28 +177,23 @@ gst_fdsrc_get(GstPad *pad)
GstBuffer *buf; GstBuffer *buf;
glong readbytes; glong readbytes;
g_return_val_if_fail (pad != NULL, NULL); src = GST_FDSRC (gst_pad_get_parent (pad));
src = GST_FDSRC(gst_pad_get_parent (pad));
/* create the buffer */ /* create the buffer */
/* FIXME: should eventually use a bufferpool for this*/ buf = gst_buffer_new_and_alloc (src->blocksize);
buf = gst_buffer_new ();
g_return_val_if_fail (buf, NULL);
/* allocate the space for the buffer data */
GST_BUFFER_DATA(buf) = g_malloc(src->blocksize);
g_return_val_if_fail(GST_BUFFER_DATA(buf) != NULL, NULL);
/* read it in from the file */ /* read it in from the file */
readbytes = read(src->fd,GST_BUFFER_DATA(buf),src->blocksize); readbytes = read (src->fd, GST_BUFFER_DATA (buf), src->blocksize);
/* if nothing was read, we're in eos */ /* if nothing was read, we're in eos */
if (readbytes == 0) { if (readbytes == 0) {
gst_element_set_eos (GST_ELEMENT (src)); gst_element_set_eos (GST_ELEMENT (src));
return GST_BUFFER (gst_event_new (GST_EVENT_EOS)); return GST_BUFFER (gst_event_new (GST_EVENT_EOS));
} }
GST_BUFFER_OFFSET(buf) = src->curoffset; GST_BUFFER_OFFSET (buf) = src->curoffset;
GST_BUFFER_SIZE(buf) = readbytes; GST_BUFFER_SIZE (buf) = readbytes;
GST_BUFFER_TIMESTAMP (buf) = GST_CLOCK_TIME_NONE;
src->curoffset += readbytes; src->curoffset += readbytes;
/* we're done, return the buffer */ /* we're done, return the buffer */

2
gst/elements/gstfilesrc.c
View file

@ -401,7 +401,7 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size)
GST_BUFFER_SIZE (buf) = size; GST_BUFFER_SIZE (buf) = size;
GST_BUFFER_MAXSIZE (buf) = size; GST_BUFFER_MAXSIZE (buf) = size;
GST_BUFFER_OFFSET (buf) = offset; GST_BUFFER_OFFSET (buf) = offset;
GST_BUFFER_TIMESTAMP (buf) = -1LL; GST_BUFFER_TIMESTAMP (buf) = GST_CLOCK_TIME_NONE;
GST_BUFFER_POOL_PRIVATE (buf) = src; GST_BUFFER_POOL_PRIVATE (buf) = src;
GST_BUFFER_FREE_FUNC (buf) = (GstDataFreeFunction) gst_filesrc_free_parent_mmap; GST_BUFFER_FREE_FUNC (buf) = (GstDataFreeFunction) gst_filesrc_free_parent_mmap;

26
plugins/elements/gstfdsrc.c
View file

@ -113,9 +113,10 @@ gst_fdsrc_class_init (GstFdSrcClass *klass)
} }
static void gst_fdsrc_init(GstFdSrc *fdsrc) { static void gst_fdsrc_init(GstFdSrc *fdsrc) {
fdsrc->srcpad = gst_pad_new("src",GST_PAD_SRC); fdsrc->srcpad = gst_pad_new ("src", GST_PAD_SRC);
gst_pad_set_get_function(fdsrc->srcpad,gst_fdsrc_get);
gst_element_add_pad(GST_ELEMENT(fdsrc),fdsrc->srcpad); gst_pad_set_get_function (fdsrc->srcpad, gst_fdsrc_get);
gst_element_add_pad (GST_ELEMENT (fdsrc), fdsrc->srcpad);
fdsrc->fd = 0; fdsrc->fd = 0;
fdsrc->curoffset = 0; fdsrc->curoffset = 0;
@ -176,28 +177,23 @@ gst_fdsrc_get(GstPad *pad)
GstBuffer *buf; GstBuffer *buf;
glong readbytes; glong readbytes;
g_return_val_if_fail (pad != NULL, NULL); src = GST_FDSRC (gst_pad_get_parent (pad));
src = GST_FDSRC(gst_pad_get_parent (pad));
/* create the buffer */ /* create the buffer */
/* FIXME: should eventually use a bufferpool for this*/ buf = gst_buffer_new_and_alloc (src->blocksize);
buf = gst_buffer_new ();
g_return_val_if_fail (buf, NULL);
/* allocate the space for the buffer data */
GST_BUFFER_DATA(buf) = g_malloc(src->blocksize);
g_return_val_if_fail(GST_BUFFER_DATA(buf) != NULL, NULL);
/* read it in from the file */ /* read it in from the file */
readbytes = read(src->fd,GST_BUFFER_DATA(buf),src->blocksize); readbytes = read (src->fd, GST_BUFFER_DATA (buf), src->blocksize);
/* if nothing was read, we're in eos */ /* if nothing was read, we're in eos */
if (readbytes == 0) { if (readbytes == 0) {
gst_element_set_eos (GST_ELEMENT (src)); gst_element_set_eos (GST_ELEMENT (src));
return GST_BUFFER (gst_event_new (GST_EVENT_EOS)); return GST_BUFFER (gst_event_new (GST_EVENT_EOS));
} }
GST_BUFFER_OFFSET(buf) = src->curoffset; GST_BUFFER_OFFSET (buf) = src->curoffset;
GST_BUFFER_SIZE(buf) = readbytes; GST_BUFFER_SIZE (buf) = readbytes;
GST_BUFFER_TIMESTAMP (buf) = GST_CLOCK_TIME_NONE;
src->curoffset += readbytes; src->curoffset += readbytes;
/* we're done, return the buffer */ /* we're done, return the buffer */

2
plugins/elements/gstfilesrc.c
View file

@ -401,7 +401,7 @@ gst_filesrc_map_region (GstFileSrc *src, off_t offset, size_t size)
GST_BUFFER_SIZE (buf) = size; GST_BUFFER_SIZE (buf) = size;
GST_BUFFER_MAXSIZE (buf) = size; GST_BUFFER_MAXSIZE (buf) = size;
GST_BUFFER_OFFSET (buf) = offset; GST_BUFFER_OFFSET (buf) = offset;
GST_BUFFER_TIMESTAMP (buf) = -1LL; GST_BUFFER_TIMESTAMP (buf) = GST_CLOCK_TIME_NONE;
GST_BUFFER_POOL_PRIVATE (buf) = src; GST_BUFFER_POOL_PRIVATE (buf) = src;
GST_BUFFER_FREE_FUNC (buf) = (GstDataFreeFunction) gst_filesrc_free_parent_mmap; GST_BUFFER_FREE_FUNC (buf) = (GstDataFreeFunction) gst_filesrc_free_parent_mmap;