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
This commit is contained in:
Jordan Petridis 2018-11-28 05:51:53 +02:00
parent 5d7ceeae61
commit 2229d53f60
No known key found for this signature in database
GPG key ID: 902CC06D159744F5
6 changed files with 12 additions and 15 deletions

View file

@ -64,8 +64,7 @@ static GstStaticPadTemplate gst_gl_download_element_src_pad_template =
GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( GST_STATIC_CAPS (EXTRA_CAPS_TEMPLATE
EXTRA_CAPS_TEMPLATE
"video/x-raw; video/x-raw(memory:GLMemory)")); "video/x-raw; video/x-raw(memory:GLMemory)"));
static GstStaticPadTemplate gst_gl_download_element_sink_pad_template = static GstStaticPadTemplate gst_gl_download_element_sink_pad_template =

View file

@ -877,12 +877,12 @@ gst_opus_enc_get_sink_template_caps (void)
* treated as a set of individual mono channels */ * treated as a set of individual mono channels */
s = gst_structure_copy (s2); s = gst_structure_copy (s2);
gst_structure_set (s, "channels", G_TYPE_INT, i, "channel-mask", 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); gst_caps_append_structure (caps, s);
s = gst_structure_copy (s1); s = gst_structure_copy (s1);
gst_structure_set (s, "channels", G_TYPE_INT, i, "channel-mask", 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); gst_caps_append_structure (caps, s);
} }

View file

@ -920,7 +920,7 @@ gst_audio_decoder_setup (GstAudioDecoder * dec)
gst_query_unref (query); gst_query_unref (query);
/* normalize to bool */ /* normalize to bool */
dec->priv->agg = !!res; dec->priv->agg = ! !res;
} }
static GstFlowReturn static GstFlowReturn

View file

@ -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", GST_DEBUG_OBJECT (window, "set window handle with size %dx%d",
foreign_window->width, foreign_window->height); 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); dispman_update = vc_dispmanx_update_start (0);
vc_dispmanx_element_remove (dispman_update, window_egl->native.element); vc_dispmanx_element_remove (dispman_update, window_egl->native.element);
vc_dispmanx_update_submit_sync (dispman_update); vc_dispmanx_update_submit_sync (dispman_update);

View file

@ -1785,8 +1785,7 @@ GST_START_TEST (test_layout_conv_fixate_caps)
incaps = gst_caps_from_string ("audio/x-raw, " incaps = gst_caps_from_string ("audio/x-raw, "
"format = (string) F32LE, " "format = (string) F32LE, "
"layout = (string) interleaved, " "layout = (string) interleaved, "
"rate = (int) 44100, " "rate = (int) 44100, " "channels = (int) 1");
"channels = (int) 1");
outcaps = gst_caps_from_string ("audio/x-raw, " outcaps = gst_caps_from_string ("audio/x-raw, "
"format = (string) S16LE, " "format = (string) S16LE, "
"layout = (string) interleaved, " "layout = (string) interleaved, "
@ -1795,8 +1794,7 @@ GST_START_TEST (test_layout_conv_fixate_caps)
"audio/x-raw, " "audio/x-raw, "
"format = (string) { F32LE, F32BE, F64LE, F64BE }, " "format = (string) { F32LE, F32BE, F64LE, F64BE }, "
"layout = (string) non-interleaved, " "layout = (string) non-interleaved, "
"rate = (int) [ 1, MAX ], " "rate = (int) [ 1, MAX ], " "channels = (int) [1, 8]");
"channels = (int) [1, 8]");
audioconvert = setup_audioconvert (outcaps); audioconvert = setup_audioconvert (outcaps);

View file

@ -112,11 +112,10 @@ GST_START_TEST (test_element_negotiation)
/* Ensures that filtering buffers with unknown caps down to fixed-caps /* Ensures that filtering buffers with unknown caps down to fixed-caps
* will apply those caps to the buffers. * will apply those caps to the buffers.
* see http://bugzilla.gnome.org/show_bug.cgi?id=315126 */ * see http://bugzilla.gnome.org/show_bug.cgi?id=315126 */
s = "fakesrc num-buffers=2 ! " s = "fakesrc num-buffers=2 ! " "audio/x-raw,format=" GST_AUDIO_NE (S16)
"audio/x-raw,format=" GST_AUDIO_NE (S16) ",rate=22050,channels=1,layout=interleaved " ",rate=22050,channels=1,layout=interleaved " "! audioconvert "
"! audioconvert " "! audio/x-raw,format=" GST_AUDIO_NE (S16)
"! audio/x-raw,format=" GST_AUDIO_NE (S16) ",rate=22050,channels=1,layout=interleaved " ",rate=22050,channels=1,layout=interleaved " "! fakesink";
"! fakesink";
run_pipeline (setup_pipeline (s), s, run_pipeline (setup_pipeline (s), s,
GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING), GST_MESSAGE_ANY & ~(GST_MESSAGE_ERROR | GST_MESSAGE_WARNING),
GST_MESSAGE_UNKNOWN); GST_MESSAGE_UNKNOWN);