mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 12:41:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/elements/gstfilesrc.*: Fix filesrc push based scheduling.

Browse source 
Original commit message from CVS:
* gst/elements/gstfilesrc.c: (gst_filesrc_getrange),
(gst_filesrc_open_file), (gst_filesrc_loop),
(gst_filesrc_activate), (filesrc_find_peek),
(gst_filesrc_type_find):
* gst/elements/gstfilesrc.h:
Fix filesrc push based scheduling.
This commit is contained in:
Wim Taymans 2005-01-19 13:55:10 +00:00
parent 0a4f48bd55
commit cec2ab1eac
5 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-01-19 Wim Taymans <wim@fluendo.com>
* gst/elements/gstfilesrc.c: (gst_filesrc_getrange),
(gst_filesrc_open_file), (gst_filesrc_loop),
(gst_filesrc_activate), (filesrc_find_peek),
(gst_filesrc_type_find):
* gst/elements/gstfilesrc.h:
Fix filesrc push based scheduling.
2005-01-18 Wim Taymans <wim@fluendo.com> 2005-01-18 Wim Taymans <wim@fluendo.com>
* gst/elements/gstfilesrc.c: (gst_filesrc_getrange), * gst/elements/gstfilesrc.c: (gst_filesrc_getrange),

20
gst/elements/gstfilesrc.c
View file

@ -899,22 +899,22 @@ gst_filesrc_close_file (GstFileSrc * src)
} }
static void static void
gst_filesrc_loop (GstElement * element) gst_filesrc_loop (GstPad * pad)
{ {
GstFileSrc *filesrc; GstFileSrc *filesrc;
gboolean result; gboolean result;
GstBuffer *buffer; GstBuffer *buffer;
filesrc = GST_FILESRC (element); filesrc = GST_FILESRC (GST_PAD_PARENT (pad));
result = gst_filesrc_get (filesrc->srcpad, &buffer); result = gst_filesrc_get (pad, &buffer);
if (result != GST_FLOW_OK) { if (result != GST_FLOW_OK) {
gst_task_stop (filesrc->task); gst_task_pause (GST_RPAD_TASK (pad));
return; return;
} }
result = gst_pad_push (filesrc->srcpad, buffer); result = gst_pad_push (pad, buffer);
if (result != GST_FLOW_OK) { if (result != GST_FLOW_OK) {
gst_task_stop (filesrc->task); gst_task_pause (GST_RPAD_TASK (pad));
} }
} }
@ -943,7 +943,6 @@ gst_filesrc_activate (GstPad * pad, GstActivateMode mode)
break; break;
case GST_ACTIVATE_PULL: case GST_ACTIVATE_PULL:
result = TRUE; result = TRUE;
filesrc->task = NULL;
break; break;
case GST_ACTIVATE_NONE: case GST_ACTIVATE_NONE:
/* step 1, unblock clock sync (if any) */ /* step 1, unblock clock sync (if any) */
@ -951,11 +950,7 @@ gst_filesrc_activate (GstPad * pad, GstActivateMode mode)
/* step 2, make sure streaming finishes */ /* step 2, make sure streaming finishes */
GST_STREAM_LOCK (pad); GST_STREAM_LOCK (pad);
/* step 3, stop the task */ /* step 3, stop the task */
if (filesrc->task) { gst_task_stop (GST_RPAD_TASK (pad));
gst_task_stop (filesrc->task);
gst_object_unref (GST_OBJECT (filesrc->task));
filesrc->task = NULL;
}
GST_STREAM_UNLOCK (pad); GST_STREAM_UNLOCK (pad);
result = TRUE; result = TRUE;
@ -1201,6 +1196,7 @@ gst_filesrc_type_find (GstFileSrc * src)
find.src = src; find.src = src;
find.best_probability = 0; find.best_probability = 0;
find.caps = NULL; find.caps = NULL;
find.buffer = NULL;
gst_find.data = &find; gst_find.data = &find;
gst_find.peek = filesrc_find_peek; gst_find.peek = filesrc_find_peek;
gst_find.suggest = filesrc_find_suggest; gst_find.suggest = filesrc_find_suggest;

2
gst/elements/gstfilesrc.h
View file

@ -69,8 +69,6 @@ struct _GstFileSrc {
gboolean is_regular; /* whether it's (symlink to) gboolean is_regular; /* whether it's (symlink to)
a regular file */ a regular file */
GstTask *task;
GstBuffer *mapbuf; GstBuffer *mapbuf;
size_t mapsize; size_t mapsize;

20
plugins/elements/gstfilesrc.c
View file

@ -899,22 +899,22 @@ gst_filesrc_close_file (GstFileSrc * src)
} }
static void static void
gst_filesrc_loop (GstElement * element) gst_filesrc_loop (GstPad * pad)
{ {
GstFileSrc *filesrc; GstFileSrc *filesrc;
gboolean result; gboolean result;
GstBuffer *buffer; GstBuffer *buffer;
filesrc = GST_FILESRC (element); filesrc = GST_FILESRC (GST_PAD_PARENT (pad));
result = gst_filesrc_get (filesrc->srcpad, &buffer); result = gst_filesrc_get (pad, &buffer);
if (result != GST_FLOW_OK) { if (result != GST_FLOW_OK) {
gst_task_stop (filesrc->task); gst_task_pause (GST_RPAD_TASK (pad));
return; return;
} }
result = gst_pad_push (filesrc->srcpad, buffer); result = gst_pad_push (pad, buffer);
if (result != GST_FLOW_OK) { if (result != GST_FLOW_OK) {
gst_task_stop (filesrc->task); gst_task_pause (GST_RPAD_TASK (pad));
} }
} }
@ -943,7 +943,6 @@ gst_filesrc_activate (GstPad * pad, GstActivateMode mode)
break; break;
case GST_ACTIVATE_PULL: case GST_ACTIVATE_PULL:
result = TRUE; result = TRUE;
filesrc->task = NULL;
break; break;
case GST_ACTIVATE_NONE: case GST_ACTIVATE_NONE:
/* step 1, unblock clock sync (if any) */ /* step 1, unblock clock sync (if any) */
@ -951,11 +950,7 @@ gst_filesrc_activate (GstPad * pad, GstActivateMode mode)
/* step 2, make sure streaming finishes */ /* step 2, make sure streaming finishes */
GST_STREAM_LOCK (pad); GST_STREAM_LOCK (pad);
/* step 3, stop the task */ /* step 3, stop the task */
if (filesrc->task) { gst_task_stop (GST_RPAD_TASK (pad));
gst_task_stop (filesrc->task);
gst_object_unref (GST_OBJECT (filesrc->task));
filesrc->task = NULL;
}
GST_STREAM_UNLOCK (pad); GST_STREAM_UNLOCK (pad);
result = TRUE; result = TRUE;
@ -1201,6 +1196,7 @@ gst_filesrc_type_find (GstFileSrc * src)
find.src = src; find.src = src;
find.best_probability = 0; find.best_probability = 0;
find.caps = NULL; find.caps = NULL;
find.buffer = NULL;
gst_find.data = &find; gst_find.data = &find;
gst_find.peek = filesrc_find_peek; gst_find.peek = filesrc_find_peek;
gst_find.suggest = filesrc_find_suggest; gst_find.suggest = filesrc_find_suggest;

2
plugins/elements/gstfilesrc.h
View file

@ -69,8 +69,6 @@ struct _GstFileSrc {
gboolean is_regular; /* whether it's (symlink to) gboolean is_regular; /* whether it's (symlink to)
a regular file */ a regular file */
GstTask *task;
GstBuffer *mapbuf; GstBuffer *mapbuf;
size_t mapsize; size_t mapsize;