generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated ffmpeg implementation (setProperty & getProperty methods)

Browse Source
This commit is contained in:
Alexander Reshetnikov 2012-02-18 12:56:00 +00:00
parent a6e8e5dd95
commit f83aa74bc4
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
modules/highgui/src/cap_ffmpeg_impl.hpp
View File

@ -384,6 +384,7 @@ struct CvCapture_FFMPEG
void close(); void close();
double getProperty(int); double getProperty(int);
bool seekKeyAndRunOverFrames(int framenumber);
bool setProperty(int, double); bool setProperty(int, double);
bool grabFrame(); bool grabFrame();
bool retrieveFrame(int, unsigned char** data, int* step, int* width, int* height, int* cn); bool retrieveFrame(int, unsigned char** data, int* step, int* width, int* height, int* cn);
@ -510,6 +511,9 @@ bool CvCapture_FFMPEG::reopen()
#ifndef AVSEEK_FLAG_ANY #ifndef AVSEEK_FLAG_ANY
#define AVSEEK_FLAG_ANY 1 #define AVSEEK_FLAG_ANY 1
#endif #endif
#ifndef SHORTER_DISTANCE_FOR_SEEK_TO_MAKE_IT_FASTER
#define SHORTER_DISTANCE_FOR_SEEK_TO_MAKE_IT_FASTER 25
#endif
bool CvCapture_FFMPEG::open( const char* _filename ) bool CvCapture_FFMPEG::open( const char* _filename )
{ {
@ -724,7 +728,7 @@ double CvCapture_FFMPEG::getProperty( int property_id )
{ {
case CV_FFMPEG_CAP_PROP_POS_MSEC: case CV_FFMPEG_CAP_PROP_POS_MSEC:
if(video_st->parser && video_st->parser->dts != AV_NOPTS_VALUE_) if(video_st->parser && video_st->parser->dts != AV_NOPTS_VALUE_)
return (((double)video_st->parser->dts-1) *1000.0f) * av_q2d (video_st->time_base); return (((double)video_st->parser->dts-1) *1000.0) * av_q2d (video_st->time_base);
if(video_st->cur_dts != AV_NOPTS_VALUE_) if(video_st->cur_dts != AV_NOPTS_VALUE_)
return ((video_st->cur_dts-video_st->first_dts) * 1000.0 * av_q2d (video_st->time_base)); return ((video_st->cur_dts-video_st->first_dts) * 1000.0 * av_q2d (video_st->time_base));
break; break;
@ -742,7 +746,7 @@ double CvCapture_FFMPEG::getProperty( int property_id )
break; break;
case CV_FFMPEG_CAP_PROP_FRAME_COUNT: case CV_FFMPEG_CAP_PROP_FRAME_COUNT:
if(video_st->duration != AV_NOPTS_VALUE_) if(video_st->duration != AV_NOPTS_VALUE_)
return (double)video_st->duration * frameScale; return (double)ceil(ic->duration * av_q2d(video_st->r_frame_rate) / AV_TIME_BASE);
break; break;
case CV_FFMPEG_CAP_PROP_FRAME_WIDTH: case CV_FFMPEG_CAP_PROP_FRAME_WIDTH:
return (double)frame.width; return (double)frame.width;
@ -787,10 +791,36 @@ bool CvCapture_FFMPEG::slowSeek( int framenumber )
return true; return true;
} }
bool CvCapture_FFMPEG::seekKeyAndRunOverFrames(int framenumber)
{
int ret;
if (framenumber > video_st->cur_dts-1) {
if (framenumber-(video_st->cur_dts-1) > SHORTER_DISTANCE_FOR_SEEK_TO_MAKE_IT_FASTER) {
ret = av_seek_frame(ic, video_stream, framenumber, 1);
assert(ret >= 0);
if( ret < 0 )
return false;
}
grabFrame();
while ((video_st->cur_dts-1) < framenumber)
if ( !grabFrame() ) return false;
}
else if ( framenumber < (video_st->cur_dts-1) ) {
ret=av_seek_frame(ic, video_stream, framenumber, 1);
assert( ret >= 0 );
if( ret < 0 )
return false;
grabFrame();
while ((video_st->cur_dts-1) < framenumber )
if ( !grabFrame() ) return false;
}
return true;
}
bool CvCapture_FFMPEG::setProperty( int property_id, double value ) bool CvCapture_FFMPEG::setProperty( int property_id, double value )
{ {
if( !video_st ) return false; if( !video_st ) return false;
int framenumber = 0;
switch( property_id ) switch( property_id )
{ {
@ -805,21 +835,18 @@ bool CvCapture_FFMPEG::setProperty( int property_id, double value )
switch( property_id ) switch( property_id )
{ {
case CV_FFMPEG_CAP_PROP_POS_FRAMES: case CV_FFMPEG_CAP_PROP_POS_FRAMES:
timestamp += (int64_t)(value * timeScale); framenumber=(int)value;
if(ic->start_time != AV_NOPTS_VALUE_) seekKeyAndRunOverFrames(framenumber);
timestamp += ic->start_time;
break; break;
case CV_FFMPEG_CAP_PROP_POS_MSEC: case CV_FFMPEG_CAP_PROP_POS_MSEC:
timestamp +=(int64_t)(value*(float(time_base.den)/float(time_base.num))/1000); framenumber=(int)(value/(1000.0f * av_q2d (video_st->time_base)));
if(ic->start_time != AV_NOPTS_VALUE_) seekKeyAndRunOverFrames(framenumber);
timestamp += ic->start_time;
break; break;
case CV_FFMPEG_CAP_PROP_POS_AVI_RATIO: case CV_FFMPEG_CAP_PROP_POS_AVI_RATIO:
timestamp += (int64_t)(value*ic->duration); framenumber = (int)(value*ic->duration);
if(ic->start_time != AV_NOPTS_VALUE_ && ic->duration != AV_NOPTS_VALUE_) seekKeyAndRunOverFrames(framenumber);
timestamp += ic->start_time;
break; break;
} }