Fix livelock in QSV encoder when QSV fails to process frames

When QSVHelper.exe gets stuck the surfaces are never released, hence idle_tasks remains empty
jp9000 · Sep 10, 2014 · 90580da · 90580da
1 parent 56efd38
commit 90580da
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Source/Encoder_QSV.cpp b/Source/Encoder_QSV.cpp
@@ -1097,7 +1097,7 @@ class QSVEncoder : public VideoEncoder
 
     bool Encode(LPVOID picInPtr, List<DataPacket> &packets, List<PacketType> &packetTypes, DWORD outputTimestamp, DWORD &out_pts) override
     {
-        if(!process_waiter.wait_timeout())
+        if(helper_killed || !process_waiter.wait_timeout())
         {
             int code = 0;
             if(!GetExitCodeProcess(process_waiter.list[0], (LPDWORD)&code))
@@ -1128,10 +1128,10 @@ class QSVEncoder : public VideoEncoder
         {
             ProcessEncodedFrame(packets, packetTypes, outputTimestamp, out_pts, idle_tasks.Num() ? 0 : 1000);
         }
-        while(!idle_tasks.Num());
+        while(!helper_killed && !idle_tasks.Num());
         profileOut;
 
-        if(!queued)
+        if(!helper_killed && !queued)
             QueueEncodeTask((mfxFrameSurface1*)picInPtr, outputTimestamp);
 
         return true;