MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/mov: fix encryption index in the case of multiple trun

Browse Source 
frag_stream_info->index_entry isn't the first sample/trun index.
cenc.frag_index_entry_base failed to catch the case since
current_index > 0.

Fix ticket #9807.

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

3
libavformat/isom.h
View File

@ -135,6 +135,8 @@ typedef struct MOVFragmentStreamInfo {
int64_t first_tfra_pts;
int64_t tfdt_dts;
int64_t next_trun_dts;
// Index of the first sample/trun in the fragment.
int index_base;
int index_entry;
MOVEncryptionIndex *encryption_index;
} MOVFragmentStreamInfo;
@ -253,7 +255,6 @@ typedef struct MOVStreamContext {
struct {
struct AVAESCTR* aes_ctr;
struct AVAES *aes_ctx;
unsigned int frag_index_entry_base;
unsigned int per_sample_iv_size; // Either 0, 8, or 16.
AVEncryptionInfo *default_encrypted_sample;
MOVEncryptionIndex *encryption_index;

10
libavformat/mov.c
View File

@ -1369,6 +1369,7 @@ static int update_frag_index(MOVContext *c, int64_t offset)
frag_stream_info[i].tfdt_dts = AV_NOPTS_VALUE;
frag_stream_info[i].next_trun_dts = AV_NOPTS_VALUE;
frag_stream_info[i].first_tfra_pts = AV_NOPTS_VALUE;
frag_stream_info[i].index_base = -1;
frag_stream_info[i].index_entry = -1;
frag_stream_info[i].encryption_index = NULL;
}
@ -5202,8 +5203,11 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
sc->ctts_count = sti->nb_index_entries;
// Record the index_entry position in frag_index of this fragment
if (frag_stream_info)
if (frag_stream_info) {
frag_stream_info->index_entry = index_entry_pos;
if (frag_stream_info->index_base < 0)
frag_stream_info->index_base = index_entry_pos;
}
if (index_entry_pos > 0)
prev_dts = sti->index_entries[index_entry_pos-1].timestamp;
@ -7211,9 +7215,7 @@ static int cenc_filter(MOVContext *mov, AVStream* st, MOVStreamContext *sc, AVPa
// Note this only supports encryption info in the first sample descriptor.
if (mov->fragment.stsd_id == 1) {
if (frag_stream_info->encryption_index) {
if (!current_index && frag_stream_info->index_entry)
sc->cenc.frag_index_entry_base = frag_stream_info->index_entry;
encrypted_index = current_index - (frag_stream_info->index_entry - sc->cenc.frag_index_entry_base);
encrypted_index = current_index - frag_stream_info->index_base;
encryption_index = frag_stream_info->encryption_index;
} else {
encryption_index = sc->cenc.encryption_index;