mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

glbasemixer: Remove unused negotiated member

Browse source 
This is now all handled in GstAggregator, so this code is not
called anymore.
This commit is contained in:
Olivier Crête 2017-05-21 18:31:59 +02:00 committed by Tim-Philipp Müller
parent 00760618df
commit 28b7954ea1
2 changed files with 0 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
ext/gl/gstglbasemixer.c
View file

@ -100,25 +100,6 @@ gst_gl_base_mixer_pad_set_property (GObject * object, guint prop_id,
} }
} }
static gboolean
gst_gl_base_mixer_sink_event (GstAggregator * agg, GstAggregatorPad * bpad,
GstEvent * event)
{
GstGLBaseMixerPad *pad = GST_GL_BASE_MIXER_PAD (bpad);
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_CAPS:
if (!GST_AGGREGATOR_CLASS (parent_class)->sink_event (agg, bpad, event))
return FALSE;
pad->negotiated = TRUE;
return TRUE;
default:
break;
}
return GST_AGGREGATOR_CLASS (parent_class)->sink_event (agg, bpad, event);
}
static gboolean static gboolean
_find_local_gl_context (GstGLBaseMixer * mix) _find_local_gl_context (GstGLBaseMixer * mix)
@ -291,7 +272,6 @@ gst_gl_base_mixer_class_init (GstGLBaseMixerClass * klass)
agg_class->sinkpads_type = GST_TYPE_GL_BASE_MIXER_PAD; agg_class->sinkpads_type = GST_TYPE_GL_BASE_MIXER_PAD;
agg_class->sink_query = gst_gl_base_mixer_sink_query; agg_class->sink_query = gst_gl_base_mixer_sink_query;
agg_class->sink_event = gst_gl_base_mixer_sink_event;
agg_class->src_query = gst_gl_base_mixer_src_query; agg_class->src_query = gst_gl_base_mixer_src_query;
agg_class->src_activate = gst_gl_base_mixer_src_activate_mode; agg_class->src_activate = gst_gl_base_mixer_src_activate_mode;
agg_class->stop = gst_gl_base_mixer_stop; agg_class->stop = gst_gl_base_mixer_stop;
@ -311,32 +291,10 @@ gst_gl_base_mixer_class_init (GstGLBaseMixerClass * klass)
klass->supported_gl_api = GST_GL_API_ANY; klass->supported_gl_api = GST_GL_API_ANY;
} }
static gboolean
_reset_pad (GstAggregator * self, GstAggregatorPad * base_pad,
gpointer user_data)
{
GstGLBaseMixerPad *mix_pad = GST_GL_BASE_MIXER_PAD (base_pad);
mix_pad->negotiated = FALSE;
return TRUE;
}
static void
gst_gl_base_mixer_reset (GstGLBaseMixer * mix)
{
/* clean up collect data */
gst_aggregator_iterate_sinkpads (GST_AGGREGATOR (mix),
(GstAggregatorPadForeachFunc) _reset_pad, NULL);
}
static void static void
gst_gl_base_mixer_init (GstGLBaseMixer * mix) gst_gl_base_mixer_init (GstGLBaseMixer * mix)
{ {
mix->priv = GST_GL_BASE_MIXER_GET_PRIVATE (mix); mix->priv = GST_GL_BASE_MIXER_GET_PRIVATE (mix);
gst_gl_base_mixer_reset (mix);
} }
static void static void
@ -466,8 +424,6 @@ gst_gl_base_mixer_stop (GstAggregator * agg)
mix->context = NULL; mix->context = NULL;
} }
gst_gl_base_mixer_reset (mix);
return TRUE; return TRUE;
} }

2
ext/gl/gstglbasemixer.h
View file

@ -47,8 +47,6 @@ typedef struct _GstGLBaseMixerPadClass GstGLBaseMixerPadClass;
struct _GstGLBaseMixerPad struct _GstGLBaseMixerPad
{ {
GstVideoAggregatorPad parent; /* subclass the pad */ GstVideoAggregatorPad parent; /* subclass the pad */
gboolean negotiated;
}; };
struct _GstGLBaseMixerPadClass struct _GstGLBaseMixerPadClass