mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-18 20:25:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

multifile: add loop property to multifilesrc

Browse source 
Fixes: #652727

Signed-off-by: Jonny Lamb <jonnylamb@jonnylamb.com>
Signed-off-by: David Schleef <ds@schleef.org>
This commit is contained in:
Jonny Lamb 2011-06-16 13:57:03 +01:00 committed by David Schleef
parent fbe726c3da
commit 9149ce8d9d
2 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gst/multifile/gstmultifilesrc.c
View file

@ -74,7 +74,8 @@ enum
ARG_0, ARG_0,
ARG_LOCATION, ARG_LOCATION,
ARG_INDEX, ARG_INDEX,
ARG_CAPS ARG_CAPS,
ARG_LOOP
}; };
#define DEFAULT_LOCATION "%05d" #define DEFAULT_LOCATION "%05d"
@ -126,6 +127,10 @@ gst_multi_file_src_class_init (GstMultiFileSrcClass * klass)
g_param_spec_boxed ("caps", "Caps", g_param_spec_boxed ("caps", "Caps",
"Caps describing the format of the data.", "Caps describing the format of the data.",
GST_TYPE_CAPS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); GST_TYPE_CAPS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, ARG_LOOP,
g_param_spec_boolean ("loop", "Loop",
"Whether to repeat from the beginning when all files have been read.",
FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gobject_class->dispose = gst_multi_file_src_dispose; gobject_class->dispose = gst_multi_file_src_dispose;
@ -144,7 +149,8 @@ static void
gst_multi_file_src_init (GstMultiFileSrc * multifilesrc, gst_multi_file_src_init (GstMultiFileSrc * multifilesrc,
GstMultiFileSrcClass * g_class) GstMultiFileSrcClass * g_class)
{ {
multifilesrc->index = DEFAULT_INDEX; multifilesrc->original_index = DEFAULT_INDEX;
multifilesrc->index = multifilesrc->original_index;
multifilesrc->filename = g_strdup (DEFAULT_LOCATION); multifilesrc->filename = g_strdup (DEFAULT_LOCATION);
multifilesrc->successful_read = FALSE; multifilesrc->successful_read = FALSE;
} }
@ -233,7 +239,8 @@ gst_multi_file_src_set_property (GObject * object, guint prop_id,
gst_multi_file_src_set_location (src, g_value_get_string (value)); gst_multi_file_src_set_location (src, g_value_get_string (value));
break; break;
case ARG_INDEX: case ARG_INDEX:
src->index = g_value_get_int (value); src->original_index = g_value_get_int (value);
src->index = src->original_index;
break; break;
case ARG_CAPS: case ARG_CAPS:
{ {
@ -249,6 +256,9 @@ gst_multi_file_src_set_property (GObject * object, guint prop_id,
gst_pad_set_caps (GST_BASE_SRC_PAD (src), new_caps); gst_pad_set_caps (GST_BASE_SRC_PAD (src), new_caps);
} }
break; break;
case ARG_LOOP:
src->loop = g_value_get_boolean (value);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -271,6 +281,9 @@ gst_multi_file_src_get_property (GObject * object, guint prop_id,
case ARG_CAPS: case ARG_CAPS:
gst_value_set_caps (value, src->caps); gst_value_set_caps (value, src->caps);
break; break;
case ARG_LOOP:
g_value_set_boolean (value, src->loop);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -312,7 +325,17 @@ gst_multi_file_src_create (GstPushSrc * src, GstBuffer ** buffer)
g_free (filename); g_free (filename);
if (error != NULL) if (error != NULL)
g_error_free (error); g_error_free (error);
if (multifilesrc->loop
&& multifilesrc->index != multifilesrc->original_index) {
/* But we might be expected to loop, so let's go again. Make
* sure the original index and index aren't the same otherwise
* we'll just recurse to death in some error case. */
multifilesrc->index = multifilesrc->original_index;
return gst_multi_file_src_create (src, buffer);
} else {
return GST_FLOW_UNEXPECTED; return GST_FLOW_UNEXPECTED;
}
} else { } else {
goto handle_error; goto handle_error;
} }

3
gst/multifile/gstmultifilesrc.h
View file

@ -46,10 +46,13 @@ struct _GstMultiFileSrc
GstPushSrc parent; GstPushSrc parent;
gchar *filename; gchar *filename;
int original_index;
int index; int index;
int offset; int offset;
gboolean loop;
GstCaps *caps; GstCaps *caps;
gboolean successful_read; gboolean successful_read;
}; };