Commit 9ad6e9c9 authored by David Schleef's avatar David Schleef
Browse files

gst/multifile/gstmultifilesrc.*: When subsequent files are read, if the file...

gst/multifile/gstmultifilesrc.*: When subsequent files are read, if the file doesn't exist, send an EOS instead of ca...

Original commit message from CVS:
* gst/multifile/gstmultifilesrc.c:
* gst/multifile/gstmultifilesrc.h:
When subsequent files are read, if the file doesn't exist, send
an EOS instead of causing an error.
parent badcd298
common @ 208ef72f
Subproject commit a00d4c1966aab517c2694c61d580489ebcbce448
Subproject commit 208ef72f86e944e6ba6941c68e57ffcea8d2a8f4
......@@ -155,6 +155,7 @@ gst_multi_file_src_init (GstMultiFileSrc * multifilesrc,
multifilesrc->index = DEFAULT_INDEX;
multifilesrc->filename = g_strdup (DEFAULT_LOCATION);
multifilesrc->successful_read = FALSE;
}
static void
......@@ -279,7 +280,13 @@ gst_multi_file_src_create (GstPushSrc * src, GstBuffer ** buffer)
file = fopen (filename, "rb");
if (!file) {
goto handle_error;
if (multifilesrc->successful_read) {
/* If we've read at least one buffer successfully, not finding the
* next file is EOS. */
return GST_FLOW_UNEXPECTED;
} else {
goto handle_error;
}
}
fseek (file, 0, SEEK_END);
......@@ -293,6 +300,7 @@ gst_multi_file_src_create (GstPushSrc * src, GstBuffer ** buffer)
goto handle_error;
}
multifilesrc->successful_read = TRUE;
multifilesrc->index++;
GST_BUFFER_SIZE (buf) = size;
......
......@@ -51,6 +51,7 @@ struct _GstMultiFileSrc
int offset;
GstCaps *caps;
gboolean successful_read;
};
struct _GstMultiFileSrcClass
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment