mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 22:36:33 +00:00
videomixer: fix gst-indent screwup
This commit is contained in:
parent
37634c2afb
commit
62d118678a
1 changed files with 0 additions and 50 deletions
|
@ -184,7 +184,6 @@ gst_videomixer_pad_set_property (GObject * object, guint prop_id,
|
||||||
const GValue * value, GParamSpec * pspec)
|
const GValue * value, GParamSpec * pspec)
|
||||||
{
|
{
|
||||||
GstVideoMixerPad *pad;
|
GstVideoMixerPad *pad;
|
||||||
|
|
||||||
GstVideoMixer *mix;
|
GstVideoMixer *mix;
|
||||||
|
|
||||||
pad = GST_VIDEO_MIXER_PAD (object);
|
pad = GST_VIDEO_MIXER_PAD (object);
|
||||||
|
@ -218,9 +217,7 @@ static void
|
||||||
gst_videomixer_set_master_geometry (GstVideoMixer * mix)
|
gst_videomixer_set_master_geometry (GstVideoMixer * mix)
|
||||||
{
|
{
|
||||||
GSList *walk;
|
GSList *walk;
|
||||||
|
|
||||||
gint width = 0, height = 0, fps_n = 0, fps_d = 0;
|
gint width = 0, height = 0, fps_n = 0, fps_d = 0;
|
||||||
|
|
||||||
GstVideoMixerPad *master = NULL;
|
GstVideoMixerPad *master = NULL;
|
||||||
|
|
||||||
walk = mix->sinkpads;
|
walk = mix->sinkpads;
|
||||||
|
@ -263,15 +260,10 @@ static gboolean
|
||||||
gst_videomixer_pad_sink_setcaps (GstPad * pad, GstCaps * vscaps)
|
gst_videomixer_pad_sink_setcaps (GstPad * pad, GstCaps * vscaps)
|
||||||
{
|
{
|
||||||
GstVideoMixer *mix;
|
GstVideoMixer *mix;
|
||||||
|
|
||||||
GstVideoMixerPad *mixpad;
|
GstVideoMixerPad *mixpad;
|
||||||
|
|
||||||
GstStructure *structure;
|
GstStructure *structure;
|
||||||
|
|
||||||
gint in_width, in_height;
|
gint in_width, in_height;
|
||||||
|
|
||||||
gboolean ret = FALSE;
|
gboolean ret = FALSE;
|
||||||
|
|
||||||
const GValue *framerate;
|
const GValue *framerate;
|
||||||
|
|
||||||
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
|
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
|
||||||
|
@ -401,7 +393,6 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink_%d",
|
||||||
static void gst_videomixer_finalize (GObject * object);
|
static void gst_videomixer_finalize (GObject * object);
|
||||||
|
|
||||||
static GstCaps *gst_videomixer_getcaps (GstPad * pad);
|
static GstCaps *gst_videomixer_getcaps (GstPad * pad);
|
||||||
|
|
||||||
static gboolean gst_videomixer_query (GstPad * pad, GstQuery * query);
|
static gboolean gst_videomixer_query (GstPad * pad, GstQuery * query);
|
||||||
|
|
||||||
static GstFlowReturn gst_videomixer_collected (GstCollectPads * pads,
|
static GstFlowReturn gst_videomixer_collected (GstCollectPads * pads,
|
||||||
|
@ -444,7 +435,6 @@ gst_videomixer_child_proxy_get_child_by_index (GstChildProxy * child_proxy,
|
||||||
guint index)
|
guint index)
|
||||||
{
|
{
|
||||||
GstVideoMixer *mix = GST_VIDEO_MIXER (child_proxy);
|
GstVideoMixer *mix = GST_VIDEO_MIXER (child_proxy);
|
||||||
|
|
||||||
GstObject *obj;
|
GstObject *obj;
|
||||||
|
|
||||||
GST_VIDEO_MIXER_STATE_LOCK (mix);
|
GST_VIDEO_MIXER_STATE_LOCK (mix);
|
||||||
|
@ -458,7 +448,6 @@ static guint
|
||||||
gst_videomixer_child_proxy_get_children_count (GstChildProxy * child_proxy)
|
gst_videomixer_child_proxy_get_children_count (GstChildProxy * child_proxy)
|
||||||
{
|
{
|
||||||
guint count = 0;
|
guint count = 0;
|
||||||
|
|
||||||
GstVideoMixer *mix = GST_VIDEO_MIXER (child_proxy);
|
GstVideoMixer *mix = GST_VIDEO_MIXER (child_proxy);
|
||||||
|
|
||||||
GST_VIDEO_MIXER_STATE_LOCK (mix);
|
GST_VIDEO_MIXER_STATE_LOCK (mix);
|
||||||
|
@ -495,7 +484,6 @@ static void
|
||||||
gst_videomixer_class_init (GstVideoMixerClass * klass)
|
gst_videomixer_class_init (GstVideoMixerClass * klass)
|
||||||
{
|
{
|
||||||
GObjectClass *gobject_class;
|
GObjectClass *gobject_class;
|
||||||
|
|
||||||
GstElementClass *gstelement_class;
|
GstElementClass *gstelement_class;
|
||||||
|
|
||||||
gobject_class = (GObjectClass *) klass;
|
gobject_class = (GObjectClass *) klass;
|
||||||
|
@ -605,13 +593,9 @@ static gboolean
|
||||||
gst_videomixer_query_duration (GstVideoMixer * mix, GstQuery * query)
|
gst_videomixer_query_duration (GstVideoMixer * mix, GstQuery * query)
|
||||||
{
|
{
|
||||||
gint64 max;
|
gint64 max;
|
||||||
|
|
||||||
gboolean res;
|
gboolean res;
|
||||||
|
|
||||||
GstFormat format;
|
GstFormat format;
|
||||||
|
|
||||||
GstIterator *it;
|
GstIterator *it;
|
||||||
|
|
||||||
gboolean done;
|
gboolean done;
|
||||||
|
|
||||||
/* parse format */
|
/* parse format */
|
||||||
|
@ -625,7 +609,6 @@ gst_videomixer_query_duration (GstVideoMixer * mix, GstQuery * query)
|
||||||
it = gst_element_iterate_sink_pads (GST_ELEMENT_CAST (mix));
|
it = gst_element_iterate_sink_pads (GST_ELEMENT_CAST (mix));
|
||||||
while (!done) {
|
while (!done) {
|
||||||
GstIteratorResult ires;
|
GstIteratorResult ires;
|
||||||
|
|
||||||
gpointer item;
|
gpointer item;
|
||||||
|
|
||||||
ires = gst_iterator_next (it, &item);
|
ires = gst_iterator_next (it, &item);
|
||||||
|
@ -636,7 +619,6 @@ gst_videomixer_query_duration (GstVideoMixer * mix, GstQuery * query)
|
||||||
case GST_ITERATOR_OK:
|
case GST_ITERATOR_OK:
|
||||||
{
|
{
|
||||||
GstPad *pad = GST_PAD_CAST (item);
|
GstPad *pad = GST_PAD_CAST (item);
|
||||||
|
|
||||||
gint64 duration;
|
gint64 duration;
|
||||||
|
|
||||||
/* ask sink peer for duration */
|
/* ask sink peer for duration */
|
||||||
|
@ -682,18 +664,13 @@ static gboolean
|
||||||
gst_videomixer_query_latency (GstVideoMixer * mix, GstQuery * query)
|
gst_videomixer_query_latency (GstVideoMixer * mix, GstQuery * query)
|
||||||
{
|
{
|
||||||
GstClockTime min, max;
|
GstClockTime min, max;
|
||||||
|
|
||||||
gboolean live;
|
gboolean live;
|
||||||
|
|
||||||
gboolean res;
|
gboolean res;
|
||||||
|
|
||||||
GstIterator *it;
|
GstIterator *it;
|
||||||
|
|
||||||
gboolean done;
|
gboolean done;
|
||||||
|
|
||||||
res = TRUE;
|
res = TRUE;
|
||||||
done = FALSE;
|
done = FALSE;
|
||||||
|
|
||||||
live = FALSE;
|
live = FALSE;
|
||||||
min = 0;
|
min = 0;
|
||||||
max = GST_CLOCK_TIME_NONE;
|
max = GST_CLOCK_TIME_NONE;
|
||||||
|
@ -702,7 +679,6 @@ gst_videomixer_query_latency (GstVideoMixer * mix, GstQuery * query)
|
||||||
it = gst_element_iterate_sink_pads (GST_ELEMENT_CAST (mix));
|
it = gst_element_iterate_sink_pads (GST_ELEMENT_CAST (mix));
|
||||||
while (!done) {
|
while (!done) {
|
||||||
GstIteratorResult ires;
|
GstIteratorResult ires;
|
||||||
|
|
||||||
gpointer item;
|
gpointer item;
|
||||||
|
|
||||||
ires = gst_iterator_next (it, &item);
|
ires = gst_iterator_next (it, &item);
|
||||||
|
@ -774,7 +750,6 @@ static gboolean
|
||||||
gst_videomixer_query (GstPad * pad, GstQuery * query)
|
gst_videomixer_query (GstPad * pad, GstQuery * query)
|
||||||
{
|
{
|
||||||
GstVideoMixer *mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
|
GstVideoMixer *mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
gboolean res = FALSE;
|
gboolean res = FALSE;
|
||||||
|
|
||||||
switch (GST_QUERY_TYPE (query)) {
|
switch (GST_QUERY_TYPE (query)) {
|
||||||
|
@ -816,9 +791,7 @@ static GstCaps *
|
||||||
gst_videomixer_getcaps (GstPad * pad)
|
gst_videomixer_getcaps (GstPad * pad)
|
||||||
{
|
{
|
||||||
GstVideoMixer *mix;
|
GstVideoMixer *mix;
|
||||||
|
|
||||||
GstCaps *caps;
|
GstCaps *caps;
|
||||||
|
|
||||||
GstStructure *structure;
|
GstStructure *structure;
|
||||||
|
|
||||||
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
|
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
|
||||||
|
@ -847,9 +820,7 @@ gst_videomixer_request_new_pad (GstElement * element,
|
||||||
GstPadTemplate * templ, const gchar * req_name)
|
GstPadTemplate * templ, const gchar * req_name)
|
||||||
{
|
{
|
||||||
GstVideoMixer *mix = NULL;
|
GstVideoMixer *mix = NULL;
|
||||||
|
|
||||||
GstVideoMixerPad *mixpad = NULL;
|
GstVideoMixerPad *mixpad = NULL;
|
||||||
|
|
||||||
GstElementClass *klass = GST_ELEMENT_GET_CLASS (element);
|
GstElementClass *klass = GST_ELEMENT_GET_CLASS (element);
|
||||||
|
|
||||||
g_return_val_if_fail (templ != NULL, NULL);
|
g_return_val_if_fail (templ != NULL, NULL);
|
||||||
|
@ -865,9 +836,7 @@ gst_videomixer_request_new_pad (GstElement * element,
|
||||||
|
|
||||||
if (templ == gst_element_class_get_pad_template (klass, "sink_%d")) {
|
if (templ == gst_element_class_get_pad_template (klass, "sink_%d")) {
|
||||||
gint serial = 0;
|
gint serial = 0;
|
||||||
|
|
||||||
gchar *name = NULL;
|
gchar *name = NULL;
|
||||||
|
|
||||||
GstVideoMixerCollect *mixcol = NULL;
|
GstVideoMixerCollect *mixcol = NULL;
|
||||||
|
|
||||||
if (req_name == NULL || strlen (req_name) < 6) {
|
if (req_name == NULL || strlen (req_name) < 6) {
|
||||||
|
@ -927,7 +896,6 @@ static void
|
||||||
gst_videomixer_release_pad (GstElement * element, GstPad * pad)
|
gst_videomixer_release_pad (GstElement * element, GstPad * pad)
|
||||||
{
|
{
|
||||||
GstVideoMixer *mix = NULL;
|
GstVideoMixer *mix = NULL;
|
||||||
|
|
||||||
GstVideoMixerPad *mixpad;
|
GstVideoMixerPad *mixpad;
|
||||||
|
|
||||||
mix = GST_VIDEO_MIXER (element);
|
mix = GST_VIDEO_MIXER (element);
|
||||||
|
@ -1110,13 +1078,9 @@ gst_videomixer_blend_ayuv_ayuv (guint8 * src, gint xpos, gint ypos,
|
||||||
guint8 * dest, gint dest_width, gint dest_height)
|
guint8 * dest, gint dest_width, gint dest_height)
|
||||||
{
|
{
|
||||||
gint alpha, b_alpha;
|
gint alpha, b_alpha;
|
||||||
|
|
||||||
gint i, j;
|
gint i, j;
|
||||||
|
|
||||||
gint src_stride, dest_stride;
|
gint src_stride, dest_stride;
|
||||||
|
|
||||||
gint src_add, dest_add;
|
gint src_add, dest_add;
|
||||||
|
|
||||||
gint Y, U, V;
|
gint Y, U, V;
|
||||||
|
|
||||||
src_stride = src_width * 4;
|
src_stride = src_width * 4;
|
||||||
|
@ -1222,7 +1186,6 @@ static gboolean
|
||||||
gst_videomixer_fill_queues (GstVideoMixer * mix)
|
gst_videomixer_fill_queues (GstVideoMixer * mix)
|
||||||
{
|
{
|
||||||
GSList *walk = NULL;
|
GSList *walk = NULL;
|
||||||
|
|
||||||
gboolean eos = TRUE;
|
gboolean eos = TRUE;
|
||||||
|
|
||||||
g_return_val_if_fail (GST_IS_VIDEO_MIXER (mix), FALSE);
|
g_return_val_if_fail (GST_IS_VIDEO_MIXER (mix), FALSE);
|
||||||
|
@ -1231,9 +1194,7 @@ gst_videomixer_fill_queues (GstVideoMixer * mix)
|
||||||
walk = mix->collect->data;
|
walk = mix->collect->data;
|
||||||
while (walk) {
|
while (walk) {
|
||||||
GstCollectData *data = (GstCollectData *) walk->data;
|
GstCollectData *data = (GstCollectData *) walk->data;
|
||||||
|
|
||||||
GstVideoMixerCollect *mixcol = (GstVideoMixerCollect *) data;
|
GstVideoMixerCollect *mixcol = (GstVideoMixerCollect *) data;
|
||||||
|
|
||||||
GstVideoMixerPad *mixpad = mixcol->mixpad;
|
GstVideoMixerPad *mixpad = mixcol->mixpad;
|
||||||
|
|
||||||
walk = g_slist_next (walk);
|
walk = g_slist_next (walk);
|
||||||
|
@ -1271,7 +1232,6 @@ gst_videomixer_fill_queues (GstVideoMixer * mix)
|
||||||
if (mix->sendseg && (mixpad == mix->master)) {
|
if (mix->sendseg && (mixpad == mix->master)) {
|
||||||
GstEvent *event;
|
GstEvent *event;
|
||||||
gint64 stop, start;
|
gint64 stop, start;
|
||||||
|
|
||||||
GstSegment *segment = &data->segment;
|
GstSegment *segment = &data->segment;
|
||||||
|
|
||||||
/* FIXME, use rate/applied_rate as set on all sinkpads.
|
/* FIXME, use rate/applied_rate as set on all sinkpads.
|
||||||
|
@ -1322,7 +1282,6 @@ gst_videomixer_blend_buffers (GstVideoMixer * mix, GstBuffer * outbuf)
|
||||||
walk = mix->sinkpads;
|
walk = mix->sinkpads;
|
||||||
while (walk) { /* We walk with this list because it's ordered */
|
while (walk) { /* We walk with this list because it's ordered */
|
||||||
GstVideoMixerPad *pad = GST_VIDEO_MIXER_PAD (walk->data);
|
GstVideoMixerPad *pad = GST_VIDEO_MIXER_PAD (walk->data);
|
||||||
|
|
||||||
GstVideoMixerCollect *mixcol = pad->mixcol;
|
GstVideoMixerCollect *mixcol = pad->mixcol;
|
||||||
|
|
||||||
walk = g_slist_next (walk);
|
walk = g_slist_next (walk);
|
||||||
|
@ -1372,7 +1331,6 @@ static void
|
||||||
gst_videomixer_update_queues (GstVideoMixer * mix)
|
gst_videomixer_update_queues (GstVideoMixer * mix)
|
||||||
{
|
{
|
||||||
GSList *walk;
|
GSList *walk;
|
||||||
|
|
||||||
guint64 interval;
|
guint64 interval;
|
||||||
|
|
||||||
interval = mix->master->queued;
|
interval = mix->master->queued;
|
||||||
|
@ -1388,7 +1346,6 @@ gst_videomixer_update_queues (GstVideoMixer * mix)
|
||||||
walk = mix->sinkpads;
|
walk = mix->sinkpads;
|
||||||
while (walk) {
|
while (walk) {
|
||||||
GstVideoMixerPad *pad = GST_VIDEO_MIXER_PAD (walk->data);
|
GstVideoMixerPad *pad = GST_VIDEO_MIXER_PAD (walk->data);
|
||||||
|
|
||||||
GstVideoMixerCollect *mixcol = pad->mixcol;
|
GstVideoMixerCollect *mixcol = pad->mixcol;
|
||||||
|
|
||||||
walk = g_slist_next (walk);
|
walk = g_slist_next (walk);
|
||||||
|
@ -1409,11 +1366,8 @@ static GstFlowReturn
|
||||||
gst_videomixer_collected (GstCollectPads * pads, GstVideoMixer * mix)
|
gst_videomixer_collected (GstCollectPads * pads, GstVideoMixer * mix)
|
||||||
{
|
{
|
||||||
GstFlowReturn ret = GST_FLOW_OK;
|
GstFlowReturn ret = GST_FLOW_OK;
|
||||||
|
|
||||||
GstBuffer *outbuf = NULL;
|
GstBuffer *outbuf = NULL;
|
||||||
|
|
||||||
size_t outsize = 0;
|
size_t outsize = 0;
|
||||||
|
|
||||||
gboolean eos = FALSE;
|
gboolean eos = FALSE;
|
||||||
|
|
||||||
g_return_val_if_fail (GST_IS_VIDEO_MIXER (mix), GST_FLOW_ERROR);
|
g_return_val_if_fail (GST_IS_VIDEO_MIXER (mix), GST_FLOW_ERROR);
|
||||||
|
@ -1524,7 +1478,6 @@ static gboolean
|
||||||
forward_event (GstVideoMixer * mix, GstEvent * event)
|
forward_event (GstVideoMixer * mix, GstEvent * event)
|
||||||
{
|
{
|
||||||
gboolean ret;
|
gboolean ret;
|
||||||
|
|
||||||
GstIterator *it;
|
GstIterator *it;
|
||||||
GValue vret = { 0 };
|
GValue vret = { 0 };
|
||||||
|
|
||||||
|
@ -1550,7 +1503,6 @@ static gboolean
|
||||||
gst_videomixer_src_event (GstPad * pad, GstEvent * event)
|
gst_videomixer_src_event (GstPad * pad, GstEvent * event)
|
||||||
{
|
{
|
||||||
GstVideoMixer *mix;
|
GstVideoMixer *mix;
|
||||||
|
|
||||||
gboolean result;
|
gboolean result;
|
||||||
|
|
||||||
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
|
mix = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
|
||||||
|
@ -1613,7 +1565,6 @@ static gboolean
|
||||||
gst_videomixer_sink_event (GstPad * pad, GstEvent * event)
|
gst_videomixer_sink_event (GstPad * pad, GstEvent * event)
|
||||||
{
|
{
|
||||||
GstVideoMixer *videomixer;
|
GstVideoMixer *videomixer;
|
||||||
|
|
||||||
gboolean ret;
|
gboolean ret;
|
||||||
|
|
||||||
videomixer = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
|
videomixer = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
|
||||||
|
@ -1682,7 +1633,6 @@ static GstStateChangeReturn
|
||||||
gst_videomixer_change_state (GstElement * element, GstStateChange transition)
|
gst_videomixer_change_state (GstElement * element, GstStateChange transition)
|
||||||
{
|
{
|
||||||
GstVideoMixer *mix;
|
GstVideoMixer *mix;
|
||||||
|
|
||||||
GstStateChangeReturn ret;
|
GstStateChangeReturn ret;
|
||||||
|
|
||||||
g_return_val_if_fail (GST_IS_VIDEO_MIXER (element), GST_STATE_CHANGE_FAILURE);
|
g_return_val_if_fail (GST_IS_VIDEO_MIXER (element), GST_STATE_CHANGE_FAILURE);
|
||||||
|
|
Loading…
Reference in a new issue