mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-27 08:48:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-07-10 11:42:37 +02:00
parent 1c4ec02be9 abb646dcd1
commit caf1760694
3 changed files with 71 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
gst/multifile/gstmultifilesrc.c
View file

@ -74,7 +74,10 @@ enum
ARG_0,
ARG_LOCATION,
ARG_INDEX,
ARG_CAPS
ARG_START_INDEX,
ARG_STOP_INDEX,
ARG_CAPS,
ARG_LOOP
};
#define DEFAULT_LOCATION "%05d"
@ -107,10 +110,26 @@ gst_multi_file_src_class_init (GstMultiFileSrcClass * klass)
"index is incremented by one for each buffer read.",
0, INT_MAX, DEFAULT_INDEX,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, ARG_START_INDEX,
g_param_spec_int ("start-index", "Start Index",
"Start value of index. The initial value of index can be set "
"either by setting index or start-index. When the end of the loop "
"is reached, the index will be set to the value start-index.",
0, INT_MAX, DEFAULT_INDEX,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, ARG_STOP_INDEX,
g_param_spec_int ("stop-index", "Start Index",
"Stop value of index. The special value -1 means no stop.",
-1, INT_MAX, DEFAULT_INDEX,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, ARG_CAPS,
g_param_spec_boxed ("caps", "Caps",
"Caps describing the format of the data.",
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;
@ -138,7 +157,9 @@ gst_multi_file_src_class_init (GstMultiFileSrcClass * klass)
static void
gst_multi_file_src_init (GstMultiFileSrc * multifilesrc)
{
multifilesrc->start_index = DEFAULT_INDEX;
multifilesrc->index = DEFAULT_INDEX;
multifilesrc->stop_index = -1;
multifilesrc->filename = g_strdup (DEFAULT_LOCATION);
multifilesrc->successful_read = FALSE;
}
@ -236,6 +257,12 @@ gst_multi_file_src_set_property (GObject * object, guint prop_id,
case ARG_INDEX:
src->index = g_value_get_int (value);
break;
case ARG_START_INDEX:
src->start_index = g_value_get_int (value);
break;
case ARG_STOP_INDEX:
src->stop_index = g_value_get_int (value);
break;
case ARG_CAPS:
{
const GstCaps *caps = gst_value_get_caps (value);
@ -250,6 +277,9 @@ gst_multi_file_src_set_property (GObject * object, guint prop_id,
gst_pad_set_caps (GST_BASE_SRC_PAD (src), new_caps);
}
break;
case ARG_LOOP:
src->loop = g_value_get_boolean (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -269,9 +299,18 @@ gst_multi_file_src_get_property (GObject * object, guint prop_id,
case ARG_INDEX:
g_value_set_int (value, src->index);
break;
case ARG_START_INDEX:
g_value_set_int (value, src->start_index);
break;
case ARG_STOP_INDEX:
g_value_set_int (value, src->stop_index);
break;
case ARG_CAPS:
gst_value_set_caps (value, src->caps);
break;
case ARG_LOOP:
g_value_set_boolean (value, src->loop);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -283,6 +322,7 @@ gst_multi_file_src_get_filename (GstMultiFileSrc * multifilesrc)
{
gchar *filename;
GST_ERROR ("%d", multifilesrc->index);
filename = g_strdup_printf (multifilesrc->filename, multifilesrc->index);
return filename;
@ -301,6 +341,9 @@ gst_multi_file_src_create (GstPushSrc * src, GstBuffer ** buffer)
multifilesrc = GST_MULTI_FILE_SRC (src);
if (multifilesrc->index < multifilesrc->start_index) {
multifilesrc->index = multifilesrc->start_index;
}
filename = gst_multi_file_src_get_filename (multifilesrc);
GST_DEBUG_OBJECT (multifilesrc, "reading from file \"%s\".", filename);
@ -313,7 +356,23 @@ gst_multi_file_src_create (GstPushSrc * src, GstBuffer ** buffer)
g_free (filename);
if (error != NULL)
g_error_free (error);
return GST_FLOW_UNEXPECTED;
if (multifilesrc->loop) {
error = NULL;
multifilesrc->index = multifilesrc->start_index;
filename = gst_multi_file_src_get_filename (multifilesrc);
ret = g_file_get_contents (filename, &data, &size, &error);
if (!ret) {
g_free (filename);
if (error != NULL)
g_error_free (error);
return GST_FLOW_UNEXPECTED;
}
} else {
return GST_FLOW_UNEXPECTED;
}
} else {
goto handle_error;
}
@ -321,6 +380,10 @@ gst_multi_file_src_create (GstPushSrc * src, GstBuffer ** buffer)
multifilesrc->successful_read = TRUE;
multifilesrc->index++;
if (multifilesrc->stop_index != -1 &&
multifilesrc->index >= multifilesrc->stop_index) {
multifilesrc->index = multifilesrc->start_index;
}
buf = gst_buffer_new ();
gst_buffer_take_memory (buf, -1,

4
gst/multifile/gstmultifilesrc.h
View file

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

4
sys/directsound/gstdirectsoundsink.c
View file

@ -99,12 +99,12 @@ static GstStaticPadTemplate directsoundsink_sink_factory =
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw-int, "
"signed = (boolean) { TRUE, FALSE }, "
"signed = (boolean) TRUE, "
"width = (int) 16, "
"depth = (int) 16, "
"rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]; "
"audio/x-raw-int, "
"signed = (boolean) { TRUE, FALSE }, "
"signed = (boolean) FALSE, "
"width = (int) 8, "
"depth = (int) 8, "
"rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ];"