mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-06-07 07:58:51 +00:00
Converted a few _info events to properties..
Original commit message from CVS: Converted a few _info events to properties..
This commit is contained in:
parent
6ef17483a4
commit
19e0ea0458
4 changed files with 76 additions and 28 deletions
|
@ -46,6 +46,7 @@ enum {
|
||||||
ARG_NUM_SINKS,
|
ARG_NUM_SINKS,
|
||||||
ARG_SILENT,
|
ARG_SILENT,
|
||||||
ARG_DUMP,
|
ARG_DUMP,
|
||||||
|
ARG_LAST_MESSAGE,
|
||||||
};
|
};
|
||||||
|
|
||||||
GST_PADTEMPLATE_FACTORY (fakesink_sink_factory,
|
GST_PADTEMPLATE_FACTORY (fakesink_sink_factory,
|
||||||
|
@ -107,6 +108,10 @@ gst_fakesink_class_init (GstFakeSinkClass *klass)
|
||||||
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NUM_SINKS,
|
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NUM_SINKS,
|
||||||
g_param_spec_int ("num_sinks", "num_sinks", "num_sinks",
|
g_param_spec_int ("num_sinks", "num_sinks", "num_sinks",
|
||||||
1, G_MAXINT, 1, G_PARAM_READABLE));
|
1, G_MAXINT, 1, G_PARAM_READABLE));
|
||||||
|
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE,
|
||||||
|
g_param_spec_string ("last_message", "last_message", "last_message",
|
||||||
|
NULL, G_PARAM_READABLE));
|
||||||
|
|
||||||
|
|
||||||
gst_element_install_std_props (
|
gst_element_install_std_props (
|
||||||
GST_ELEMENT_CLASS (klass),
|
GST_ELEMENT_CLASS (klass),
|
||||||
|
@ -136,6 +141,7 @@ gst_fakesink_init (GstFakeSink *fakesink)
|
||||||
|
|
||||||
fakesink->silent = FALSE;
|
fakesink->silent = FALSE;
|
||||||
fakesink->dump = FALSE;
|
fakesink->dump = FALSE;
|
||||||
|
fakesink->last_message = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static GstPad*
|
static GstPad*
|
||||||
|
@ -202,6 +208,9 @@ gst_fakesink_get_property (GObject *object, guint prop_id, GValue *value, GParam
|
||||||
case ARG_DUMP:
|
case ARG_DUMP:
|
||||||
g_value_set_boolean (value, sink->dump);
|
g_value_set_boolean (value, sink->dump);
|
||||||
break;
|
break;
|
||||||
|
case ARG_LAST_MESSAGE:
|
||||||
|
g_value_set_string (value, sink->last_message);
|
||||||
|
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;
|
||||||
|
@ -219,16 +228,14 @@ gst_fakesink_chain (GstPad *pad, GstBuffer *buf)
|
||||||
|
|
||||||
fakesink = GST_FAKESINK (gst_pad_get_parent (pad));
|
fakesink = GST_FAKESINK (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
/*
|
|
||||||
if (GST_IS_EVENT (buf)) {
|
|
||||||
gst_pad_event_default (pad, GST_EVENT (buf));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!fakesink->silent) {
|
if (!fakesink->silent) {
|
||||||
gst_element_info (GST_ELEMENT (fakesink), "chain ******* (%s:%s)< (%d bytes, %lld) %p",
|
if (fakesink->last_message)
|
||||||
|
g_free (fakesink->last_message);
|
||||||
|
|
||||||
|
fakesink->last_message = g_strdup_printf ("chain ******* (%s:%s)< (%d bytes, %lld) %p",
|
||||||
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf);
|
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf);
|
||||||
|
|
||||||
|
g_object_notify (G_OBJECT (fakesink), "last_message");
|
||||||
}
|
}
|
||||||
|
|
||||||
g_signal_emit (G_OBJECT (fakesink), gst_fakesink_signals[SIGNAL_HANDOFF], 0, buf, pad);
|
g_signal_emit (G_OBJECT (fakesink), gst_fakesink_signals[SIGNAL_HANDOFF], 0, buf, pad);
|
||||||
|
|
|
@ -60,7 +60,8 @@ enum {
|
||||||
ARG_EOS,
|
ARG_EOS,
|
||||||
ARG_SILENT,
|
ARG_SILENT,
|
||||||
ARG_DUMP,
|
ARG_DUMP,
|
||||||
ARG_PARENTSIZE
|
ARG_PARENTSIZE,
|
||||||
|
ARG_LAST_MESSAGE,
|
||||||
};
|
};
|
||||||
|
|
||||||
GST_PADTEMPLATE_FACTORY (fakesrc_src_factory,
|
GST_PADTEMPLATE_FACTORY (fakesrc_src_factory,
|
||||||
|
@ -231,6 +232,9 @@ gst_fakesrc_class_init (GstFakeSrcClass *klass)
|
||||||
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_EOS,
|
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_EOS,
|
||||||
g_param_spec_boolean("eos","eos","eos",
|
g_param_spec_boolean("eos","eos","eos",
|
||||||
TRUE,G_PARAM_READWRITE)); /* CHECKME */
|
TRUE,G_PARAM_READWRITE)); /* CHECKME */
|
||||||
|
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE,
|
||||||
|
g_param_spec_string ("last_message", "last_message", "last_message",
|
||||||
|
NULL, G_PARAM_READABLE));
|
||||||
|
|
||||||
gst_element_install_std_props (
|
gst_element_install_std_props (
|
||||||
GST_ELEMENT_CLASS (klass),
|
GST_ELEMENT_CLASS (klass),
|
||||||
|
@ -277,6 +281,7 @@ gst_fakesrc_init (GstFakeSrc *fakesrc)
|
||||||
fakesrc->sizemax = 4096;
|
fakesrc->sizemax = 4096;
|
||||||
fakesrc->parent = NULL;
|
fakesrc->parent = NULL;
|
||||||
fakesrc->parentsize = 4096 * 10;
|
fakesrc->parentsize = 4096 * 10;
|
||||||
|
fakesrc->last_message = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static GstPad*
|
static GstPad*
|
||||||
|
@ -424,7 +429,7 @@ gst_fakesrc_set_property (GObject *object, guint prop_id, const GValue *value, G
|
||||||
break;
|
break;
|
||||||
case ARG_EOS:
|
case ARG_EOS:
|
||||||
src->eos = g_value_get_boolean (value);
|
src->eos = g_value_get_boolean (value);
|
||||||
GST_INFO (0, "will EOS on next buffer");
|
GST_INFO (0, "will EOS on next buffer");
|
||||||
break;
|
break;
|
||||||
case ARG_SILENT:
|
case ARG_SILENT:
|
||||||
src->silent = g_value_get_boolean (value);
|
src->silent = g_value_get_boolean (value);
|
||||||
|
@ -490,6 +495,9 @@ gst_fakesrc_get_property (GObject *object, guint prop_id, GValue *value, GParamS
|
||||||
case ARG_DUMP:
|
case ARG_DUMP:
|
||||||
g_value_set_boolean (value, src->dump);
|
g_value_set_boolean (value, src->dump);
|
||||||
break;
|
break;
|
||||||
|
case ARG_LAST_MESSAGE:
|
||||||
|
g_value_set_string (value, src->last_message);
|
||||||
|
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;
|
||||||
|
@ -666,9 +674,13 @@ gst_fakesrc_get(GstPad *pad)
|
||||||
GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++;
|
GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++;
|
||||||
|
|
||||||
if (!src->silent) {
|
if (!src->silent) {
|
||||||
gst_element_info (GST_ELEMENT (src),
|
if (src->last_message)
|
||||||
"get ******* (%s:%s)> (%d bytes, %llu)",
|
g_free (src->last_message);
|
||||||
|
|
||||||
|
src->last_message = g_strdup_printf ("get ******* (%s:%s)> (%d bytes, %llu)",
|
||||||
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
|
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
|
||||||
|
|
||||||
|
g_object_notify (G_OBJECT (src), "last_message");
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, src, "pre handoff emit\n");
|
GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, src, "pre handoff emit\n");
|
||||||
|
@ -719,8 +731,13 @@ gst_fakesrc_loop(GstElement *element)
|
||||||
GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++;
|
GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++;
|
||||||
|
|
||||||
if (!src->silent) {
|
if (!src->silent) {
|
||||||
gst_element_info (element, "fakesrc: loop ******* (%s:%s) > (%d bytes, %llu)",
|
if (src->last_message)
|
||||||
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
|
g_free (src->last_message);
|
||||||
|
|
||||||
|
src->last_message = g_strdup_printf ("fakesrc: loop ******* (%s:%s) > (%d bytes, %llu)",
|
||||||
|
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
|
||||||
|
|
||||||
|
g_object_notify (G_OBJECT (src), "last_message");
|
||||||
}
|
}
|
||||||
|
|
||||||
g_signal_emit (G_OBJECT (src), gst_fakesrc_signals[SIGNAL_HANDOFF], 0,
|
g_signal_emit (G_OBJECT (src), gst_fakesrc_signals[SIGNAL_HANDOFF], 0,
|
||||||
|
|
|
@ -46,6 +46,7 @@ enum {
|
||||||
ARG_NUM_SINKS,
|
ARG_NUM_SINKS,
|
||||||
ARG_SILENT,
|
ARG_SILENT,
|
||||||
ARG_DUMP,
|
ARG_DUMP,
|
||||||
|
ARG_LAST_MESSAGE,
|
||||||
};
|
};
|
||||||
|
|
||||||
GST_PADTEMPLATE_FACTORY (fakesink_sink_factory,
|
GST_PADTEMPLATE_FACTORY (fakesink_sink_factory,
|
||||||
|
@ -107,6 +108,10 @@ gst_fakesink_class_init (GstFakeSinkClass *klass)
|
||||||
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NUM_SINKS,
|
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NUM_SINKS,
|
||||||
g_param_spec_int ("num_sinks", "num_sinks", "num_sinks",
|
g_param_spec_int ("num_sinks", "num_sinks", "num_sinks",
|
||||||
1, G_MAXINT, 1, G_PARAM_READABLE));
|
1, G_MAXINT, 1, G_PARAM_READABLE));
|
||||||
|
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE,
|
||||||
|
g_param_spec_string ("last_message", "last_message", "last_message",
|
||||||
|
NULL, G_PARAM_READABLE));
|
||||||
|
|
||||||
|
|
||||||
gst_element_install_std_props (
|
gst_element_install_std_props (
|
||||||
GST_ELEMENT_CLASS (klass),
|
GST_ELEMENT_CLASS (klass),
|
||||||
|
@ -136,6 +141,7 @@ gst_fakesink_init (GstFakeSink *fakesink)
|
||||||
|
|
||||||
fakesink->silent = FALSE;
|
fakesink->silent = FALSE;
|
||||||
fakesink->dump = FALSE;
|
fakesink->dump = FALSE;
|
||||||
|
fakesink->last_message = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static GstPad*
|
static GstPad*
|
||||||
|
@ -202,6 +208,9 @@ gst_fakesink_get_property (GObject *object, guint prop_id, GValue *value, GParam
|
||||||
case ARG_DUMP:
|
case ARG_DUMP:
|
||||||
g_value_set_boolean (value, sink->dump);
|
g_value_set_boolean (value, sink->dump);
|
||||||
break;
|
break;
|
||||||
|
case ARG_LAST_MESSAGE:
|
||||||
|
g_value_set_string (value, sink->last_message);
|
||||||
|
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;
|
||||||
|
@ -219,16 +228,14 @@ gst_fakesink_chain (GstPad *pad, GstBuffer *buf)
|
||||||
|
|
||||||
fakesink = GST_FAKESINK (gst_pad_get_parent (pad));
|
fakesink = GST_FAKESINK (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
/*
|
|
||||||
if (GST_IS_EVENT (buf)) {
|
|
||||||
gst_pad_event_default (pad, GST_EVENT (buf));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (!fakesink->silent) {
|
if (!fakesink->silent) {
|
||||||
gst_element_info (GST_ELEMENT (fakesink), "chain ******* (%s:%s)< (%d bytes, %lld) %p",
|
if (fakesink->last_message)
|
||||||
|
g_free (fakesink->last_message);
|
||||||
|
|
||||||
|
fakesink->last_message = g_strdup_printf ("chain ******* (%s:%s)< (%d bytes, %lld) %p",
|
||||||
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf);
|
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf), buf);
|
||||||
|
|
||||||
|
g_object_notify (G_OBJECT (fakesink), "last_message");
|
||||||
}
|
}
|
||||||
|
|
||||||
g_signal_emit (G_OBJECT (fakesink), gst_fakesink_signals[SIGNAL_HANDOFF], 0, buf, pad);
|
g_signal_emit (G_OBJECT (fakesink), gst_fakesink_signals[SIGNAL_HANDOFF], 0, buf, pad);
|
||||||
|
|
|
@ -60,7 +60,8 @@ enum {
|
||||||
ARG_EOS,
|
ARG_EOS,
|
||||||
ARG_SILENT,
|
ARG_SILENT,
|
||||||
ARG_DUMP,
|
ARG_DUMP,
|
||||||
ARG_PARENTSIZE
|
ARG_PARENTSIZE,
|
||||||
|
ARG_LAST_MESSAGE,
|
||||||
};
|
};
|
||||||
|
|
||||||
GST_PADTEMPLATE_FACTORY (fakesrc_src_factory,
|
GST_PADTEMPLATE_FACTORY (fakesrc_src_factory,
|
||||||
|
@ -231,6 +232,9 @@ gst_fakesrc_class_init (GstFakeSrcClass *klass)
|
||||||
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_EOS,
|
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_EOS,
|
||||||
g_param_spec_boolean("eos","eos","eos",
|
g_param_spec_boolean("eos","eos","eos",
|
||||||
TRUE,G_PARAM_READWRITE)); /* CHECKME */
|
TRUE,G_PARAM_READWRITE)); /* CHECKME */
|
||||||
|
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_LAST_MESSAGE,
|
||||||
|
g_param_spec_string ("last_message", "last_message", "last_message",
|
||||||
|
NULL, G_PARAM_READABLE));
|
||||||
|
|
||||||
gst_element_install_std_props (
|
gst_element_install_std_props (
|
||||||
GST_ELEMENT_CLASS (klass),
|
GST_ELEMENT_CLASS (klass),
|
||||||
|
@ -277,6 +281,7 @@ gst_fakesrc_init (GstFakeSrc *fakesrc)
|
||||||
fakesrc->sizemax = 4096;
|
fakesrc->sizemax = 4096;
|
||||||
fakesrc->parent = NULL;
|
fakesrc->parent = NULL;
|
||||||
fakesrc->parentsize = 4096 * 10;
|
fakesrc->parentsize = 4096 * 10;
|
||||||
|
fakesrc->last_message = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static GstPad*
|
static GstPad*
|
||||||
|
@ -424,7 +429,7 @@ gst_fakesrc_set_property (GObject *object, guint prop_id, const GValue *value, G
|
||||||
break;
|
break;
|
||||||
case ARG_EOS:
|
case ARG_EOS:
|
||||||
src->eos = g_value_get_boolean (value);
|
src->eos = g_value_get_boolean (value);
|
||||||
GST_INFO (0, "will EOS on next buffer");
|
GST_INFO (0, "will EOS on next buffer");
|
||||||
break;
|
break;
|
||||||
case ARG_SILENT:
|
case ARG_SILENT:
|
||||||
src->silent = g_value_get_boolean (value);
|
src->silent = g_value_get_boolean (value);
|
||||||
|
@ -490,6 +495,9 @@ gst_fakesrc_get_property (GObject *object, guint prop_id, GValue *value, GParamS
|
||||||
case ARG_DUMP:
|
case ARG_DUMP:
|
||||||
g_value_set_boolean (value, src->dump);
|
g_value_set_boolean (value, src->dump);
|
||||||
break;
|
break;
|
||||||
|
case ARG_LAST_MESSAGE:
|
||||||
|
g_value_set_string (value, src->last_message);
|
||||||
|
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;
|
||||||
|
@ -666,9 +674,13 @@ gst_fakesrc_get(GstPad *pad)
|
||||||
GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++;
|
GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++;
|
||||||
|
|
||||||
if (!src->silent) {
|
if (!src->silent) {
|
||||||
gst_element_info (GST_ELEMENT (src),
|
if (src->last_message)
|
||||||
"get ******* (%s:%s)> (%d bytes, %llu)",
|
g_free (src->last_message);
|
||||||
|
|
||||||
|
src->last_message = g_strdup_printf ("get ******* (%s:%s)> (%d bytes, %llu)",
|
||||||
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
|
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
|
||||||
|
|
||||||
|
g_object_notify (G_OBJECT (src), "last_message");
|
||||||
}
|
}
|
||||||
|
|
||||||
GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, src, "pre handoff emit\n");
|
GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, src, "pre handoff emit\n");
|
||||||
|
@ -719,8 +731,13 @@ gst_fakesrc_loop(GstElement *element)
|
||||||
GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++;
|
GST_BUFFER_TIMESTAMP (buf) = src->buffer_count++;
|
||||||
|
|
||||||
if (!src->silent) {
|
if (!src->silent) {
|
||||||
gst_element_info (element, "fakesrc: loop ******* (%s:%s) > (%d bytes, %llu)",
|
if (src->last_message)
|
||||||
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
|
g_free (src->last_message);
|
||||||
|
|
||||||
|
src->last_message = g_strdup_printf ("fakesrc: loop ******* (%s:%s) > (%d bytes, %llu)",
|
||||||
|
GST_DEBUG_PAD_NAME (pad), GST_BUFFER_SIZE (buf), GST_BUFFER_TIMESTAMP (buf));
|
||||||
|
|
||||||
|
g_object_notify (G_OBJECT (src), "last_message");
|
||||||
}
|
}
|
||||||
|
|
||||||
g_signal_emit (G_OBJECT (src), gst_fakesrc_signals[SIGNAL_HANDOFF], 0,
|
g_signal_emit (G_OBJECT (src), gst_fakesrc_signals[SIGNAL_HANDOFF], 0,
|
||||||
|
|
Loading…
Reference in a new issue