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

update to ffmpeg-0.4.9-pre1

Browse Source 
This fixes problems with some XviD videos containing B-frames playing
too fast.
This commit is contained in:
Glenn Maynard
2004-08-06 20:22:48 +00:00
parent eb2019ec8b
commit 8684b02479
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+4 -17
View File
@@ -272,29 +272,17 @@ int FFMpeg_Helper::ReadPacket()
avcodec::av_free_packet( &pkt ); avcodec::av_free_packet( &pkt );
} }
int ret = avcodec::av_read_packet(m_fctx, &pkt); int ret = avcodec::av_read_frame( m_fctx, &pkt );
/* XXX: why is avformat returning AVERROR_NOMEM on EOF? */ /* XXX: why is avformat returning AVERROR_NOMEM on EOF? */
if( ret < 0 ) if( ret < 0 )
// if( ret == -1 )
{ {
/* EOF. */ /* EOF. */
eof = 1; eof = 1;
pkt.size = 0; pkt.size = 0;
current_packet_offset = 0;
return 0; return 0;
} }
#if 0
if( ret < 0 )
{
/* XXX ? */
// LOG->Warn("AVCodec: Error decoding %s: %i",
// GetID().filename.c_str(), ret );
return -1;
}
#endif
if( pkt.stream_index == m_stream->index ) if( pkt.stream_index == m_stream->index )
{ {
current_packet_offset = 0; current_packet_offset = 0;
@@ -319,13 +307,13 @@ int FFMpeg_Helper::DecodePacket()
if ( GetNextTimestamp ) if ( GetNextTimestamp )
{ {
if (pkt.pts != int64_t(AV_NOPTS_VALUE)) if (pkt.pts != int64_t(AV_NOPTS_VALUE))
pts = (float)pkt.pts * m_fctx->pts_num / m_fctx->pts_den; pts = (float)pkt.pts / AV_TIME_BASE;
else else
pts = -1; pts = -1;
GetNextTimestamp = false; GetNextTimestamp = false;
} }
/* If we have no data on the first frame, just reutrn EOF; passing an empty packet /* If we have no data on the first frame, just return EOF; passing an empty packet
* to avcodec_decode_video in this case is crashing it. However, passing an empty * to avcodec_decode_video in this case is crashing it. However, passing an empty
* packet is normal with B-frames, to flush. This may be unnecessary in newer * packet is normal with B-frames, to flush. This may be unnecessary in newer
* versions of avcodec, but I'm waiting until a new stable release to upgrade. */ * versions of avcodec, but I'm waiting until a new stable release to upgrade. */
@@ -337,8 +325,7 @@ int FFMpeg_Helper::DecodePacket()
int len = avcodec::avcodec_decode_video( int len = avcodec::avcodec_decode_video(
&m_stream->codec, &m_stream->codec,
&frame, &got_frame, &frame, &got_frame,
pkt.data + current_packet_offset, pkt.data, pkt.size );
pkt.size - current_packet_offset );
CHECKPOINT; CHECKPOINT;
if (len < 0) if (len < 0)