vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat May 5 13:15:32 2018 +0300| [a805a5d98b4a15d844d521527c8b79f39b514e73] | committer: Rémi Denis-Courmont
aout: relax memory order for restart flags > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a805a5d98b4a15d844d521527c8b79f39b514e73 --- src/audio_output/dec.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c index 3bf66253f4..4fce75b2b4 100644 --- a/src/audio_output/dec.c +++ b/src/audio_output/dec.c @@ -77,7 +77,7 @@ int aout_DecNew( audio_output_t *p_aout, /* Create the audio output stream */ owner->volume = aout_volume_New (p_aout, p_replay_gain); - atomic_store (&owner->restart, 0); + atomic_store_explicit(&owner->restart, 0, memory_order_relaxed); owner->input_format = *p_format; owner->mixer_format = owner->input_format; owner->request_vout = *p_request_vout; @@ -130,9 +130,10 @@ void aout_DecDelete (audio_output_t *aout) static int aout_CheckReady (audio_output_t *aout) { aout_owner_t *owner = aout_owner (aout); - int status = AOUT_DEC_SUCCESS; - int restart = atomic_exchange (&owner->restart, 0); + + int restart = atomic_exchange_explicit(&owner->restart, 0, + memory_order_acquire); if (unlikely(restart)) { if (owner->mixer_format.i_format) @@ -188,7 +189,7 @@ static int aout_CheckReady (audio_output_t *aout) void aout_RequestRestart (audio_output_t *aout, unsigned mode) { aout_owner_t *owner = aout_owner (aout); - atomic_fetch_or (&owner->restart, mode); + atomic_fetch_or_explicit(&owner->restart, mode, memory_order_release); msg_Dbg (aout, "restart requested (%u)", mode); } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
