diff --git a/src/gst/gstpipewireclock.c b/src/gst/gstpipewireclock.c index 23f9df8b7..146203011 100644 --- a/src/gst/gstpipewireclock.c +++ b/src/gst/gstpipewireclock.c @@ -69,7 +69,7 @@ gst_pipewire_clock_get_internal_time (GstClock * clock) pclock->last_time = result; GST_DEBUG ("%"PRId64", %d/%d %"PRId64" %"PRId64, - t.ticks, t.rate.num, t.rate.denom, t.now, result); + t.ticks, t.rate.num, t.rate.denom, t.now, result); return result; } diff --git a/src/gst/gstpipewireclock.h b/src/gst/gstpipewireclock.h index 9e9c2808f..0a3e44758 100644 --- a/src/gst/gstpipewireclock.h +++ b/src/gst/gstpipewireclock.h @@ -62,9 +62,9 @@ struct _GstPipeWireClockClass { GType gst_pipewire_clock_get_type (void); GstClock * gst_pipewire_clock_new (struct pw_stream *stream, - GstClockTime last_time); + GstClockTime last_time); void gst_pipewire_clock_reset (GstPipeWireClock *clock, - GstClockTime time); + GstClockTime time); G_END_DECLS diff --git a/src/gst/gstpipewiredeviceprovider.c b/src/gst/gstpipewiredeviceprovider.c index 90d088409..189676f98 100644 --- a/src/gst/gstpipewiredeviceprovider.c +++ b/src/gst/gstpipewiredeviceprovider.c @@ -334,7 +334,7 @@ on_core_done (void *data, uint32_t id, int seq) if (p->seq == seq) { remove_pending(p); if (p->callback) - p->callback(p->data); + p->callback(p->data); } } pw_log_debug("check %d %d", seq, self->seq); @@ -374,7 +374,7 @@ static void port_event_info(void *data, const struct pw_port_info *info) } static void port_event_param(void *data, int seq, uint32_t id, - uint32_t index, uint32_t next, const struct spa_pod *param) + uint32_t index, uint32_t next, const struct spa_pod *param) { struct port_data *port_data = data; struct node_data *node_data = port_data->node_data; @@ -447,8 +447,8 @@ static const struct pw_proxy_events proxy_port_events = { }; static void registry_event_global(void *data, uint32_t id, uint32_t permissions, - const char *type, uint32_t version, - const struct spa_dict *props) + const char *type, uint32_t version, + const struct spa_dict *props) { struct core_data *rd = data; GstPipeWireDeviceProvider *self = rd->self; @@ -458,7 +458,7 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions, struct pw_node *node; node = pw_registry_bind(rd->registry, - id, type, PW_VERSION_NODE, sizeof(*nd)); + id, type, PW_VERSION_NODE, sizeof(*nd)); if (node == NULL) goto no_mem; @@ -484,7 +484,7 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions, return; port = pw_registry_bind(rd->registry, - id, type, PW_VERSION_PORT, sizeof(*pd)); + id, type, PW_VERSION_PORT, sizeof(*pd)); if (port == NULL) goto no_mem; @@ -496,7 +496,7 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions, pw_port_add_listener(port, &pd->port_listener, &port_events, pd); pw_proxy_add_listener((struct pw_proxy*)port, &pd->proxy_listener, &proxy_port_events, pd); pw_port_enum_params((struct pw_port*)port, - 0, SPA_PARAM_EnumFormat, 0, 0, NULL); + 0, SPA_PARAM_EnumFormat, 0, 0, NULL); add_pending(self, &pd->pending, do_add_node, pd); } diff --git a/src/gst/gstpipewireformat.c b/src/gst/gstpipewireformat.c index 36f2221ef..f546158fe 100644 --- a/src/gst/gstpipewireformat.c +++ b/src/gst/gstpipewireformat.c @@ -372,7 +372,7 @@ handle_video_fields (ConvertData *d) for (i = 0; (v = get_nth_string (value, i)); i++) { if (i == 0) { spa_pod_builder_prop (&d->b, SPA_FORMAT_VIDEO_format, 0); - spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); + spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); } idx = gst_video_format_from_string (v); @@ -390,7 +390,7 @@ handle_video_fields (ConvertData *d) for (i = 0; get_nth_rectangle (value, value2, i, &v); i++) { if (i == 0) { spa_pod_builder_prop (&d->b, SPA_FORMAT_VIDEO_size, 0); - spa_pod_builder_push_choice(&d->b, &f, get_range_type2 (value, value2), 0); + spa_pod_builder_push_choice(&d->b, &f, get_range_type2 (value, value2), 0); } spa_pod_builder_rectangle (&d->b, v.width, v.height); @@ -406,7 +406,7 @@ handle_video_fields (ConvertData *d) for (i = 0; get_nth_fraction (value, i, &v); i++) { if (i == 0) { spa_pod_builder_prop (&d->b, SPA_FORMAT_VIDEO_framerate, 0); - spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); + spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); } spa_pod_builder_fraction (&d->b, v.num, v.denom); @@ -422,7 +422,7 @@ handle_video_fields (ConvertData *d) for (i = 0; get_nth_fraction (value, i, &v); i++) { if (i == 0) { spa_pod_builder_prop (&d->b, SPA_FORMAT_VIDEO_maxFramerate, 0); - spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); + spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); } spa_pod_builder_fraction (&d->b, v.num, v.denom); @@ -449,7 +449,7 @@ handle_audio_fields (ConvertData *d) for (i = 0; (v = get_nth_string (value, i)); i++) { if (i == 0) { spa_pod_builder_prop (&d->b, SPA_FORMAT_AUDIO_format, 0); - spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); + spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); } idx = gst_audio_format_from_string (v); @@ -477,7 +477,7 @@ handle_audio_fields (ConvertData *d) if (i == 0) { spa_pod_builder_prop (&d->b, SPA_FORMAT_AUDIO_layout, 0); - spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); + spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); } spa_pod_builder_id (&d->b, layout); @@ -493,7 +493,7 @@ handle_audio_fields (ConvertData *d) for (i = 0; get_nth_int (value, i, &v); i++) { if (i == 0) { spa_pod_builder_prop (&d->b, SPA_FORMAT_AUDIO_rate, 0); - spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); + spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); } spa_pod_builder_int (&d->b, v); @@ -508,7 +508,7 @@ handle_audio_fields (ConvertData *d) for (i = 0; get_nth_int (value, i, &v); i++) { if (i == 0) { spa_pod_builder_prop (&d->b, SPA_FORMAT_AUDIO_channels, 0); - spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); + spa_pod_builder_push_choice(&d->b, &f, get_range_type (value), 0); } spa_pod_builder_int (&d->b, v); @@ -532,8 +532,8 @@ builder_overflow (void *event_data, uint32_t size) } static const struct spa_pod_builder_callbacks builder_callbacks = { - SPA_VERSION_POD_BUILDER_CALLBACKS, - .overflow = builder_overflow + SPA_VERSION_POD_BUILDER_CALLBACKS, + .overflow = builder_overflow }; static struct spa_pod * @@ -643,7 +643,7 @@ handle_id_prop (const struct spa_pod_prop *prop, const char *key, id_to_string_f val = spa_pod_get_values(&prop->value, &n_items, &choice); if (val->type != SPA_TYPE_Id) - return; + return; id = SPA_POD_BODY(val); @@ -684,7 +684,7 @@ handle_int_prop (const struct spa_pod_prop *prop, const char *key, GstCaps *res) val = spa_pod_get_values(&prop->value, &n_items, &choice); if (val->type != SPA_TYPE_Int) - return; + return; ints = SPA_POD_BODY(val); @@ -728,7 +728,7 @@ handle_rect_prop (const struct spa_pod_prop *prop, const char *width, const char val = spa_pod_get_values(&prop->value, &n_items, &choice); if (val->type != SPA_TYPE_Rectangle) - return; + return; rect = SPA_POD_BODY(val); @@ -781,7 +781,7 @@ handle_fraction_prop (const struct spa_pod_prop *prop, const char *key, GstCaps val = spa_pod_get_values(&prop->value, &n_items, &choice); if (val->type != SPA_TYPE_Fraction) - return; + return; fract = SPA_POD_BODY(val); diff --git a/src/gst/gstpipewireformat.h b/src/gst/gstpipewireformat.h index 60641a995..e077986d0 100644 --- a/src/gst/gstpipewireformat.h +++ b/src/gst/gstpipewireformat.h @@ -32,7 +32,7 @@ G_BEGIN_DECLS struct spa_pod * gst_caps_to_format (GstCaps *caps, - guint index, uint32_t id); + guint index, uint32_t id); GPtrArray * gst_caps_to_format_all (GstCaps *caps, uint32_t id); GstCaps * gst_caps_from_format (const struct spa_pod *format); diff --git a/src/gst/gstpipewiresink.c b/src/gst/gstpipewiresink.c index 77e16ee80..1737637a8 100644 --- a/src/gst/gstpipewiresink.c +++ b/src/gst/gstpipewiresink.c @@ -241,16 +241,16 @@ pool_activated (GstPipeWirePool *pool, GstPipeWireSink *sink) if (size == 0) spa_pod_builder_add (&b, SPA_PARAM_BUFFERS_size, SPA_POD_CHOICE_RANGE_Int(0, 0, INT32_MAX), - 0); + 0); else spa_pod_builder_add (&b, SPA_PARAM_BUFFERS_size, SPA_POD_CHOICE_RANGE_Int(size, size, INT32_MAX), - 0); + 0); spa_pod_builder_add (&b, SPA_PARAM_BUFFERS_stride, SPA_POD_CHOICE_RANGE_Int(0, 0, INT32_MAX), SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(min_buffers, min_buffers, - max_buffers ? max_buffers : INT32_MAX), + max_buffers ? max_buffers : INT32_MAX), SPA_PARAM_BUFFERS_align, SPA_POD_Int(16), 0); port_params[0] = spa_pod_builder_pop (&b, &f); @@ -501,7 +501,7 @@ on_param_changed (void *data, uint32_t id, const struct spa_pod *param) GstPipeWireSink *pwsink = data; if (param == NULL || id != SPA_PARAM_Format) - return; + return; if (gst_buffer_pool_is_active (GST_BUFFER_POOL_CAST (pwsink->pool))) pool_activated (pwsink->pool, pwsink); @@ -637,12 +637,12 @@ copy_properties (GQuark field_id, } static const struct pw_stream_events stream_events = { - PW_VERSION_STREAM_EVENTS, - .state_changed = on_state_changed, - .param_changed = on_param_changed, - .add_buffer = on_add_buffer, - .remove_buffer = on_remove_buffer, - .process = on_process, + PW_VERSION_STREAM_EVENTS, + .state_changed = on_state_changed, + .param_changed = on_param_changed, + .add_buffer = on_add_buffer, + .remove_buffer = on_remove_buffer, + .process = on_process, }; static gboolean @@ -665,9 +665,9 @@ gst_pipewire_sink_start (GstBaseSink * basesink) pwsink->pool->stream = pwsink->stream; pw_stream_add_listener(pwsink->stream, - &pwsink->stream_listener, - &stream_events, - pwsink); + &pwsink->stream_listener, + &stream_events, + pwsink); pw_thread_loop_unlock (pwsink->loop); diff --git a/src/gst/gstpipewiresrc.c b/src/gst/gstpipewiresrc.c index 75128eabf..19a989c2e 100644 --- a/src/gst/gstpipewiresrc.c +++ b/src/gst/gstpipewiresrc.c @@ -403,7 +403,7 @@ on_process (void *_data) b = pw_stream_dequeue_buffer (pwsrc->stream); if (b == NULL) - return; + return; data = b->user_data; buf = data->buf; @@ -441,8 +441,8 @@ on_process (void *_data) static void on_state_changed (void *data, - enum pw_stream_state old, - enum pw_stream_state state, const char *error) + enum pw_stream_state old, + enum pw_stream_state state, const char *error) { GstPipeWireSrc *pwsrc = data; @@ -698,15 +698,15 @@ on_param_changed (void *data, uint32_t id, spa_pod_builder_init (&b, buffer, sizeof (buffer)); params[0] = spa_pod_builder_add_object (&b, - SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, - SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(16, 1, INT32_MAX), - SPA_PARAM_BUFFERS_blocks, SPA_POD_CHOICE_RANGE_Int(0, 1, INT32_MAX), - SPA_PARAM_BUFFERS_size, SPA_POD_CHOICE_RANGE_Int(0, 0, INT32_MAX), - SPA_PARAM_BUFFERS_stride, SPA_POD_CHOICE_RANGE_Int(0, 0, INT32_MAX), - SPA_PARAM_BUFFERS_align, SPA_POD_Int(16)); + SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, + SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int(16, 1, INT32_MAX), + SPA_PARAM_BUFFERS_blocks, SPA_POD_CHOICE_RANGE_Int(0, 1, INT32_MAX), + SPA_PARAM_BUFFERS_size, SPA_POD_CHOICE_RANGE_Int(0, 0, INT32_MAX), + SPA_PARAM_BUFFERS_stride, SPA_POD_CHOICE_RANGE_Int(0, 0, INT32_MAX), + SPA_PARAM_BUFFERS_align, SPA_POD_Int(16)); params[1] = spa_pod_builder_add_object (&b, - SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta, + SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta, SPA_PARAM_META_type, SPA_POD_Id(SPA_META_Header), SPA_PARAM_META_size, SPA_POD_Int(sizeof (struct spa_meta_header))); @@ -918,12 +918,12 @@ copy_properties (GQuark field_id, } static const struct pw_stream_events stream_events = { - PW_VERSION_STREAM_EVENTS, - .state_changed = on_state_changed, - .param_changed = on_param_changed, - .add_buffer = on_add_buffer, - .remove_buffer = on_remove_buffer, - .process = on_process, + PW_VERSION_STREAM_EVENTS, + .state_changed = on_state_changed, + .param_changed = on_param_changed, + .add_buffer = on_add_buffer, + .remove_buffer = on_remove_buffer, + .process = on_process, }; static gboolean @@ -952,14 +952,14 @@ gst_pipewire_src_open (GstPipeWireSrc * pwsrc) } if ((pwsrc->stream = pw_stream_new (pwsrc->core, - pwsrc->client_name, props)) == NULL) + pwsrc->client_name, props)) == NULL) goto no_stream; pw_stream_add_listener(pwsrc->stream, - &pwsrc->stream_listener, - &stream_events, - pwsrc); + &pwsrc->stream_listener, + &stream_events, + pwsrc); pwsrc->clock = gst_pipewire_clock_new (pwsrc->stream, pwsrc->last_time);