gst: don't use volatile to mean atomic

volatile is not sufficient to provide atomic guarantees and real atomics
should be used instead.  GCC 11 has started warning about using volatile
with atomic operations.

https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719

Discovered in https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/868

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1073>
This commit is contained in:
Matthew Waters 2021-03-18 19:18:36 +11:00 committed by GStreamer Marge Bot
parent 00a71112c0
commit 98249a57db
45 changed files with 71 additions and 71 deletions

View File

@ -660,7 +660,7 @@ gst_gl_effects_filters_descriptors (void)
gboolean gboolean
gst_gl_effects_register_filters (GstPlugin * plugin, GstRank rank) gst_gl_effects_register_filters (GstPlugin * plugin, GstRank rank)
{ {
static volatile gsize registered = 0; static gsize registered = 0;
if (g_once_init_enter (&registered)) { if (g_once_init_enter (&registered)) {
GTypeInfo info = { GTypeInfo info = {

View File

@ -106,7 +106,7 @@ struct _GstGLImageSink
GstBuffer *next_sync; GstBuffer *next_sync;
GstGLSyncMeta *next_sync_meta; GstGLSyncMeta *next_sync_meta;
volatile gint to_quit; gint to_quit;
gboolean keep_aspect_ratio; gboolean keep_aspect_ratio;
gint par_n, par_d; gint par_n, par_d;

View File

@ -80,7 +80,7 @@ gst_opus_enc_bandwidth_get_type (void)
{OPUS_AUTO, "Auto", "auto"}, {OPUS_AUTO, "Auto", "auto"},
{0, NULL, NULL} {0, NULL, NULL}
}; };
static volatile GType id = 0; static GType id = 0;
if (g_once_init_enter ((gsize *) & id)) { if (g_once_init_enter ((gsize *) & id)) {
GType _id; GType _id;
@ -106,7 +106,7 @@ gst_opus_enc_frame_size_get_type (void)
{60, "60", "60"}, {60, "60", "60"},
{0, NULL, NULL} {0, NULL, NULL}
}; };
static volatile GType id = 0; static GType id = 0;
if (g_once_init_enter ((gsize *) & id)) { if (g_once_init_enter ((gsize *) & id)) {
GType _id; GType _id;
@ -130,7 +130,7 @@ gst_opus_enc_audio_type_get_type (void)
"restricted-lowdelay"}, "restricted-lowdelay"},
{0, NULL, NULL} {0, NULL, NULL}
}; };
static volatile GType id = 0; static GType id = 0;
if (g_once_init_enter ((gsize *) & id)) { if (g_once_init_enter ((gsize *) & id)) {
GType _id; GType _id;
@ -153,7 +153,7 @@ gst_opus_enc_bitrate_type_get_type (void)
{BITRATE_TYPE_CONSTRAINED_VBR, "Constrained VBR", "constrained-vbr"}, {BITRATE_TYPE_CONSTRAINED_VBR, "Constrained VBR", "constrained-vbr"},
{0, NULL, NULL} {0, NULL, NULL}
}; };
static volatile GType id = 0; static GType id = 0;
if (g_once_init_enter ((gsize *) & id)) { if (g_once_init_enter ((gsize *) & id)) {
GType _id; GType _id;
@ -819,7 +819,7 @@ gst_opus_enc_sink_event (GstAudioEncoder * benc, GstEvent * event)
static GstCaps * static GstCaps *
gst_opus_enc_get_sink_template_caps (void) gst_opus_enc_get_sink_template_caps (void)
{ {
static volatile gsize init = 0; static gsize init = 0;
static GstCaps *caps = NULL; static GstCaps *caps = NULL;
if (g_once_init_enter (&init)) { if (g_once_init_enter (&init)) {

View File

@ -338,7 +338,7 @@ static void gst_audio_decoder_init (GstAudioDecoder * dec,
GType GType
gst_audio_decoder_get_type (void) gst_audio_decoder_get_type (void)
{ {
static volatile gsize audio_decoder_type = 0; static gsize audio_decoder_type = 0;
if (g_once_init_enter (&audio_decoder_type)) { if (g_once_init_enter (&audio_decoder_type)) {
GType _type; GType _type;

View File

@ -177,7 +177,7 @@ gst_buffer_add_audio_downmix_meta (GstBuffer * buffer,
GType GType
gst_audio_downmix_meta_api_get_type (void) gst_audio_downmix_meta_api_get_type (void)
{ {
static volatile GType type; static GType type;
static const gchar *tags[] = static const gchar *tags[] =
{ GST_META_TAG_AUDIO_STR, GST_META_TAG_AUDIO_CHANNELS_STR, NULL }; { GST_META_TAG_AUDIO_STR, GST_META_TAG_AUDIO_CHANNELS_STR, NULL };
@ -280,7 +280,7 @@ gst_buffer_add_audio_clipping_meta (GstBuffer * buffer,
GType GType
gst_audio_clipping_meta_api_get_type (void) gst_audio_clipping_meta_api_get_type (void)
{ {
static volatile GType type; static GType type;
static const gchar *tags[] = static const gchar *tags[] =
{ GST_META_TAG_AUDIO_STR, GST_META_TAG_AUDIO_RATE_STR, NULL }; { GST_META_TAG_AUDIO_STR, GST_META_TAG_AUDIO_RATE_STR, NULL };
@ -463,7 +463,7 @@ gst_buffer_add_audio_meta (GstBuffer * buffer, const GstAudioInfo * info,
GType GType
gst_audio_meta_api_get_type (void) gst_audio_meta_api_get_type (void)
{ {
static volatile GType type; static GType type;
static const gchar *tags[] = { static const gchar *tags[] = {
GST_META_TAG_AUDIO_STR, GST_META_TAG_AUDIO_CHANNELS_STR, GST_META_TAG_AUDIO_STR, GST_META_TAG_AUDIO_CHANNELS_STR,
GST_META_TAG_AUDIO_RATE_STR, NULL GST_META_TAG_AUDIO_RATE_STR, NULL
@ -505,7 +505,7 @@ gst_audio_meta_get_info (void)
GType GType
gst_audio_level_meta_api_get_type (void) gst_audio_level_meta_api_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
static const gchar *tags[] = { NULL }; static const gchar *tags[] = { NULL };
if (g_once_init_enter (&type)) { if (g_once_init_enter (&type)) {

View File

@ -66,7 +66,7 @@ gst_stream_volume_class_init (GstStreamVolumeInterface * iface)
GType GType
gst_stream_volume_get_type (void) gst_stream_volume_get_type (void)
{ {
static volatile gsize type = 0; static gsize type = 0;
if (g_once_init_enter (&type)) { if (g_once_init_enter (&type)) {
GType tmp; GType tmp;
static const GTypeInfo info = { static const GTypeInfo info = {

View File

@ -33,7 +33,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
static void static void
_init_debug (void) _init_debug (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_INIT(gst_gl_ca_opengl_layer_debug, "glcaopengllayer", GST_DEBUG_CATEGORY_INIT(gst_gl_ca_opengl_layer_debug, "glcaopengllayer",

View File

@ -74,7 +74,7 @@ static guintptr gst_gl_display_egl_get_handle (GstGLDisplay * display);
static void static void
init_debug (void) init_debug (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "gldisplayegl", 0, GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "gldisplayegl", 0,

View File

@ -398,7 +398,7 @@ gst_gl_display_gbm_shutdown_gbm (GstGLDisplayGBM * display_gbm)
static void static void
_init_debug (void) _init_debug (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_GET (gst_gl_display_debug, "gldisplay"); GST_DEBUG_CATEGORY_GET (gst_gl_display_debug, "gldisplay");

View File

@ -22,11 +22,11 @@ c_array = ['--fhead',
'--fprod', '--fprod',
"\n/* enumerations from \"@basename@\" */", "\n/* enumerations from \"@basename@\" */",
'--vhead', '--vhead',
"GType\n@enum_name@_get_type (void)\n{\n static volatile gsize g_define_type_id__volatile = 0;\n if (g_once_init_enter (&g_define_type_id__volatile)) {\n static const G@Type@Value values[] = {", "GType\n@enum_name@_get_type (void)\n{\n static gsize static_g_define_type_id = 0;\n if (g_once_init_enter (&static_g_define_type_id)) {\n static const G@Type@Value values[] = {",
'--vprod', '--vprod',
" { C_@TYPE@ (@VALUENAME@), \"@VALUENAME@\", \"@valuenick@\" },", " { C_@TYPE@ (@VALUENAME@), \"@VALUENAME@\", \"@valuenick@\" },",
'--vtail', '--vtail',
" { 0, NULL, NULL }\n };\n GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);\n }\n return g_define_type_id__volatile;\n}\n" " { 0, NULL, NULL }\n };\n GType g_define_type_id = g_@type@_register_static (\"@EnumName@\", values);\n g_once_init_leave (&static_g_define_type_id, g_define_type_id);\n }\n return static_g_define_type_id;\n}\n"
] ]
cmd = [] cmd = []

View File

@ -503,7 +503,7 @@ _mem_free (GstAllocator * allocator, GstMemory * memory)
void void
gst_gl_base_memory_init_once (void) gst_gl_base_memory_init_once (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_INIT (GST_CAT_GL_BASE_MEMORY, "glbasememory", 0, GST_DEBUG_CATEGORY_INIT (GST_CAT_GL_BASE_MEMORY, "glbasememory", 0,

View File

@ -457,7 +457,7 @@ gst_gl_buffer_allocator_init (GstGLBufferAllocator * allocator)
void void
gst_gl_buffer_init_once (void) gst_gl_buffer_init_once (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
gst_gl_base_memory_init_once (); gst_gl_base_memory_init_once ();

View File

@ -150,7 +150,7 @@ load_self_module (gpointer user_data)
*/ */
struct ContextShareGroup struct ContextShareGroup
{ {
volatile int refcount; int refcount;
}; };
static struct ContextShareGroup * static struct ContextShareGroup *
@ -305,7 +305,7 @@ gst_gl_context_class_init (GstGLContextClass * klass)
static void static void
_init_debug (void) _init_debug (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_INIT (gst_gl_context_debug, "glcontext", 0, GST_DEBUG_CATEGORY_INIT (gst_gl_context_debug, "glcontext", 0,

View File

@ -105,7 +105,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_gl_marker_debug);
static void static void
_init_debug (void) _init_debug (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_GET (gst_performance, "GST_PERFORMANCE"); GST_DEBUG_CATEGORY_GET (gst_performance, "GST_PERFORMANCE");

View File

@ -277,7 +277,7 @@ gst_gl_display_new (void)
{ {
GstGLDisplay *display = NULL; GstGLDisplay *display = NULL;
const gchar *user_choice, *platform_choice; const gchar *user_choice, *platform_choice;
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_INIT (gst_gl_display_debug, "gldisplay", 0, GST_DEBUG_CATEGORY_INIT (gst_gl_display_debug, "gldisplay", 0,

View File

@ -43,7 +43,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
static void static void
_init_debug (void) _init_debug (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "glfeature", 0, GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "glfeature", 0,

View File

@ -1109,7 +1109,7 @@ gst_gl_memory_get_texture_id (GstGLMemory * gl_mem)
void void
gst_gl_memory_init_once (void) gst_gl_memory_init_once (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
gst_gl_base_memory_init_once (); gst_gl_base_memory_init_once ();

View File

@ -818,7 +818,7 @@ gst_gl_memory_pbo_upload_transfer (GstGLMemoryPBO * gl_mem)
void void
gst_gl_memory_pbo_init_once (void) gst_gl_memory_pbo_init_once (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
gst_gl_memory_init_once (); gst_gl_memory_init_once ();

View File

@ -58,7 +58,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
static void static void
_init_debug (void) _init_debug (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "glquery", 0, "glquery element"); GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "glquery", 0, "glquery element");

View File

@ -312,7 +312,7 @@ gst_gl_renderbuffer_get_id (GstGLRenderbuffer * gl_mem)
void void
gst_gl_renderbuffer_init_once (void) gst_gl_renderbuffer_init_once (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
gst_gl_base_memory_init_once (); gst_gl_base_memory_init_once ();

View File

@ -40,7 +40,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
static void static void
_init_debug (void) _init_debug (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "glsl", 0, GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "glsl", 0,

View File

@ -333,7 +333,7 @@ static gboolean
_gst_gl_sync_meta_init (GstGLSyncMeta * sync_meta, gpointer params, _gst_gl_sync_meta_init (GstGLSyncMeta * sync_meta, gpointer params,
GstBuffer * buffer) GstBuffer * buffer)
{ {
static volatile gsize _init; static gsize _init;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_INIT (gst_gl_sync_meta_debug, "glsyncmeta", 0, GST_DEBUG_CATEGORY_INIT (gst_gl_sync_meta_debug, "glsyncmeta", 0,
@ -359,7 +359,7 @@ _gst_gl_sync_meta_init (GstGLSyncMeta * sync_meta, gpointer params,
GType GType
gst_gl_sync_meta_api_get_type (void) gst_gl_sync_meta_api_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
static const gchar *tags[] = { NULL }; static const gchar *tags[] = { NULL };
if (g_once_init_enter (&type)) { if (g_once_init_enter (&type)) {

View File

@ -56,7 +56,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_gl_utils_debug);
static GstDebugCategory * static GstDebugCategory *
_init_gl_utils_debug_category (void) _init_gl_utils_debug_category (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_INIT (gst_gl_utils_debug, "glutils", 0, GST_DEBUG_CATEGORY_INIT (gst_gl_utils_debug, "glutils", 0,
@ -87,7 +87,7 @@ static void
_init_context_debug (void) _init_context_debug (void)
{ {
#ifndef GST_DISABLE_GST_DEBUG #ifndef GST_DISABLE_GST_DEBUG
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_GET (GST_CAT_CONTEXT, "GST_CONTEXT"); GST_DEBUG_CATEGORY_GET (GST_CAT_CONTEXT, "GST_CONTEXT");

View File

@ -160,7 +160,7 @@ gst_gl_window_default_close (GstGLWindow * window)
static void static void
_init_debug (void) _init_debug (void)
{ {
static volatile gsize _init = 0; static gsize _init = 0;
if (g_once_init_enter (&_init)) { if (g_once_init_enter (&_init)) {
GST_DEBUG_CATEGORY_INIT (gst_gl_window_debug, "glwindow", 0, GST_DEBUG_CATEGORY_INIT (gst_gl_window_debug, "glwindow", 0,

View File

@ -45,7 +45,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
static void static void
init_debug (void) init_debug (void)
{ {
static volatile gsize _debug; static gsize _debug;
if (g_once_init_enter (&_debug)) { if (g_once_init_enter (&_debug)) {
GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "glwaylandeventsource", 0, GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "glwaylandeventsource", 0,

View File

@ -360,9 +360,9 @@ gst_encoding_profile_class_intern_init (gpointer klass)
GType GType
gst_encoding_profile_get_type (void) gst_encoding_profile_get_type (void)
{ {
static volatile gsize g_define_type_id__volatile = 0; static gsize g_define_type_id_init = 0;
if (g_once_init_enter (&g_define_type_id__volatile)) { if (g_once_init_enter (&g_define_type_id_init)) {
GType g_define_type_id = g_type_register_static_simple (G_TYPE_OBJECT, GType g_define_type_id = g_type_register_static_simple (G_TYPE_OBJECT,
g_intern_static_string ("GstEncodingProfile"), g_intern_static_string ("GstEncodingProfile"),
sizeof (GstEncodingProfileClass), sizeof (GstEncodingProfileClass),
@ -385,9 +385,9 @@ gst_encoding_profile_get_type (void)
/* Register gst-specific GValue functions */ /* Register gst-specific GValue functions */
gst_value_register (&gstvtable); gst_value_register (&gstvtable);
g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); g_once_init_leave (&g_define_type_id_init, g_define_type_id);
} }
return g_define_type_id__volatile; return g_define_type_id_init;
} }

View File

@ -499,7 +499,7 @@ gst_audio_visualizer_change_shader (GstAudioVisualizer * scope)
GType GType
gst_audio_visualizer_get_type (void) gst_audio_visualizer_get_type (void)
{ {
static volatile gsize audio_visualizer_type = 0; static gsize audio_visualizer_type = 0;
if (g_once_init_enter (&audio_visualizer_type)) { if (g_once_init_enter (&audio_visualizer_type)) {
static const GTypeInfo audio_visualizer_info = { static const GTypeInfo audio_visualizer_info = {

View File

@ -190,7 +190,7 @@ gst_rtp_source_meta_append_csrc (GstRTPSourceMeta * meta, const guint32 * csrc,
GType GType
gst_rtp_source_meta_api_get_type (void) gst_rtp_source_meta_api_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
static const gchar *tags[] = { NULL }; static const gchar *tags[] = { NULL };
if (g_once_init_enter (&type)) { if (g_once_init_enter (&type)) {

View File

@ -49,7 +49,7 @@ static guint gst_rtsp_extension_signals[LAST_SIGNAL] = { 0 };
GType GType
gst_rtsp_extension_get_type (void) gst_rtsp_extension_get_type (void)
{ {
static volatile gsize gst_rtsp_extension_type = 0; static gsize gst_rtsp_extension_type = 0;
static const GTypeInfo gst_rtsp_extension_info = { static const GTypeInfo gst_rtsp_extension_info = {
sizeof (GstRTSPExtensionInterface), sizeof (GstRTSPExtensionInterface),
(GBaseInitFunc) gst_rtsp_extension_iface_init, (GBaseInitFunc) gst_rtsp_extension_iface_init,

View File

@ -90,7 +90,7 @@ static gboolean gst_tag_mux_sink_event (GstPad * pad, GstObject * parent,
GType GType
gst_tag_mux_get_type (void) gst_tag_mux_get_type (void)
{ {
static volatile gsize tag_mux_type = 0; static gsize tag_mux_type = 0;
if (g_once_init_enter (&tag_mux_type)) { if (g_once_init_enter (&tag_mux_type)) {
const GInterfaceInfo interface_info = { NULL, NULL, NULL }; const GInterfaceInfo interface_info = { NULL, NULL, NULL };

View File

@ -53,7 +53,7 @@ typedef struct
GType GType
gst_tag_xmp_writer_get_type (void) gst_tag_xmp_writer_get_type (void)
{ {
static volatile gsize xmp_config_type = 0; static gsize xmp_config_type = 0;
if (g_once_init_enter (&xmp_config_type)) { if (g_once_init_enter (&xmp_config_type)) {
GType _type; GType _type;

View File

@ -36,7 +36,7 @@
GType GType
gst_video_affine_transformation_meta_api_get_type (void) gst_video_affine_transformation_meta_api_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
static const gchar *tags[] = static const gchar *tags[] =
{ GST_META_TAG_VIDEO_STR, GST_META_TAG_VIDEO_ORIENTATION_STR, { GST_META_TAG_VIDEO_STR, GST_META_TAG_VIDEO_ORIENTATION_STR,
GST_META_TAG_VIDEO_ORIENTATION_STR, NULL GST_META_TAG_VIDEO_ORIENTATION_STR, NULL

View File

@ -802,9 +802,9 @@ static gint video_aggregator_private_offset = 0;
GType GType
gst_video_aggregator_get_type (void) gst_video_aggregator_get_type (void)
{ {
static volatile gsize g_define_type_id_volatile = 0; static gsize static_g_define_type_id = 0;
if (g_once_init_enter (&g_define_type_id_volatile)) { if (g_once_init_enter (&static_g_define_type_id)) {
GType g_define_type_id = g_type_register_static_simple (GST_TYPE_AGGREGATOR, GType g_define_type_id = g_type_register_static_simple (GST_TYPE_AGGREGATOR,
g_intern_static_string ("GstVideoAggregator"), g_intern_static_string ("GstVideoAggregator"),
sizeof (GstVideoAggregatorClass), sizeof (GstVideoAggregatorClass),
@ -817,9 +817,9 @@ gst_video_aggregator_get_type (void)
g_type_add_instance_private (g_define_type_id, g_type_add_instance_private (g_define_type_id,
sizeof (GstVideoAggregatorPrivate)); sizeof (GstVideoAggregatorPrivate));
g_once_init_leave (&g_define_type_id_volatile, g_define_type_id); g_once_init_leave (&static_g_define_type_id, g_define_type_id);
} }
return g_define_type_id_volatile; return static_g_define_type_id;
} }
static inline GstVideoAggregatorPrivate * static inline GstVideoAggregatorPrivate *

View File

@ -516,7 +516,7 @@ static gboolean gst_video_decoder_transform_meta_default (GstVideoDecoder *
GType GType
gst_video_decoder_get_type (void) gst_video_decoder_get_type (void)
{ {
static volatile gsize type = 0; static gsize type = 0;
if (g_once_init_enter (&type)) { if (g_once_init_enter (&type)) {
GType _type; GType _type;

View File

@ -291,7 +291,7 @@ static gboolean gst_video_encoder_transform_meta_default (GstVideoEncoder *
GType GType
gst_video_encoder_get_type (void) gst_video_encoder_get_type (void)
{ {
static volatile gsize type = 0; static gsize type = 0;
if (g_once_init_enter (&type)) { if (g_once_init_enter (&type)) {
GType _type; GType _type;

View File

@ -120,7 +120,7 @@ gst_video_meta_transform (GstBuffer * dest, GstMeta * meta,
GType GType
gst_video_meta_api_get_type (void) gst_video_meta_api_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
static const gchar *tags[] = static const gchar *tags[] =
{ GST_META_TAG_VIDEO_STR, GST_META_TAG_MEMORY_STR, { GST_META_TAG_VIDEO_STR, GST_META_TAG_MEMORY_STR,
GST_META_TAG_VIDEO_COLORSPACE_STR, GST_META_TAG_VIDEO_COLORSPACE_STR,
@ -577,7 +577,7 @@ gst_video_crop_meta_transform (GstBuffer * dest, GstMeta * meta,
GType GType
gst_video_crop_meta_api_get_type (void) gst_video_crop_meta_api_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
static const gchar *tags[] = static const gchar *tags[] =
{ GST_META_TAG_VIDEO_STR, GST_META_TAG_VIDEO_SIZE_STR, { GST_META_TAG_VIDEO_STR, GST_META_TAG_VIDEO_SIZE_STR,
GST_META_TAG_VIDEO_ORIENTATION_STR, NULL GST_META_TAG_VIDEO_ORIENTATION_STR, NULL
@ -638,7 +638,7 @@ gst_video_meta_transform_scale_get_quark (void)
GType GType
gst_video_gl_texture_upload_meta_api_get_type (void) gst_video_gl_texture_upload_meta_api_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
static const gchar *tags[] = static const gchar *tags[] =
{ GST_META_TAG_VIDEO_STR, GST_META_TAG_MEMORY_STR, NULL }; { GST_META_TAG_VIDEO_STR, GST_META_TAG_MEMORY_STR, NULL };
@ -806,7 +806,7 @@ gst_video_gl_texture_upload_meta_upload (GstVideoGLTextureUploadMeta * meta,
GType GType
gst_video_region_of_interest_meta_api_get_type (void) gst_video_region_of_interest_meta_api_get_type (void)
{ {
static volatile GType type; static GType type;
static const gchar *tags[] = static const gchar *tags[] =
{ GST_META_TAG_VIDEO_STR, GST_META_TAG_VIDEO_ORIENTATION_STR, { GST_META_TAG_VIDEO_STR, GST_META_TAG_VIDEO_ORIENTATION_STR,
GST_META_TAG_VIDEO_SIZE_STR, NULL GST_META_TAG_VIDEO_SIZE_STR, NULL
@ -1064,7 +1064,7 @@ gst_video_region_of_interest_meta_get_param (GstVideoRegionOfInterestMeta *
GType GType
gst_video_time_code_meta_api_get_type (void) gst_video_time_code_meta_api_get_type (void)
{ {
static volatile GType type; static GType type;
if (g_once_init_enter (&type)) { if (g_once_init_enter (&type)) {
static const gchar *tags[] = { NULL }; static const gchar *tags[] = { NULL };

View File

@ -921,7 +921,7 @@ gst_video_vbi_encoder_write_line (GstVideoVBIEncoder * encoder, guint8 * data)
GType GType
gst_video_caption_meta_api_get_type (void) gst_video_caption_meta_api_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
if (g_once_init_enter (&type)) { if (g_once_init_enter (&type)) {
static const gchar *tags[] = { NULL }; static const gchar *tags[] = { NULL };
@ -1124,7 +1124,7 @@ gst_video_caption_type_to_caps (GstVideoCaptionType type)
GType GType
gst_video_afd_meta_api_get_type (void) gst_video_afd_meta_api_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
if (g_once_init_enter (&type)) { if (g_once_init_enter (&type)) {
static const gchar *tags[] = { static const gchar *tags[] = {
@ -1263,7 +1263,7 @@ gst_buffer_add_video_afd_meta (GstBuffer * buffer, guint8 field,
GType GType
gst_video_bar_meta_api_get_type (void) gst_video_bar_meta_api_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
if (g_once_init_enter (&type)) { if (g_once_init_enter (&type)) {
static const gchar *tags[] = { static const gchar *tags[] = {

View File

@ -465,7 +465,7 @@ gst_video_content_light_level_add_to_caps (const GstVideoContentLightLevel *
GType GType
gst_video_hdr_meta_api_get_type (void) gst_video_hdr_meta_api_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
if (g_once_init_enter (&type)) { if (g_once_init_enter (&type)) {
static const gchar *tags[] = { static const gchar *tags[] = {

View File

@ -28,7 +28,7 @@
GType GType
gst_video_multiview_flagset_get_type (void) gst_video_multiview_flagset_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
if (g_once_init_enter (&type)) { if (g_once_init_enter (&type)) {
GType _type = gst_flagset_register (GST_TYPE_VIDEO_MULTIVIEW_FLAGS); GType _type = gst_flagset_register (GST_TYPE_VIDEO_MULTIVIEW_FLAGS);
@ -405,7 +405,7 @@ gst_video_multiview_guess_half_aspect (GstVideoMultiviewMode mv_mode,
GType GType
gst_video_multiview_meta_api_get_type (void) gst_video_multiview_meta_api_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
static const gchar *tags[] = static const gchar *tags[] =
{ GST_META_TAG_VIDEO_STR, GST_META_TAG_MEMORY_STR, { GST_META_TAG_VIDEO_STR, GST_META_TAG_MEMORY_STR,
NULL NULL

View File

@ -236,7 +236,7 @@ gst_video_overlay_composition_meta_transform (GstBuffer * dest, GstMeta * meta,
GType GType
gst_video_overlay_composition_meta_api_get_type (void) gst_video_overlay_composition_meta_api_get_type (void)
{ {
static volatile GType type = 0; static GType type = 0;
static const gchar *tags[] = { NULL }; static const gchar *tags[] = { NULL };
if (g_once_init_enter (&type)) { if (g_once_init_enter (&type)) {

View File

@ -53,8 +53,8 @@ struct _GstAdder {
/* sink event handling */ /* sink event handling */
GstSegment segment; GstSegment segment;
volatile gboolean new_segment_pending; gboolean new_segment_pending;
volatile gboolean flush_stop_pending; gboolean flush_stop_pending;
/* current caps */ /* current caps */
GstCaps *current_caps; GstCaps *current_caps;

View File

@ -208,7 +208,7 @@ gst_encodebin_flags_get_type (void)
"conversion elements", "no-video-conversion"}, "conversion elements", "no-video-conversion"},
{0, NULL, NULL} {0, NULL, NULL}
}; };
static volatile GType id = 0; static GType id = 0;
if (g_once_init_enter ((gsize *) & id)) { if (g_once_init_enter ((gsize *) & id)) {
GType _id; GType _id;

View File

@ -32,7 +32,7 @@ gst_autoplug_select_result_get_type (void)
{C_ENUM (GST_AUTOPLUG_SELECT_SKIP), "GST_AUTOPLUG_SELECT_SKIP", "skip"}, {C_ENUM (GST_AUTOPLUG_SELECT_SKIP), "GST_AUTOPLUG_SELECT_SKIP", "skip"},
{0, NULL, NULL} {0, NULL, NULL}
}; };
static volatile GType id = 0; static GType id = 0;
if (g_once_init_enter ((gsize *) & id)) { if (g_once_init_enter ((gsize *) & id)) {
GType _id; GType _id;
@ -74,7 +74,7 @@ gst_play_flags_get_type (void)
"force-sw-decoders"}, "force-sw-decoders"},
{0, NULL, NULL} {0, NULL, NULL}
}; };
static volatile GType id = 0; static GType id = 0;
if (g_once_init_enter ((gsize *) & id)) { if (g_once_init_enter ((gsize *) & id)) {
GType _id; GType _id;

View File

@ -70,7 +70,7 @@ struct _GstVideoRate
gboolean drop_only; gboolean drop_only;
guint64 average_period_set; guint64 average_period_set;
volatile int max_rate; int max_rate;
gdouble rate; gdouble rate;
gdouble pending_rate; gdouble pending_rate;
}; };

View File

@ -161,7 +161,7 @@ static GstCaps *
gst_video_scale_get_capslist (void) gst_video_scale_get_capslist (void)
{ {
static GstCaps *caps = NULL; static GstCaps *caps = NULL;
static volatile gsize inited = 0; static gsize inited = 0;
if (g_once_init_enter (&inited)) { if (g_once_init_enter (&inited)) {
caps = gst_static_caps_get (&gst_video_scale_format_caps); caps = gst_static_caps_get (&gst_video_scale_format_caps);