mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 06:26:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

playback: Don't special-case G_SIGNAL_RUN_CLEANUP stage in signal accumulators

Browse source 
All these signals don't run the class handler in the CLEANUP stage.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1076>
This commit is contained in:
Sebastian Dröge 2021-03-19 10:31:58 +02:00 committed by GStreamer Marge Bot
parent 0644da87d3
commit 6bcd6e1e66
5 changed files with 17 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst/playback/gstdecodebin2.c
View file

@ -615,7 +615,6 @@ _gst_boolean_accumulator (GSignalInvocationHint * ihint,
gboolean myboolean; gboolean myboolean;
myboolean = g_value_get_boolean (handler_return); myboolean = g_value_get_boolean (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_boolean (return_accu, myboolean); g_value_set_boolean (return_accu, myboolean);
/* stop emission if FALSE */ /* stop emission if FALSE */
@ -632,7 +631,6 @@ _gst_boolean_or_accumulator (GSignalInvocationHint * ihint,
myboolean = g_value_get_boolean (handler_return); myboolean = g_value_get_boolean (handler_return);
retboolean = g_value_get_boolean (return_accu); retboolean = g_value_get_boolean (return_accu);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_boolean (return_accu, myboolean || retboolean); g_value_set_boolean (return_accu, myboolean || retboolean);
return TRUE; return TRUE;
@ -646,7 +644,6 @@ _gst_array_accumulator (GSignalInvocationHint * ihint,
gpointer array; gpointer array;
array = g_value_get_boxed (handler_return); array = g_value_get_boxed (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_boxed (return_accu, array); g_value_set_boxed (return_accu, array);
return FALSE; return FALSE;
@ -659,7 +656,6 @@ _gst_select_accumulator (GSignalInvocationHint * ihint,
GstAutoplugSelectResult res; GstAutoplugSelectResult res;
res = g_value_get_enum (handler_return); res = g_value_get_enum (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_enum (return_accu, res); g_value_set_enum (return_accu, res);
/* Call the next handler in the chain (if any) when the current callback /* Call the next handler in the chain (if any) when the current callback
@ -679,7 +675,6 @@ _gst_array_hasvalue_accumulator (GSignalInvocationHint * ihint,
gpointer array; gpointer array;
array = g_value_get_boxed (handler_return); array = g_value_get_boxed (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_boxed (return_accu, array); g_value_set_boxed (return_accu, array);
if (array != NULL) if (array != NULL)

1
gst/playback/gstdecodebin3.c
View file

@ -535,7 +535,6 @@ _gst_int_accumulator (GSignalInvocationHint * ihint,
{ {
gint res = g_value_get_int (handler_return); gint res = g_value_get_int (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_int (return_accu, res); g_value_set_int (return_accu, res);
if (res == -1) if (res == -1)

5
gst/playback/gstparsebin.c
View file

@ -513,7 +513,6 @@ _gst_boolean_accumulator (GSignalInvocationHint * ihint,
gboolean myboolean; gboolean myboolean;
myboolean = g_value_get_boolean (handler_return); myboolean = g_value_get_boolean (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_boolean (return_accu, myboolean); g_value_set_boolean (return_accu, myboolean);
/* stop emission if FALSE */ /* stop emission if FALSE */
@ -530,7 +529,6 @@ _gst_boolean_or_accumulator (GSignalInvocationHint * ihint,
myboolean = g_value_get_boolean (handler_return); myboolean = g_value_get_boolean (handler_return);
retboolean = g_value_get_boolean (return_accu); retboolean = g_value_get_boolean (return_accu);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_boolean (return_accu, myboolean || retboolean); g_value_set_boolean (return_accu, myboolean || retboolean);
return TRUE; return TRUE;
@ -544,7 +542,6 @@ _gst_array_accumulator (GSignalInvocationHint * ihint,
gpointer array; gpointer array;
array = g_value_get_boxed (handler_return); array = g_value_get_boxed (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_boxed (return_accu, array); g_value_set_boxed (return_accu, array);
return FALSE; return FALSE;
@ -557,7 +554,6 @@ _gst_select_accumulator (GSignalInvocationHint * ihint,
GstAutoplugSelectResult res; GstAutoplugSelectResult res;
res = g_value_get_enum (handler_return); res = g_value_get_enum (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_enum (return_accu, res); g_value_set_enum (return_accu, res);
/* Call the next handler in the chain (if any) when the current callback /* Call the next handler in the chain (if any) when the current callback
@ -577,7 +573,6 @@ _gst_array_hasvalue_accumulator (GSignalInvocationHint * ihint,
gpointer array; gpointer array;
array = g_value_get_boxed (handler_return); array = g_value_get_boxed (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_boxed (return_accu, array); g_value_set_boxed (return_accu, array);
if (array != NULL) if (array != NULL)

5
gst/playback/gsturidecodebin.c
View file

@ -235,7 +235,6 @@ _gst_boolean_accumulator (GSignalInvocationHint * ihint,
gboolean myboolean; gboolean myboolean;
myboolean = g_value_get_boolean (handler_return); myboolean = g_value_get_boolean (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_boolean (return_accu, myboolean); g_value_set_boolean (return_accu, myboolean);
/* stop emission if FALSE */ /* stop emission if FALSE */
@ -252,7 +251,6 @@ _gst_boolean_or_accumulator (GSignalInvocationHint * ihint,
myboolean = g_value_get_boolean (handler_return); myboolean = g_value_get_boolean (handler_return);
retboolean = g_value_get_boolean (return_accu); retboolean = g_value_get_boolean (return_accu);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_boolean (return_accu, myboolean || retboolean); g_value_set_boolean (return_accu, myboolean || retboolean);
return TRUE; return TRUE;
@ -265,7 +263,6 @@ _gst_array_accumulator (GSignalInvocationHint * ihint,
gpointer array; gpointer array;
array = g_value_get_boxed (handler_return); array = g_value_get_boxed (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_boxed (return_accu, array); g_value_set_boxed (return_accu, array);
return FALSE; return FALSE;
@ -278,7 +275,6 @@ _gst_select_accumulator (GSignalInvocationHint * ihint,
GstAutoplugSelectResult res; GstAutoplugSelectResult res;
res = g_value_get_enum (handler_return); res = g_value_get_enum (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_enum (return_accu, res); g_value_set_enum (return_accu, res);
/* Call the next handler in the chain (if any) when the current callback /* Call the next handler in the chain (if any) when the current callback
@ -298,7 +294,6 @@ _gst_array_hasvalue_accumulator (GSignalInvocationHint * ihint,
gpointer array; gpointer array;
array = g_value_get_boxed (handler_return); array = g_value_get_boxed (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_boxed (return_accu, array); g_value_set_boxed (return_accu, array);
if (array != NULL) if (array != NULL)

1
gst/playback/gsturidecodebin3.c
View file

@ -360,7 +360,6 @@ _gst_int_accumulator (GSignalInvocationHint * ihint,
{ {
gint res = g_value_get_int (handler_return); gint res = g_value_get_int (handler_return);
if (!(ihint->run_type & G_SIGNAL_RUN_CLEANUP))
g_value_set_int (return_accu, res); g_value_set_int (return_accu, res);
if (res == -1) if (res == -1)