mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 08:41:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

Run gst-indent through the files

Browse source 
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:52:16 +02:00
parent 2e0a45d7df
commit 515ada7e22
No known key found for this signature in database
GPG key ID: 902CC06D159744F5
7 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst/rtp/gstrtpg722pay.c
View file

@ -53,8 +53,7 @@ static GstStaticPadTemplate gst_rtp_g722_pay_src_template =
"media = (string) \"audio\", " "media = (string) \"audio\", "
"encoding-name = (string) \"G722\", " "encoding-name = (string) \"G722\", "
"payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", " "payload = (int) " GST_RTP_PAYLOAD_DYNAMIC_STRING ", "
"encoding-params = (string) 1, " "encoding-params = (string) 1, " "clock-rate = (int) 8000")
"clock-rate = (int) 8000")
); );
static gboolean gst_rtp_g722_pay_setcaps (GstRTPBasePayload * basepayload, static gboolean gst_rtp_g722_pay_setcaps (GstRTPBasePayload * basepayload,

3
gst/udp/gstudpsrc.c
View file

@ -1364,7 +1364,8 @@ gst_udpsrc_open (GstUDPSrc * src)
bind_saddr = g_inet_socket_address_new (bind_addr, src->port); bind_saddr = g_inet_socket_address_new (bind_addr, src->port);
g_object_unref (bind_addr); g_object_unref (bind_addr);
if (!g_socket_bind (src->used_socket, bind_saddr, src->reuse, &err)) { if (!g_socket_bind (src->used_socket, bind_saddr, src->reuse, &err)) {
GST_ERROR_OBJECT (src, "%s: error binding to %s:%d", err->message, src->address, src->port); GST_ERROR_OBJECT (src, "%s: error binding to %s:%d", err->message,
src->address, src->port);
goto bind_error; goto bind_error;
} }

3
sys/v4l2/gstv4l2jpegenc.c
View file

@ -40,8 +40,7 @@
GST_DEBUG_CATEGORY_STATIC (gst_v4l2_jpeg_enc_debug); GST_DEBUG_CATEGORY_STATIC (gst_v4l2_jpeg_enc_debug);
#define GST_CAT_DEFAULT gst_v4l2_jpeg_enc_debug #define GST_CAT_DEFAULT gst_v4l2_jpeg_enc_debug
static GstStaticCaps src_template_caps = static GstStaticCaps src_template_caps = GST_STATIC_CAPS ("image/jpeg");
GST_STATIC_CAPS ("image/jpeg");
enum enum
{ {

29
tests/check/elements/rtpmux.c
View file

@ -474,10 +474,8 @@ GST_END_TEST;
GST_START_TEST (test_rtpmux_ssrc_property_overrules_downstream) GST_START_TEST (test_rtpmux_ssrc_property_overrules_downstream)
{ {
GstHarness *h = gst_harness_new_with_padnames ("rtpmux", NULL, "src"); GstHarness *h = gst_harness_new_with_padnames ("rtpmux", NULL, "src");
GstHarness * h0 = gst_harness_new_with_element ( GstHarness *h0 = gst_harness_new_with_element (h->element, "sink_0", NULL);
h->element, "sink_0", NULL); GstHarness *h1 = gst_harness_new_with_element (h->element, "sink_1", NULL);
GstHarness * h1 = gst_harness_new_with_element (
h->element, "sink_1", NULL);
GstBuffer *buf0; GstBuffer *buf0;
GstBuffer *buf1; GstBuffer *buf1;
@ -520,15 +518,14 @@ GST_START_TEST (test_rtpmux_ssrc_property_overrules_downstream)
gst_harness_teardown (h1); gst_harness_teardown (h1);
gst_harness_teardown (h); gst_harness_teardown (h);
} }
GST_END_TEST; GST_END_TEST;
GST_START_TEST (test_rtpmux_ssrc_property_survive_statechange) GST_START_TEST (test_rtpmux_ssrc_property_survive_statechange)
{ {
GstHarness *h = gst_harness_new_with_padnames ("rtpmux", NULL, "src"); GstHarness *h = gst_harness_new_with_padnames ("rtpmux", NULL, "src");
GstHarness * h0 = gst_harness_new_with_element ( GstHarness *h0 = gst_harness_new_with_element (h->element, "sink_0", NULL);
h->element, "sink_0", NULL); GstHarness *h1 = gst_harness_new_with_element (h->element, "sink_1", NULL);
GstHarness * h1 = gst_harness_new_with_element (
h->element, "sink_1", NULL);
GstBuffer *buf0; GstBuffer *buf0;
GstBuffer *buf1; GstBuffer *buf1;
@ -565,6 +562,7 @@ GST_START_TEST (test_rtpmux_ssrc_property_survive_statechange)
gst_harness_teardown (h1); gst_harness_teardown (h1);
gst_harness_teardown (h); gst_harness_teardown (h);
} }
GST_END_TEST; GST_END_TEST;
GST_START_TEST (test_rtpmux_ssrc_downstream_dynamic) GST_START_TEST (test_rtpmux_ssrc_downstream_dynamic)
@ -661,11 +659,14 @@ GST_START_TEST (test_rtpmux_ts_offset_downstream_overrules_upstream)
GstBuffer *buf1; GstBuffer *buf1;
/* downstream is specifying 1234567 as ts-offset */ /* downstream is specifying 1234567 as ts-offset */
gst_harness_set_sink_caps_str (h, "application/x-rtp, timestamp-offset=(uint)1234567"); gst_harness_set_sink_caps_str (h,
"application/x-rtp, timestamp-offset=(uint)1234567");
/* while upstream ts-offset is 1600 (10 * 160) and 16000 (100 * 160) */ /* while upstream ts-offset is 1600 (10 * 160) and 16000 (100 * 160) */
gst_harness_set_src_caps_str (h0, "application/x-rtp, timestamp-offset=(uint)1600"); gst_harness_set_src_caps_str (h0,
gst_harness_set_src_caps_str (h1, "application/x-rtp, timestamp-offset=(uint)16000"); "application/x-rtp, timestamp-offset=(uint)1600");
gst_harness_set_src_caps_str (h1,
"application/x-rtp, timestamp-offset=(uint)16000");
/* push a buffer starting with rtp-timestamp: 1600 (10 * 160) */ /* push a buffer starting with rtp-timestamp: 1600 (10 * 160) */
fail_unless_equals_int (GST_FLOW_OK, fail_unless_equals_int (GST_FLOW_OK,
@ -709,8 +710,10 @@ rtpmux_suite (void)
tcase_add_test (tc_chain, test_rtpmux_ssrc_downstream_dynamic); tcase_add_test (tc_chain, test_rtpmux_ssrc_downstream_dynamic);
tcase_add_test (tc_chain, test_rtpmux_caps_query_with_downsteam_ts_offset_and_ssrc); tcase_add_test (tc_chain,
tcase_add_test (tc_chain, test_rtpmux_ts_offset_downstream_overrules_upstream); test_rtpmux_caps_query_with_downsteam_ts_offset_and_ssrc);
tcase_add_test (tc_chain,
test_rtpmux_ts_offset_downstream_overrules_upstream);
tc_chain = tcase_create ("rtpdtmfmux_basic"); tc_chain = tcase_create ("rtpdtmfmux_basic");
tcase_add_test (tc_chain, test_rtpdtmfmux_basic); tcase_add_test (tc_chain, test_rtpdtmfmux_basic);