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

fix decoding last frame

Browse Source 
fix last decoded frame being skipped
This commit is contained in:
Glenn Maynard
2004-10-07 14:37:05 +00:00
parent fd34d08ae0
commit 1616f9d5b4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+7 -3
View File
@@ -299,10 +299,10 @@ int FFMpeg_Helper::ReadPacket()
* and 1 if we have a frame (we may have more data in the packet). */ * and 1 if we have a frame (we may have more data in the packet). */
int FFMpeg_Helper::DecodePacket() int FFMpeg_Helper::DecodePacket()
{ {
if( current_packet_offset == -1 ) if( eof == 0 && current_packet_offset == -1 )
return 0; /* no packet */ return 0; /* no packet */
while( eof == 1 || current_packet_offset < pkt.size ) while( eof == 1 || (eof == 0 && current_packet_offset < pkt.size) )
{ {
if ( GetNextTimestamp ) if ( GetNextTimestamp )
{ {
@@ -742,12 +742,16 @@ bool MovieTexture_FFMpeg::DecodeFrame()
{ {
m_bWantRewind = false; m_bWantRewind = false;
/* When resetting the clock, set it back by the length of the last frame,
* so it has a proper delay. */
float fDelay = decoder->LastFrameDelay;
/* Restart. */ /* Restart. */
DestroyDecoder(); DestroyDecoder();
CreateDecoder(); CreateDecoder();
decoder->Init(); decoder->Init();
m_Clock = 0; m_Clock = -fDelay;
return false; return false;
} }