From 2229d53f60b0cc23858e195fb30599ce6bdd2322 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Wed, 28 Nov 2018 05:51:53 +0200 Subject: [PATCH] Run gst-indent through the files This is required before we enabled an indent test in the CI. https://gitlab.freedesktop.org/gstreamer/gstreamer-project/issues/33 --- ext/gl/gstgldownloadelement.c | 3 +-- ext/opus/gstopusenc.c | 4 ++-- gst-libs/gst/audio/gstaudiodecoder.c | 2 +- gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.c | 3 ++- tests/check/elements/audioconvert.c | 6 ++---- tests/check/pipelines/simple-launch-lines.c | 9 ++++----- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/ext/gl/gstgldownloadelement.c b/ext/gl/gstgldownloadelement.c index aefc289..ae7bb07 100644 --- a/ext/gl/gstgldownloadelement.c +++ b/ext/gl/gstgldownloadelement.c @@ -64,8 +64,7 @@ static GstStaticPadTemplate gst_gl_download_element_src_pad_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS ( - EXTRA_CAPS_TEMPLATE + GST_STATIC_CAPS (EXTRA_CAPS_TEMPLATE "video/x-raw; video/x-raw(memory:GLMemory)")); static GstStaticPadTemplate gst_gl_download_element_sink_pad_template = diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c index e1aa930..a8eab79 100644 --- a/ext/opus/gstopusenc.c +++ b/ext/opus/gstopusenc.c @@ -877,12 +877,12 @@ gst_opus_enc_get_sink_template_caps (void) * treated as a set of individual mono channels */ s = gst_structure_copy (s2); gst_structure_set (s, "channels", G_TYPE_INT, i, "channel-mask", - GST_TYPE_BITMASK, G_GUINT64_CONSTANT(0), NULL); + GST_TYPE_BITMASK, G_GUINT64_CONSTANT (0), NULL); gst_caps_append_structure (caps, s); s = gst_structure_copy (s1); gst_structure_set (s, "channels", G_TYPE_INT, i, "channel-mask", - GST_TYPE_BITMASK, G_GUINT64_CONSTANT(0), NULL); + GST_TYPE_BITMASK, G_GUINT64_CONSTANT (0), NULL); gst_caps_append_structure (caps, s); } diff --git a/gst-libs/gst/audio/gstaudiodecoder.c b/gst-libs/gst/audio/gstaudiodecoder.c index 7900be6..95139ee 100644 --- a/gst-libs/gst/audio/gstaudiodecoder.c +++ b/gst-libs/gst/audio/gstaudiodecoder.c @@ -920,7 +920,7 @@ gst_audio_decoder_setup (GstAudioDecoder * dec) gst_query_unref (query); /* normalize to bool */ - dec->priv->agg = !!res; + dec->priv->agg = ! !res; } static GstFlowReturn diff --git a/gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.c b/gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.c index 46bd509..7b929ef 100644 --- a/gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.c +++ b/gst-libs/gst/gl/dispmanx/gstglwindow_dispmanx_egl.c @@ -192,7 +192,8 @@ gst_gl_window_dispmanx_egl_set_window_handle (GstGLWindow * window, GST_DEBUG_OBJECT (window, "set window handle with size %dx%d", foreign_window->width, foreign_window->height); - if (window_egl->native.element && window_egl->native.element != window_egl->foreign.element) { + if (window_egl->native.element + && window_egl->native.element != window_egl->foreign.element) { dispman_update = vc_dispmanx_update_start (0); vc_dispmanx_element_remove (dispman_update, window_egl->native.element); vc_dispmanx_update_submit_sync (dispman_update); diff --git a/tests/check/elements/audioconvert.c b/tests/check/elements/audioconvert.c index 0d8699b..807c351 100644 --- a/tests/check/elements/audioconvert.c +++ b/tests/check/elements/audioconvert.c @@ -1785,8 +1785,7 @@ GST_START_TEST (test_layout_conv_fixate_caps) incaps = gst_caps_from_string ("audio/x-raw, " "format = (string) F32LE, " "layout = (string) interleaved, " - "rate = (int) 44100, " - "channels = (int) 1"); + "rate = (int) 44100, " "channels = (int) 1"); outcaps = gst_caps_from_string ("audio/x-raw, " "format = (string) S16LE, " "layout = (string) interleaved, " @@ -1795,8 +1794,7 @@ GST_START_TEST (test_layout_conv_fixate_caps) "audio/x-raw, " "format = (string) { F32LE, F32BE, F64LE, F64BE }, " "layout = (string) non-interleaved, " - "rate = (int) [ 1, MAX ], " - "channels = (int) [1, 8]"); + "rate = (int) [ 1, MAX ], " "channels = (int) [1, 8]"); audioconvert = setup_audioconvert (outcaps); diff --git a/tests/check/pipelines/simple-launch-lines.c b/tests/check/pipelines/simple-launch-lines.c index cb079fc..2334265 100644 --- a/tests/check/pipelines/simple-launch-lines.c +++ b/tests/check/pipelines/simple-launch-lines.c @@ -112,11 +112,10 @@ GST_START_TEST (test_element_negotiation) /* Ensures that filtering buffers with unknown caps down to fixed-caps * will apply those caps to the buffers. * see http://bugzilla.gnome.org/show_bug.cgi?id=315126 */ - s = "fakesrc num-buffers=2 ! " - "audio/x-raw,format=" GST_AUDIO_NE (S16) ",rate=22050,channels=1,layout=interleaved " - "! audioconvert " - "! audio/x-raw,format=" GST_AUDIO_NE (S16) ",rate=22050,channels=1,layout=interleaved " - "! fakesink"; + s = "fakesrc num-buffers=2 ! " "audio/x-raw,format=" GST_AUDIO_NE (S16) + ",rate=22050,channels=1,layout=interleaved " "! audioconvert " + "! audio/x-raw,format=" GST_AUDIO_NE (S16) + ",rate=22050,channels=1,layout=interleaved " "! fakesink"; run_pipeline (setup_pipeline (s), s, GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING), GST_MESSAGE_UNKNOWN); -- 2.7.4