jfmcarreira/calyp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try fix detection of number of frames (detected problem within the libavs). Use double for frame rate

Browse Source
This commit is contained in:
jfmcarreira
2015-03-06 01:50:59 +00:00
parent 2bd2e2ce95
commit 2a43b5262a
5 changed files with 76 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/LibAvContextHandle.cpp
+60 -62
View File
@@ -133,7 +133,7 @@ Void LibAvContextHandle::closeAvFormat()
m_bHasStream = false;
}
Bool LibAvContextHandle::initAvFormat( const char* filename, UInt& width, UInt& height, Int& pixel_format, UInt& frame_rate, UInt64& num_frames )
Bool LibAvContextHandle::initAvFormat( const char* filename, UInt& width, UInt& height, Int& pixel_format, Double& frame_rate, UInt64& num_frames )
{
fmt_ctx = NULL;
video_dec_ctx = NULL;
@@ -212,9 +212,13 @@ Bool LibAvContextHandle::initAvFormat( const char* filename, UInt& width, UInt&
else if( video_stream->codec->time_base.den && video_stream->codec->time_base.num )
fr = 1 / av_q2d( video_stream->codec->time_base );
frame_rate = ( UInt )fr;
frame_rate = fr;
if( fmt_ctx->duration != AV_NOPTS_VALUE )
/*if( video_stream->nb_frames )
{
num_frames = video_stream->nb_frames;
}
else*/ if( fmt_ctx->duration != AV_NOPTS_VALUE )
{
Int64 duration = fmt_ctx->duration + 5000;
m_uiSecs = duration / AV_TIME_BASE;
@@ -292,77 +296,71 @@ Bool LibAvContextHandle::initAvFormat( const char* filename, UInt& width, UInt&
return true;
}
Bool LibAvContextHandle::decodeVideoPkt()
{
Int got_frame = 0;
Int decResult;
if( pkt.stream_index == video_stream_idx )
{
decResult = avcodec_decode_video2( video_dec_ctx, frame, &got_frame, &pkt );
if( decResult < 0 )
{
fprintf( stderr, "Error decoding video frame\n" );
return false;
}
pkt.data += decResult;
pkt.size -= decResult;
}
else
{
pkt.size = 0;
}
Bool bRet = got_frame > 0 ? true : false;
return bRet;
}
Bool LibAvContextHandle::decodeAvFormat()
{
Int got_frame;
Int decResult;
Bool bGotFrame = false;
AVPacket orig_pkt = pkt;
bGotFrame |= decodeVideoPkt();
/* read frames from the file */
while( av_read_frame( fmt_ctx, &pkt ) >= 0 )
while( !bGotFrame && ( av_read_frame( fmt_ctx, &pkt ) >= 0 ) )
{
AVPacket orig_pkt = pkt;
orig_pkt = pkt;
do
{
if( pkt.stream_index == video_stream_idx )
{
/* decode video frame */
decResult = avcodec_decode_video2( video_dec_ctx, frame, &got_frame, &pkt );
if( decResult < 0 )
{
fprintf( stderr, "Error decoding video frame\n" );
return false;
}
if( got_frame )
{
av_image_copy_to_buffer( m_pchFrameBuffer, m_uiFrameBufferSize, frame->data, frame->linesize, video_dec_ctx->pix_fmt, video_dec_ctx->width,
video_dec_ctx->height, 1 );
}
}
pkt.data += decResult;
pkt.size -= decResult;
bGotFrame |= decodeVideoPkt();
if( bGotFrame )
break;
}
while( pkt.size > 0 );
if( bGotFrame )
{
break;
}
}
/*! Try flush existing packets */
if( !bGotFrame )
{
bGotFrame |= decodeVideoPkt();
}
if( bGotFrame )
{
av_image_copy_to_buffer( m_pchFrameBuffer, m_uiFrameBufferSize, frame->data, frame->linesize, video_dec_ctx->pix_fmt, video_dec_ctx->width,
video_dec_ctx->height, 1 );
av_free_packet( &orig_pkt );
// /* read frames from the file */
// while( av_read_frame( fmt_ctx, &pkt ) >= 0 )
// {
// if( pkt.stream_index == video_stream_idx )
// {
// /* decode video frame */
// Int ret = avcodec_decode_video2( video_dec_ctx, frame, &got_frame, &pkt );
// if( ret < 0 )
// {
// fprintf( stderr, "Error decoding video frame\n" );
// return false;
// }
//
// if( got_frame )
// {
// av_image_copy_to_buffer( m_pchFrameBuffer, m_uiFrameBufferSize, frame->data, frame->linesize, video_dec_ctx->pix_fmt, video_dec_ctx->width,
// video_dec_ctx->height, 1 );
//
// /* copy decoded frame to destination buffer:
// * this is required since rawvideo expects non aligned data */
// // av_image_copy( video_dst_data, video_dst_linesize, ( const uint8_t ** )( frame->data ), frame->linesize, video_dec_ctx->pix_fmt, video_dec_ctx->width,
// // video_dec_ctx->height );
// }
// }
// av_free_packet( &pkt );
if( got_frame )
return true;
return true;
}
return false;
// /* flush cached frames */
// pkt.data = NULL;
// pkt.size = 0;
// do
// {
// decode_packet( &got_frame, 1 );
// }
// while( got_frame );
return true;
return false;
}
Void LibAvContextHandle::seekAvFormat( UInt64 frame_num )