actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix deadlock

Browse Source
This commit is contained in:
Glenn Maynard
2003-08-29 05:39:47 +00:00
parent cecaf0c9be
commit 5fdf62e355
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MovieTexture/MovieTexture_AVCodec.cpp
+5 -1
View File
@@ -352,7 +352,7 @@ void MovieTexture_AVCodec::DecoderThread()
/* Decode the packet. */ /* Decode the packet. */
int current_packet_offset = 0; int current_packet_offset = 0;
while( current_packet_offset < pkt.size ) while( m_State != DECODER_QUIT && current_packet_offset < pkt.size )
{ {
if ( GetNextTimestamp ) if ( GetNextTimestamp )
{ {
@@ -432,7 +432,9 @@ void MovieTexture_AVCodec::DecoderThread()
if( m_State == PLAYING_ONE ) if( m_State == PLAYING_ONE )
SDL_SemPost( m_OneFrameDecoded ); SDL_SemPost( m_OneFrameDecoded );
CHECKPOINT;
SDL_SemWait( m_BufferFinished ); SDL_SemWait( m_BufferFinished );
CHECKPOINT;
/* If the frame wasn't used, then we must be shutting down. */ /* If the frame wasn't used, then we must be shutting down. */
ASSERT( !m_ImageWaiting || m_State == DECODER_QUIT ); ASSERT( !m_ImageWaiting || m_State == DECODER_QUIT );
@@ -503,7 +505,9 @@ void MovieTexture_AVCodec::StopThread()
/* Make sure we don't deadlock waiting for m_BufferFinished. */ /* Make sure we don't deadlock waiting for m_BufferFinished. */
SDL_SemPost(m_BufferFinished); SDL_SemPost(m_BufferFinished);
CHECKPOINT;
m_DecoderThread.Wait(); m_DecoderThread.Wait();
CHECKPOINT;
/* Clear the above post, if the thread didn't. */ /* Clear the above post, if the thread didn't. */
SDL_SemTryWait(m_BufferFinished); SDL_SemTryWait(m_BufferFinished);