[vlc-commits] player: assert that the player is not locked from aout/vout callbacks

Thomas Guillem git at videolan.org
Mon Aug 26 09:29:48 CEST 2019


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Aug 23 14:32:19 2019 +0200| [f83434ac6488e5cee32e191f9a89859254156b0e] | committer: Thomas Guillem

player: assert that the player is not locked from aout/vout callbacks

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f83434ac6488e5cee32e191f9a89859254156b0e
---

 src/player/player.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/player/player.c b/src/player/player.c
index a0c421511b..839fd0eea7 100644
--- a/src/player/player.c
+++ b/src/player/player.c
@@ -891,6 +891,11 @@ vlc_player_SelectPrevChapter(vlc_player_t *player)
 void
 vlc_player_Lock(vlc_player_t *player)
 {
+    /* Vout and aout locks should not be held, cf. vlc_player_vout_cbs and
+     * vlc_player_aout_cbs documentation */
+    assert(!vlc_mutex_marked(&player->vout_listeners_lock));
+    assert(!vlc_mutex_marked(&player->aout_listeners_lock));
+
     vlc_mutex_lock(&player->lock);
 }
 



More information about the vlc-commits mailing list