highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/flvdec: splitting add_keyframes_index() out from parse_keyframes_index()

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit cd141e71bd3441ac9b7b720b934b7d4d85a75355)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Xinzheng Zhang 2016-07-27 12:21:24 +08:00 committed by Michael Niedermayer
parent 87d5146fb7
commit 88e3e6b943
1 changed files with 60 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
libavformat/flvdec.c
View File

@ -61,6 +61,11 @@ typedef struct FLVContext {
int broken_sizes; int broken_sizes;
int sum_flv_tag_size; int sum_flv_tag_size;
int last_keyframe_stream_index;
int keyframe_count;
int64_t *keyframe_times;
int64_t *keyframe_filepositions;
} FLVContext; } FLVContext;
static int probe(AVProbeData *p, int live) static int probe(AVProbeData *p, int live)
@ -92,6 +97,35 @@ static int live_flv_probe(AVProbeData *p)
return probe(p, 1); return probe(p, 1);
} }
static void add_keyframes_index(AVFormatContext *s)
{
FLVContext *flv = s->priv_data;
AVStream *stream = NULL;
unsigned int i = 0;
if (flv->last_keyframe_stream_index < 0) {
av_log(s, AV_LOG_DEBUG, "keyframe stream hasn't been created\n");
return;
}
av_assert0(flv->last_keyframe_stream_index <= s->nb_streams);
stream = s->streams[flv->last_keyframe_stream_index];
if (stream->nb_index_entries == 0) {
for (i = 0; i < flv->keyframe_count; i++) {
av_add_index_entry(stream, flv->keyframe_filepositions[i],
flv->keyframe_times[i] * 1000, 0, 0, AVINDEX_KEYFRAME);
}
} else
av_log(s, AV_LOG_WARNING, "Skipping duplicate index\n");
if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
av_freep(&flv->keyframe_times);
av_freep(&flv->keyframe_filepositions);
flv->keyframe_count = 0;
}
}
static AVStream *create_stream(AVFormatContext *s, int codec_type) static AVStream *create_stream(AVFormatContext *s, int codec_type)
{ {
AVStream *st = avformat_new_stream(s, NULL); AVStream *st = avformat_new_stream(s, NULL);
@ -305,8 +339,7 @@ static int amf_get_string(AVIOContext *ioc, char *buffer, int buffsize)
return length; return length;
} }
static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, int64_t max_pos)
AVStream *vstream, int64_t max_pos)
{ {
FLVContext *flv = s->priv_data; FLVContext *flv = s->priv_data;
unsigned int timeslen = 0, fileposlen = 0, i; unsigned int timeslen = 0, fileposlen = 0, i;
@ -316,10 +349,12 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc,
int ret = AVERROR(ENOSYS); int ret = AVERROR(ENOSYS);
int64_t initial_pos = avio_tell(ioc); int64_t initial_pos = avio_tell(ioc);
if (vstream->nb_index_entries>0) { if (flv->keyframe_count > 0) {
av_log(s, AV_LOG_WARNING, "Skipping duplicate index\n"); av_log(s, AV_LOG_DEBUG, "keyframes have been paresed\n");
return 0; return 0;
} }
av_assert0(!flv->keyframe_times);
av_assert0(!flv->keyframe_filepositions);
if (s->flags & AVFMT_FLAG_IGNIDX) if (s->flags & AVFMT_FLAG_IGNIDX)
return 0; return 0;
@ -368,15 +403,17 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc,
} }
if (timeslen == fileposlen && fileposlen>1 && max_pos <= filepositions[0]) { if (timeslen == fileposlen && fileposlen>1 && max_pos <= filepositions[0]) {
for (i = 0; i < fileposlen; i++) { for (i = 0; i < FFMIN(2,fileposlen); i++) {
av_add_index_entry(vstream, filepositions[i], times[i] * 1000, flv->validate_index[i].pos = filepositions[i];
0, 0, AVINDEX_KEYFRAME); flv->validate_index[i].dts = times[i] * 1000;
if (i < 2) { flv->validate_count = i + 1;
flv->validate_index[i].pos = filepositions[i];
flv->validate_index[i].dts = times[i] * 1000;
flv->validate_count = i + 1;
}
} }
flv->keyframe_times = times;
flv->keyframe_filepositions = filepositions;
flv->keyframe_count = timeslen;
times = NULL;
filepositions = NULL;
add_keyframes_index(s);
} else { } else {
invalid: invalid:
av_log(s, AV_LOG_WARNING, "Invalid keyframes object, skipping.\n"); av_log(s, AV_LOG_WARNING, "Invalid keyframes object, skipping.\n");
@ -421,10 +458,9 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
if ((vstream || astream) && key && if ((vstream || astream) && key &&
ioc->seekable && ioc->seekable &&
!strcmp(KEYFRAMES_TAG, key) && depth == 1) !strcmp(KEYFRAMES_TAG, key) && depth == 1)
if (parse_keyframes_index(s, ioc, vstream ? vstream : astream, if (parse_keyframes_index(s, ioc,
max_pos) < 0) max_pos) < 0)
av_log(s, AV_LOG_ERROR, "Keyframe index parsing failed\n"); av_log(s, AV_LOG_ERROR, "Keyframe index parsing failed\n");
while (avio_tell(ioc) < max_pos - 2 && while (avio_tell(ioc) < max_pos - 2 &&
amf_get_string(ioc, str_val, sizeof(str_val)) > 0) amf_get_string(ioc, str_val, sizeof(str_val)) > 0)
if (amf_parse_object(s, astream, vstream, str_val, max_pos, if (amf_parse_object(s, astream, vstream, str_val, max_pos,
@ -574,6 +610,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream,
static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) static int flv_read_metabody(AVFormatContext *s, int64_t next_pos)
{ {
FLVContext *flv = s->priv_data;
AMFDataType type; AMFDataType type;
AVStream *stream, *astream, *vstream; AVStream *stream, *astream, *vstream;
AVStream av_unused *dstream; AVStream av_unused *dstream;
@ -612,10 +649,14 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos)
// the lookup every time it is called. // the lookup every time it is called.
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
stream = s->streams[i]; stream = s->streams[i];
if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
vstream = stream; vstream = stream;
else if (stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) flv->last_keyframe_stream_index = i;
} else if (stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
astream = stream; astream = stream;
if (flv->last_keyframe_stream_index == -1)
flv->last_keyframe_stream_index = i;
}
else if (stream->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE) else if (stream->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE)
dstream = stream; dstream = stream;
} }
@ -643,6 +684,7 @@ static int flv_read_header(AVFormatContext *s)
s->start_time = 0; s->start_time = 0;
flv->sum_flv_tag_size = 0; flv->sum_flv_tag_size = 0;
flv->last_keyframe_stream_index = -1;
return 0; return 0;
} }
@ -653,6 +695,8 @@ static int flv_read_close(AVFormatContext *s)
FLVContext *flv = s->priv_data; FLVContext *flv = s->priv_data;
for (i=0; i<FLV_STREAM_TYPE_NB; i++) for (i=0; i<FLV_STREAM_TYPE_NB; i++)
av_freep(&flv->new_extradata[i]); av_freep(&flv->new_extradata[i]);
av_freep(&flv->keyframe_times);
av_freep(&flv->keyframe_filepositions);
return 0; return 0;
} }