diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 22:08:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-29 17:40:28 +0100 |
| commit | ef7b6b489ab38a8f0abe6b8f55c0e130cbd125c9 (patch) | |
| tree | b3a0892c9a4d1bf7406a22379144861b8fc5d34e /libavformat | |
| parent | c81d2fa96ddc9f6dab38d61a8803caca7e63bea0 (diff) | |
| download | ffmpeg-ef7b6b489ab38a8f0abe6b8f55c0e130cbd125c9.tar.gz | |
ffmpeg/avformat: factor av_guess_frame_rate() out
This will be used in ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 10 | ||||
| -rw-r--r-- | libavformat/utils.c | 16 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 27 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 549a0fa45f..57603031a4 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -2108,6 +2108,16 @@ const struct AVCodecTag *avformat_get_riff_audio_tags(void); AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *stream, AVFrame *frame); /** + * Guess the frame rate, based on both the container and codec information. + * + * @param ctx the format context which the stream is part of + * @param stream the stream which the frame is part of + * @param frame the frame for which the frame rate should be determined, may be NULL + * @return the guessed (valid) frame rate, 0/1 if no idea + */ +AVRational av_guess_frame_rate(AVFormatContext *ctx, AVStream *stream, AVFrame *frame); + +/** * Check if the stream st contained in s is matched by the stream specifier * spec. * diff --git a/libavformat/utils.c b/libavformat/utils.c index df688f1817..d0393f9db2 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4278,6 +4278,22 @@ AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *strea return frame_sample_aspect_ratio; } +AVRational av_guess_frame_rate(AVFormatContext *format, AVStream *st, AVFrame *frame) +{ + AVRational fr = st->r_frame_rate; + + if (st->codec->ticks_per_frame > 1) { + AVRational codec_fr = av_inv_q(st->codec->time_base); + AVRational avg_fr = st->avg_frame_rate; + codec_fr.den *= st->codec->ticks_per_frame; + if ( codec_fr.num > 0 && codec_fr.den > 0 && av_q2d(codec_fr) < av_q2d(fr)*0.7 + && fabs(1.0 - av_q2d(av_div_q(avg_fr, fr))) > 0.1) + fr = codec_fr; + } + + return fr; +} + int avformat_match_stream_specifier(AVFormatContext *s, AVStream *st, const char *spec) { diff --git a/libavformat/version.h b/libavformat/version.h index 6332878c9f..17447c0e08 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 55 -#define LIBAVFORMAT_VERSION_MINOR 0 +#define LIBAVFORMAT_VERSION_MINOR 1 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |