videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avformat/mov: fix frag_index.current out of sync 

frag_index.current is used by cenc_filter, and is updated inside
mov_read_moof. It can out of sync regarding to mov_read_packet.

Partly fix ticket #9807.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili 2022-07-31 01:14:11 +08:00
parent ae66a9db7b
commit 98dcdd1868
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavformat/mov.c
View File

@ -7172,6 +7172,31 @@ static int cenc_decrypt(MOVContext *c, MOVStreamContext *sc, AVEncryptionInfo *s
}
}
static MOVFragmentStreamInfo *get_frag_stream_info_from_pkt(MOVFragmentIndex *frag_index, AVPacket *pkt, int id)
{
int current = frag_index->current;
if (!frag_index->nb_items)
return NULL;
// Check frag_index->current is the right one for pkt. It can out of sync.
if (current >= 0 && current < frag_index->nb_items) {
if (frag_index->item[current].moof_offset < pkt->pos &&
(current + 1 == frag_index->nb_items ||
frag_index->item[current + 1].moof_offset > pkt->pos))
return get_frag_stream_info(frag_index, current, id);
}
for (int i = 0; i < frag_index->nb_items; i++) {
if (frag_index->item[i].moof_offset > pkt->pos)
break;
current = i;
}
frag_index->current = current;
return get_frag_stream_info(frag_index, current, id);
}
static int cenc_filter(MOVContext *mov, AVStream* st, MOVStreamContext *sc, AVPacket *pkt, int current_index)
{
MOVFragmentStreamInfo *frag_stream_info;
@ -7179,7 +7204,7 @@ static int cenc_filter(MOVContext *mov, AVStream* st, MOVStreamContext *sc, AVPa
AVEncryptionInfo *encrypted_sample;
int encrypted_index, ret;
frag_stream_info = get_frag_stream_info(&mov->frag_index, mov->frag_index.current, st->id);
frag_stream_info = get_frag_stream_info_from_pkt(&mov->frag_index, pkt, st->id);
encrypted_index = current_index;
encryption_index = NULL;
if (frag_stream_info) {