Commit e0791c5a authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

lavf/flvdec: Set avg_frame_rate for video streams.

Requested-by: qw, applemax82 at 163 dot com
Reviewed-by: Steven Liu
parent 334775f5
...@@ -67,6 +67,7 @@ typedef struct FLVContext { ...@@ -67,6 +67,7 @@ typedef struct FLVContext {
int64_t *keyframe_times; int64_t *keyframe_times;
int64_t *keyframe_filepositions; int64_t *keyframe_filepositions;
int missing_streams; int missing_streams;
AVRational framerate;
} FLVContext; } FLVContext;
static int probe(AVProbeData *p, int live) static int probe(AVProbeData *p, int live)
...@@ -142,8 +143,10 @@ static AVStream *create_stream(AVFormatContext *s, int codec_type) ...@@ -142,8 +143,10 @@ static AVStream *create_stream(AVFormatContext *s, int codec_type)
s->ctx_flags &= ~AVFMTCTX_NOHEADER; s->ctx_flags &= ~AVFMTCTX_NOHEADER;
if (codec_type == AVMEDIA_TYPE_AUDIO) if (codec_type == AVMEDIA_TYPE_AUDIO)
flv->missing_streams &= ~FLV_HEADER_FLAG_HASAUDIO; flv->missing_streams &= ~FLV_HEADER_FLAG_HASAUDIO;
if (codec_type == AVMEDIA_TYPE_VIDEO) if (codec_type == AVMEDIA_TYPE_VIDEO) {
flv->missing_streams &= ~FLV_HEADER_FLAG_HASVIDEO; flv->missing_streams &= ~FLV_HEADER_FLAG_HASVIDEO;
st->avg_frame_rate = flv->framerate;
}
avpriv_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ avpriv_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */
...@@ -555,6 +558,10 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, ...@@ -555,6 +558,10 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
st->codecpar->codec_id = AV_CODEC_ID_TEXT; st->codecpar->codec_id = AV_CODEC_ID_TEXT;
} else if (!strcmp(key, "framerate")) {
flv->framerate = av_d2q(num_val, 1000);
if (vstream)
vstream->avg_frame_rate = flv->framerate;
} else if (flv->trust_metadata) { } else if (flv->trust_metadata) {
if (!strcmp(key, "videocodecid") && vpar) { if (!strcmp(key, "videocodecid") && vpar) {
int ret = flv_set_video_codec(s, vstream, num_val, 0); int ret = flv_set_video_codec(s, vstream, num_val, 0);
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here // Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57 #define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 58 #define LIBAVFORMAT_VERSION_MINOR 58
#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment