Ticket #13223: 20180220_ffmpeg_ticket_13223.patch

mythtv/libs/libmythtv/mythplayer.h

@@ -348 +348 @@
                        frm_pos_map_t &durMap);
 
     // OSD locking for TV class
-    bool TryLockOSD(void) { return osdLock.tryLock(50); }
+    bool TryLockOSD(int n) { return osdLock.tryLock(n); }
     void LockOSD(void)    { osdLock.lock();   }
     void UnlockOSD(void)  { osdLock.unlock(); }
 

mythtv/libs/libmythtv/tv_play.cpp

@@ -3518 +3518 @@
     }
 
     PlayerContext *mctx = GetPlayerReadLock(0, __FILE__, __LINE__);
+    MythPlayer *player = mctx->player;
+    // Potential deadlock if this is called while VideoOut
+    // is being initialized.
+    if (!player->TryLockOSD(50))
+    {
+        ReturnPlayerLock(mctx);
+        return;
+    }
+
     OSD *osd = GetOSDLock(mctx);
     if (osd && osd->DialogVisible())
     {
         ReturnOSDLock(mctx, osd);
+        player->UnlockOSD();
         ReturnPlayerLock(mctx);
         return;
     }
     ReturnOSDLock(mctx, osd);
+    player->UnlockOSD();
 
     bool do_prompt;
     mctx->LockDeletePlayer(__FILE__, __LINE__);