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 13:35:35 +02:00 committed by Tim-Philipp Müller
parent 465ea32d73
commit 1f562870ee
8 changed files with 82 additions and 60 deletions

View File

@ -120,7 +120,6 @@ _gst_dtls_init_openssl (void)
OPENSSL_VERSION_TEXT);
g_assert_not_reached ();
}
#if OPENSSL_VERSION_NUMBER < 0x10100000L
GST_INFO_OBJECT (NULL, "initializing openssl %lx", OPENSSL_VERSION_NUMBER);
SSL_library_init ();

View File

@ -362,7 +362,8 @@ _add_turn_server (GstWebRTCICE * ice, struct NiceStreamItem *item,
for (i = 0; i < relay_n; i++) {
ret = nice_agent_set_relay_info (ice->priv->nice_agent,
item->nice_stream_id, NICE_COMPONENT_TYPE_RTP,
gst_uri_get_host (turn_server), gst_uri_get_port (turn_server), user, pass, relays[i]);
gst_uri_get_host (turn_server), gst_uri_get_port (turn_server), user,
pass, relays[i]);
if (!ret) {
gchar *uri = gst_uri_to_string (turn_server);
GST_ERROR_OBJECT (ice, "Failed to set TURN server '%s'", uri);
@ -371,7 +372,8 @@ _add_turn_server (GstWebRTCICE * ice, struct NiceStreamItem *item,
}
ret = nice_agent_set_relay_info (ice->priv->nice_agent,
item->nice_stream_id, NICE_COMPONENT_TYPE_RTCP,
gst_uri_get_host (turn_server), gst_uri_get_port (turn_server), user, pass, relays[i]);
gst_uri_get_host (turn_server), gst_uri_get_port (turn_server), user,
pass, relays[i]);
if (!ret) {
gchar *uri = gst_uri_to_string (turn_server);
GST_ERROR_OBJECT (ice, "Failed to set TURN server '%s'", uri);

View File

@ -983,7 +983,9 @@ _gl_sync_release_next_buffer (struct gl_sync *sync, gboolean render)
}
#define I(x,y) ((y)*4+(x))
static int affine_inverse (float in[], float out[]) {
static int
affine_inverse (float in[], float out[])
{
float s0, s1, s2, s3, s4, s5;
float c0, c1, c2, c3, c4, c5;
float det, invdet;
@ -1007,28 +1009,45 @@ static int affine_inverse (float in[], float out[]) {
return 0;
invdet = 1.0 / det;
out[I(0,0)] = ( in[I(1,1)] * c5 - in[I(1,2)] * c4 + in[I(1,3)] * c3) * invdet;
out[I(0,1)] = (-in[I(0,1)] * c5 + in[I(0,2)] * c4 - in[I(0,3)] * c3) * invdet;
out[I(0,2)] = ( in[I(3,1)] * s5 - in[I(3,2)] * s4 + in[I(3,3)] * s3) * invdet;
out[I(0,3)] = (-in[I(2,1)] * s5 + in[I(2,2)] * s4 - in[I(2,3)] * s3) * invdet;
out[I (0, 0)] =
(in[I (1, 1)] * c5 - in[I (1, 2)] * c4 + in[I (1, 3)] * c3) * invdet;
out[I (0, 1)] =
(-in[I (0, 1)] * c5 + in[I (0, 2)] * c4 - in[I (0, 3)] * c3) * invdet;
out[I (0, 2)] =
(in[I (3, 1)] * s5 - in[I (3, 2)] * s4 + in[I (3, 3)] * s3) * invdet;
out[I (0, 3)] =
(-in[I (2, 1)] * s5 + in[I (2, 2)] * s4 - in[I (2, 3)] * s3) * invdet;
out[I(1,0)] = (-in[I(1,0)] * c5 + in[I(1,2)] * c2 - in[I(1,3)] * c1) * invdet;
out[I(1,1)] = ( in[I(0,0)] * c5 - in[I(0,2)] * c2 + in[I(0,3)] * c1) * invdet;
out[I(1,2)] = (-in[I(3,0)] * s5 + in[I(3,2)] * s2 - in[I(3,3)] * s1) * invdet;
out[I(1,3)] = ( in[I(2,0)] * s5 - in[I(2,2)] * s2 + in[I(2,3)] * s1) * invdet;
out[I (1, 0)] =
(-in[I (1, 0)] * c5 + in[I (1, 2)] * c2 - in[I (1, 3)] * c1) * invdet;
out[I (1, 1)] =
(in[I (0, 0)] * c5 - in[I (0, 2)] * c2 + in[I (0, 3)] * c1) * invdet;
out[I (1, 2)] =
(-in[I (3, 0)] * s5 + in[I (3, 2)] * s2 - in[I (3, 3)] * s1) * invdet;
out[I (1, 3)] =
(in[I (2, 0)] * s5 - in[I (2, 2)] * s2 + in[I (2, 3)] * s1) * invdet;
out[I(2,0)] = ( in[I(1,0)] * c4 - in[I(1,1)] * c2 + in[I(1,3)] * c0) * invdet;
out[I(2,1)] = (-in[I(0,0)] * c4 + in[I(0,1)] * c2 - in[I(0,3)] * c0) * invdet;
out[I(2,2)] = ( in[I(3,0)] * s4 - in[I(3,1)] * s2 + in[I(3,3)] * s0) * invdet;
out[I(2,3)] = (-in[I(2,0)] * s4 + in[I(2,1)] * s2 - in[I(2,3)] * s0) * invdet;
out[I (2, 0)] =
(in[I (1, 0)] * c4 - in[I (1, 1)] * c2 + in[I (1, 3)] * c0) * invdet;
out[I (2, 1)] =
(-in[I (0, 0)] * c4 + in[I (0, 1)] * c2 - in[I (0, 3)] * c0) * invdet;
out[I (2, 2)] =
(in[I (3, 0)] * s4 - in[I (3, 1)] * s2 + in[I (3, 3)] * s0) * invdet;
out[I (2, 3)] =
(-in[I (2, 0)] * s4 + in[I (2, 1)] * s2 - in[I (2, 3)] * s0) * invdet;
out[I(3,0)] = (-in[I(1,0)] * c3 + in[I(1,1)] * c1 - in[I(1,2)] * c0) * invdet;
out[I(3,1)] = ( in[I(0,0)] * c3 - in[I(0,1)] * c1 + in[I(0,2)] * c0) * invdet;
out[I(3,2)] = (-in[I(3,0)] * s3 + in[I(3,1)] * s1 - in[I(3,2)] * s0) * invdet;
out[I(3,3)] = ( in[I(2,0)] * s3 - in[I(2,1)] * s1 + in[I(2,2)] * s0) * invdet;
out[I (3, 0)] =
(-in[I (1, 0)] * c3 + in[I (1, 1)] * c1 - in[I (1, 2)] * c0) * invdet;
out[I (3, 1)] =
(in[I (0, 0)] * c3 - in[I (0, 1)] * c1 + in[I (0, 2)] * c0) * invdet;
out[I (3, 2)] =
(-in[I (3, 0)] * s3 + in[I (3, 1)] * s1 - in[I (3, 2)] * s0) * invdet;
out[I (3, 3)] =
(in[I (2, 0)] * s3 - in[I (2, 1)] * s1 + in[I (2, 2)] * s0) * invdet;
return 1;
}
#undef I
/* caller should remove from the gl_queue after calling this function.
@ -1091,13 +1110,12 @@ _gl_sync_render_unlocked (struct gl_sync *sync)
* opposite - so we invert it */
if (affine_inverse (matrix, inv_mat)) {
gst_video_affine_transformation_meta_apply_matrix (af_meta, inv_mat);
}
else {
GST_WARNING ("Failed to invert display transform - the video won't display right. "
} else {
GST_WARNING
("Failed to invert display transform - the video won't display right. "
"Transform matrix [ %f %f %f %f, %f %f %f %f, %f %f %f %f, %f %f %f %f ]",
matrix[0], matrix[1], matrix[2], matrix[3],
matrix[4], matrix[5], matrix[6], matrix[7],
matrix[8], matrix[9], matrix[10], matrix[11],
matrix[0], matrix[1], matrix[2], matrix[3], matrix[4], matrix[5],
matrix[6], matrix[7], matrix[8], matrix[9], matrix[10], matrix[11],
matrix[12], matrix[13], matrix[14], matrix[15]);
}
gst_video_affine_transformation_meta_apply_matrix (af_meta, yflip_matrix);

View File

@ -1,3 +1,5 @@
/* *INDENT-OFF* */
/* this ALWAYS GENERATED file contains the IIDs and CLSIDs */
@ -376,3 +378,5 @@ MIDL_DEFINE_GUID(IID, IID_IDeckLinkInput_v7_1,0x2B54EDEF,0x5B32,0x429F,0xBA,0x11
/* *INDENT-ON* */

View File

@ -344,8 +344,7 @@ msg_window_message_proc (HWND window_handle, UINT message,
break;
devices =
ks_enumerate_devices (&bcdi->dbcc_classguid,
&KSCATEGORY_CAPTURE);
ks_enumerate_devices (&bcdi->dbcc_classguid, &KSCATEGORY_CAPTURE);
if (devices == NULL)
break;