From 45e77ecdd7acbc58fdb8a4062487f7fd8e453cd3 Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Thu, 29 Aug 2019 07:34:26 +0200 Subject: [PATCH] Don't pass default GLib marshallers for signals By passing NULL to `g_signal_new` instead of a marshaller, GLib will actually internally optimize the signal (if the marshaller is available in GLib itself) by also setting the valist marshaller. This makes the signal emission a bit more performant than the regular marshalling, which still needs to box into `GValue` and call libffi in case of a generic marshaller. Note that for custom marshallers, one would use `g_signal_set_va_marshaller()` with the valist marshaller instead. --- gst/rtsp-server/rtsp-auth.c | 2 +- gst/rtsp-server/rtsp-client.c | 88 ++++++++++++++---------------------- gst/rtsp-server/rtsp-media-factory.c | 4 +- gst/rtsp-server/rtsp-media.c | 21 ++++----- gst/rtsp-server/rtsp-server.c | 3 +- gst/rtsp-server/rtsp-session-pool.c | 4 +- gst/rtsp-server/rtsp-stream.c | 9 ++-- gst/rtsp-sink/gstrtspclientsink.c | 11 ++--- 8 files changed, 59 insertions(+), 83 deletions(-) diff --git a/gst/rtsp-server/rtsp-auth.c b/gst/rtsp-server/rtsp-auth.c index f676b80..c562ce6 100644 --- a/gst/rtsp-server/rtsp-auth.c +++ b/gst/rtsp-server/rtsp-auth.c @@ -172,7 +172,7 @@ gst_rtsp_auth_class_init (GstRTSPAuthClass * klass) G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPAuthClass, accept_certificate), - g_signal_accumulator_true_handled, NULL, g_cclosure_marshal_generic, + g_signal_accumulator_true_handled, NULL, NULL, G_TYPE_BOOLEAN, 3, G_TYPE_TLS_CONNECTION, G_TYPE_TLS_CERTIFICATE, G_TYPE_TLS_CERTIFICATE_FLAGS); } diff --git a/gst/rtsp-server/rtsp-client.c b/gst/rtsp-server/rtsp-client.c index 727e942..cf469dd 100644 --- a/gst/rtsp-server/rtsp-client.c +++ b/gst/rtsp-server/rtsp-client.c @@ -257,13 +257,13 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_CLOSED] = g_signal_new ("closed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstRTSPClientClass, closed), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE); + G_STRUCT_OFFSET (GstRTSPClientClass, closed), NULL, NULL, NULL, + G_TYPE_NONE, 0, G_TYPE_NONE); gst_rtsp_client_signals[SIGNAL_NEW_SESSION] = g_signal_new ("new-session", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstRTSPClientClass, new_session), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_RTSP_SESSION); + G_STRUCT_OFFSET (GstRTSPClientClass, new_session), NULL, NULL, NULL, + G_TYPE_NONE, 1, GST_TYPE_RTSP_SESSION); /** * GstRTSPClient::pre-options-request: @@ -278,9 +278,8 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_PRE_OPTIONS_REQUEST] = g_signal_new ("pre-options-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - pre_options_request), pre_signal_accumulator, NULL, - g_cclosure_marshal_generic, GST_TYPE_RTSP_STATUS_CODE, 1, - GST_TYPE_RTSP_CONTEXT); + pre_options_request), pre_signal_accumulator, NULL, NULL, + GST_TYPE_RTSP_STATUS_CODE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::options-request: @@ -290,8 +289,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_OPTIONS_REQUEST] = g_signal_new ("options-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, options_request), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, - GST_TYPE_RTSP_CONTEXT); + NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::pre-describe-request: @@ -306,9 +304,8 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_PRE_DESCRIBE_REQUEST] = g_signal_new ("pre-describe-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - pre_describe_request), pre_signal_accumulator, NULL, - g_cclosure_marshal_generic, GST_TYPE_RTSP_STATUS_CODE, 1, - GST_TYPE_RTSP_CONTEXT); + pre_describe_request), pre_signal_accumulator, NULL, NULL, + GST_TYPE_RTSP_STATUS_CODE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::describe-request: @@ -318,8 +315,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_DESCRIBE_REQUEST] = g_signal_new ("describe-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, describe_request), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, - GST_TYPE_RTSP_CONTEXT); + NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::pre-setup-request: @@ -334,9 +330,8 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_PRE_SETUP_REQUEST] = g_signal_new ("pre-setup-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - pre_setup_request), pre_signal_accumulator, NULL, - g_cclosure_marshal_generic, GST_TYPE_RTSP_STATUS_CODE, 1, - GST_TYPE_RTSP_CONTEXT); + pre_setup_request), pre_signal_accumulator, NULL, NULL, + GST_TYPE_RTSP_STATUS_CODE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::setup-request: @@ -346,8 +341,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_SETUP_REQUEST] = g_signal_new ("setup-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, setup_request), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, - GST_TYPE_RTSP_CONTEXT); + NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::pre-play-request: @@ -363,8 +357,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) g_signal_new ("pre-play-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, pre_play_request), pre_signal_accumulator, NULL, - g_cclosure_marshal_generic, GST_TYPE_RTSP_STATUS_CODE, 1, - GST_TYPE_RTSP_CONTEXT); + NULL, GST_TYPE_RTSP_STATUS_CODE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::play-request: @@ -374,8 +367,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_PLAY_REQUEST] = g_signal_new ("play-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, play_request), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, - GST_TYPE_RTSP_CONTEXT); + NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::pre-pause-request: @@ -390,9 +382,8 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_PRE_PAUSE_REQUEST] = g_signal_new ("pre-pause-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - pre_pause_request), pre_signal_accumulator, NULL, - g_cclosure_marshal_generic, GST_TYPE_RTSP_STATUS_CODE, 1, - GST_TYPE_RTSP_CONTEXT); + pre_pause_request), pre_signal_accumulator, NULL, NULL, + GST_TYPE_RTSP_STATUS_CODE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::pause-request: @@ -402,8 +393,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_PAUSE_REQUEST] = g_signal_new ("pause-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, pause_request), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, - GST_TYPE_RTSP_CONTEXT); + NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::pre-teardown-request: @@ -418,9 +408,8 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_PRE_TEARDOWN_REQUEST] = g_signal_new ("pre-teardown-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - pre_teardown_request), pre_signal_accumulator, NULL, - g_cclosure_marshal_generic, GST_TYPE_RTSP_STATUS_CODE, 1, - GST_TYPE_RTSP_CONTEXT); + pre_teardown_request), pre_signal_accumulator, NULL, NULL, + GST_TYPE_RTSP_STATUS_CODE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::teardown-request: @@ -430,8 +419,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_TEARDOWN_REQUEST] = g_signal_new ("teardown-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, teardown_request), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, - GST_TYPE_RTSP_CONTEXT); + NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::pre-set-parameter-request: @@ -446,8 +434,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_PRE_SET_PARAMETER_REQUEST] = g_signal_new ("pre-set-parameter-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - pre_set_parameter_request), pre_signal_accumulator, NULL, - g_cclosure_marshal_generic, + pre_set_parameter_request), pre_signal_accumulator, NULL, NULL, GST_TYPE_RTSP_STATUS_CODE, 1, GST_TYPE_RTSP_CONTEXT); /** @@ -458,7 +445,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_SET_PARAMETER_REQUEST] = g_signal_new ("set-parameter-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - set_parameter_request), NULL, NULL, g_cclosure_marshal_generic, + set_parameter_request), NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_CONTEXT); /** @@ -474,9 +461,8 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_PRE_GET_PARAMETER_REQUEST] = g_signal_new ("pre-get-parameter-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - pre_get_parameter_request), pre_signal_accumulator, NULL, - g_cclosure_marshal_generic, GST_TYPE_RTSP_STATUS_CODE, 1, - GST_TYPE_RTSP_CONTEXT); + pre_get_parameter_request), pre_signal_accumulator, NULL, NULL, + GST_TYPE_RTSP_STATUS_CODE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::get-parameter-request: @@ -486,7 +472,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_GET_PARAMETER_REQUEST] = g_signal_new ("get-parameter-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - get_parameter_request), NULL, NULL, g_cclosure_marshal_generic, + get_parameter_request), NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_CONTEXT); /** @@ -497,7 +483,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_HANDLE_RESPONSE] = g_signal_new ("handle-response", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - handle_response), NULL, NULL, g_cclosure_marshal_generic, + handle_response), NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_CONTEXT); /** @@ -509,7 +495,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_SEND_MESSAGE] = g_signal_new ("send-message", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - send_message), NULL, NULL, g_cclosure_marshal_generic, + send_message), NULL, NULL, NULL, G_TYPE_NONE, 2, GST_TYPE_RTSP_CONTEXT, G_TYPE_POINTER); /** @@ -525,9 +511,8 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_PRE_ANNOUNCE_REQUEST] = g_signal_new ("pre-announce-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - pre_announce_request), pre_signal_accumulator, NULL, - g_cclosure_marshal_generic, GST_TYPE_RTSP_STATUS_CODE, 1, - GST_TYPE_RTSP_CONTEXT); + pre_announce_request), pre_signal_accumulator, NULL, NULL, + GST_TYPE_RTSP_STATUS_CODE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::announce-request: @@ -537,8 +522,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_ANNOUNCE_REQUEST] = g_signal_new ("announce-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, announce_request), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, - GST_TYPE_RTSP_CONTEXT); + NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::pre-record-request: @@ -553,9 +537,8 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_PRE_RECORD_REQUEST] = g_signal_new ("pre-record-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - pre_record_request), pre_signal_accumulator, NULL, - g_cclosure_marshal_generic, GST_TYPE_RTSP_STATUS_CODE, 1, - GST_TYPE_RTSP_CONTEXT); + pre_record_request), pre_signal_accumulator, NULL, NULL, + GST_TYPE_RTSP_STATUS_CODE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::record-request: @@ -565,8 +548,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_RECORD_REQUEST] = g_signal_new ("record-request", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, record_request), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, - GST_TYPE_RTSP_CONTEXT); + NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_CONTEXT); /** * GstRTSPClient::check-requirements: @@ -583,7 +565,7 @@ gst_rtsp_client_class_init (GstRTSPClientClass * klass) gst_rtsp_client_signals[SIGNAL_CHECK_REQUIREMENTS] = g_signal_new ("check-requirements", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPClientClass, - check_requirements), NULL, NULL, g_cclosure_marshal_generic, + check_requirements), NULL, NULL, NULL, G_TYPE_STRING, 2, GST_TYPE_RTSP_CONTEXT, G_TYPE_STRV); tunnels = diff --git a/gst/rtsp-server/rtsp-media-factory.c b/gst/rtsp-server/rtsp-media-factory.c index 58c8d39..ec15d9d 100644 --- a/gst/rtsp-server/rtsp-media-factory.c +++ b/gst/rtsp-server/rtsp-media-factory.c @@ -247,13 +247,13 @@ gst_rtsp_media_factory_class_init (GstRTSPMediaFactoryClass * klass) gst_rtsp_media_factory_signals[SIGNAL_MEDIA_CONSTRUCTED] = g_signal_new ("media-constructed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPMediaFactoryClass, - media_constructed), NULL, NULL, g_cclosure_marshal_generic, + media_constructed), NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_MEDIA); gst_rtsp_media_factory_signals[SIGNAL_MEDIA_CONFIGURE] = g_signal_new ("media-configure", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPMediaFactoryClass, - media_configure), NULL, NULL, g_cclosure_marshal_generic, + media_configure), NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_MEDIA); klass->gen_key = default_gen_key; diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c index 8f1e438..4516d53 100644 --- a/gst/rtsp-server/rtsp-media.c +++ b/gst/rtsp-server/rtsp-media.c @@ -412,34 +412,33 @@ gst_rtsp_media_class_init (GstRTSPMediaClass * klass) gst_rtsp_media_signals[SIGNAL_NEW_STREAM] = g_signal_new ("new-stream", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstRTSPMediaClass, new_stream), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_RTSP_STREAM); + G_STRUCT_OFFSET (GstRTSPMediaClass, new_stream), NULL, NULL, NULL, + G_TYPE_NONE, 1, GST_TYPE_RTSP_STREAM); gst_rtsp_media_signals[SIGNAL_REMOVED_STREAM] = g_signal_new ("removed-stream", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPMediaClass, removed_stream), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, - GST_TYPE_RTSP_STREAM); + NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_STREAM); gst_rtsp_media_signals[SIGNAL_PREPARED] = g_signal_new ("prepared", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstRTSPMediaClass, prepared), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE); + G_STRUCT_OFFSET (GstRTSPMediaClass, prepared), NULL, NULL, NULL, + G_TYPE_NONE, 0, G_TYPE_NONE); gst_rtsp_media_signals[SIGNAL_UNPREPARED] = g_signal_new ("unprepared", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstRTSPMediaClass, unprepared), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 0, G_TYPE_NONE); + G_STRUCT_OFFSET (GstRTSPMediaClass, unprepared), NULL, NULL, NULL, + G_TYPE_NONE, 0, G_TYPE_NONE); gst_rtsp_media_signals[SIGNAL_TARGET_STATE] = g_signal_new ("target-state", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPMediaClass, target_state), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_INT); + NULL, NULL, NULL, G_TYPE_NONE, 1, G_TYPE_INT); gst_rtsp_media_signals[SIGNAL_NEW_STATE] = g_signal_new ("new-state", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstRTSPMediaClass, new_state), NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, G_TYPE_INT); + G_STRUCT_OFFSET (GstRTSPMediaClass, new_state), NULL, NULL, NULL, + G_TYPE_NONE, 1, G_TYPE_INT); GST_DEBUG_CATEGORY_INIT (rtsp_media_debug, "rtspmedia", 0, "GstRTSPMedia"); diff --git a/gst/rtsp-server/rtsp-server.c b/gst/rtsp-server/rtsp-server.c index dd5d6d2..9d3cb58 100644 --- a/gst/rtsp-server/rtsp-server.c +++ b/gst/rtsp-server/rtsp-server.c @@ -243,8 +243,7 @@ gst_rtsp_server_class_init (GstRTSPServerClass * klass) gst_rtsp_server_signals[SIGNAL_CLIENT_CONNECTED] = g_signal_new ("client-connected", G_TYPE_FROM_CLASS (gobject_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPServerClass, client_connected), - NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 1, - GST_TYPE_RTSP_CLIENT); + NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_RTSP_CLIENT); klass->create_client = default_create_client; diff --git a/gst/rtsp-server/rtsp-session-pool.c b/gst/rtsp-server/rtsp-session-pool.c index ad3c67e..e55c49f 100644 --- a/gst/rtsp-server/rtsp-session-pool.c +++ b/gst/rtsp-server/rtsp-session-pool.c @@ -114,8 +114,8 @@ gst_rtsp_session_pool_class_init (GstRTSPSessionPoolClass * klass) gst_rtsp_session_pool_signals[SIGNAL_SESSION_REMOVED] = g_signal_new ("session-removed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstRTSPSessionPoolClass, - session_removed), NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, - 1, GST_TYPE_RTSP_SESSION); + session_removed), NULL, NULL, NULL, G_TYPE_NONE, 1, + GST_TYPE_RTSP_SESSION); klass->create_session_id = create_session_id; klass->create_session = create_session; diff --git a/gst/rtsp-server/rtsp-stream.c b/gst/rtsp-server/rtsp-stream.c index b00315f..b89dc24 100644 --- a/gst/rtsp-server/rtsp-stream.c +++ b/gst/rtsp-server/rtsp-stream.c @@ -277,18 +277,15 @@ gst_rtsp_stream_class_init (GstRTSPStreamClass * klass) gst_rtsp_stream_signals[SIGNAL_NEW_RTP_ENCODER] = g_signal_new ("new-rtp-encoder", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 1, GST_TYPE_ELEMENT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); gst_rtsp_stream_signals[SIGNAL_NEW_RTCP_ENCODER] = g_signal_new ("new-rtcp-encoder", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 1, GST_TYPE_ELEMENT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); gst_rtsp_stream_signals[SIGNAL_NEW_RTP_RTCP_DECODER] = g_signal_new ("new-rtp-rtcp-decoder", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_generic, - G_TYPE_NONE, 1, GST_TYPE_ELEMENT); + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); GST_DEBUG_CATEGORY_INIT (rtsp_stream_debug, "rtspstream", 0, "GstRTSPStream"); diff --git a/gst/rtsp-sink/gstrtspclientsink.c b/gst/rtsp-sink/gstrtspclientsink.c index 8ddf70a..85f379e 100644 --- a/gst/rtsp-sink/gstrtspclientsink.c +++ b/gst/rtsp-sink/gstrtspclientsink.c @@ -739,8 +739,7 @@ gst_rtsp_client_sink_class_init (GstRTSPClientSinkClass * klass) */ gst_rtsp_client_sink_signals[SIGNAL_HANDLE_REQUEST] = g_signal_new ("handle-request", G_TYPE_FROM_CLASS (klass), 0, - 0, NULL, NULL, g_cclosure_marshal_generic, G_TYPE_NONE, 2, - G_TYPE_POINTER, G_TYPE_POINTER); + 0, NULL, NULL, NULL, G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); /** * GstRTSPClientSink::new-manager: @@ -753,8 +752,8 @@ gst_rtsp_client_sink_class_init (GstRTSPClientSinkClass * klass) */ gst_rtsp_client_sink_signals[SIGNAL_NEW_MANAGER] = g_signal_new_class_handler ("new-manager", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_CLEANUP, 0, NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); + G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_CLEANUP, 0, NULL, NULL, NULL, + G_TYPE_NONE, 1, GST_TYPE_ELEMENT); /** * GstRTSPClientSink::new-payloader: @@ -767,8 +766,8 @@ gst_rtsp_client_sink_class_init (GstRTSPClientSinkClass * klass) */ gst_rtsp_client_sink_signals[SIGNAL_NEW_PAYLOADER] = g_signal_new_class_handler ("new-payloader", G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_CLEANUP, 0, NULL, NULL, - g_cclosure_marshal_generic, G_TYPE_NONE, 1, GST_TYPE_ELEMENT); + G_SIGNAL_RUN_FIRST | G_SIGNAL_RUN_CLEANUP, 0, NULL, NULL, NULL, + G_TYPE_NONE, 1, GST_TYPE_ELEMENT); /** * GstRTSPClientSink::request-rtcp-key: -- 2.7.4