mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-21 05:26:23 +00:00
Don't doe EOS in a state change function
Original commit message from CVS: Don't doe EOS in a state change function
This commit is contained in:
parent
52ec4f4e5b
commit
d9123d8468
3 changed files with 11 additions and 5 deletions
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit 655da47ef800ef59a367fb0768d27adc5ca9e489
|
Subproject commit 355c616d5f6779ea194f8b61704229c6fb04ae7b
|
|
@ -234,7 +234,6 @@ gst_filesink_open_file (GstFileSink *sink)
|
||||||
if (!gst_filesink_getcurrentfilename(sink))
|
if (!gst_filesink_getcurrentfilename(sink))
|
||||||
{
|
{
|
||||||
/* Out of files */
|
/* Out of files */
|
||||||
gst_element_set_eos(GST_ELEMENT(sink));
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
sink->file = fopen (gst_filesink_getcurrentfilename(sink), "w");
|
sink->file = fopen (gst_filesink_getcurrentfilename(sink), "w");
|
||||||
|
@ -322,7 +321,11 @@ gst_filesink_handle_event (GstPad *pad, GstEvent *event)
|
||||||
/* we need to open a new file! */
|
/* we need to open a new file! */
|
||||||
gst_filesink_close_file(filesink);
|
gst_filesink_close_file(filesink);
|
||||||
filesink->filenum++;
|
filesink->filenum++;
|
||||||
if (!gst_filesink_open_file(filesink)) return FALSE;
|
if (!gst_filesink_open_file(filesink)) {
|
||||||
|
/* no more files, give EOS */
|
||||||
|
gst_element_set_eos(GST_ELEMENT(filesink));
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case GST_EVENT_FLUSH:
|
case GST_EVENT_FLUSH:
|
||||||
if (fflush(filesink->file))
|
if (fflush(filesink->file))
|
||||||
|
|
|
@ -234,7 +234,6 @@ gst_filesink_open_file (GstFileSink *sink)
|
||||||
if (!gst_filesink_getcurrentfilename(sink))
|
if (!gst_filesink_getcurrentfilename(sink))
|
||||||
{
|
{
|
||||||
/* Out of files */
|
/* Out of files */
|
||||||
gst_element_set_eos(GST_ELEMENT(sink));
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
sink->file = fopen (gst_filesink_getcurrentfilename(sink), "w");
|
sink->file = fopen (gst_filesink_getcurrentfilename(sink), "w");
|
||||||
|
@ -322,7 +321,11 @@ gst_filesink_handle_event (GstPad *pad, GstEvent *event)
|
||||||
/* we need to open a new file! */
|
/* we need to open a new file! */
|
||||||
gst_filesink_close_file(filesink);
|
gst_filesink_close_file(filesink);
|
||||||
filesink->filenum++;
|
filesink->filenum++;
|
||||||
if (!gst_filesink_open_file(filesink)) return FALSE;
|
if (!gst_filesink_open_file(filesink)) {
|
||||||
|
/* no more files, give EOS */
|
||||||
|
gst_element_set_eos(GST_ELEMENT(filesink));
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case GST_EVENT_FLUSH:
|
case GST_EVENT_FLUSH:
|
||||||
if (fflush(filesink->file))
|
if (fflush(filesink->file))
|
||||||
|
|
Loading…
Reference in a new issue