virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/mov: get the correct fragment stsd_id when decrypting the sample

Browse Source 
When determining whether a packet should be decrypted,
should use the stsd_id of the fragment where the current packet is located.

Reviewed-by: Zhao Zhili <zhilizhao@tencent.com>
Signed-off-by: Wang Yaqiang <wangyaqiang03@kuaishou.com>
This commit is contained in:
Wang Yaqiang
2022-09-01 21:29:03 +08:00
committed by Steven Liu
parent 3ade6a8644
commit 0744782de3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/isom.h
View File

@@ -139,6 +139,7 @@ typedef struct MOVFragmentStreamInfo {
int index_base;
int index_entry;
MOVEncryptionIndex *encryption_index;
int stsd_id; // current fragment stsd_id
} MOVFragmentStreamInfo;
typedef struct MOVFragmentIndexItem {

7
libavformat/mov.c
View File

@@ -4958,9 +4958,10 @@ static int mov_read_tfhd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
av_log(c->fc, AV_LOG_TRACE, "frag flags 0x%x\n", frag->flags);
frag_stream_info = get_current_frag_stream_info(&c->frag_index);
if (frag_stream_info)
if (frag_stream_info) {
frag_stream_info->next_trun_dts = AV_NOPTS_VALUE;
frag_stream_info->stsd_id = frag->stsd_id;
}
return 0;
}
@@ -7225,7 +7226,7 @@ static int cenc_filter(MOVContext *mov, AVStream* st, MOVStreamContext *sc, AVPa
encryption_index = NULL;
if (frag_stream_info) {
// Note this only supports encryption info in the first sample descriptor.
if (mov->fragment.stsd_id == 1) {
if (frag_stream_info->stsd_id == 1) {
if (frag_stream_info->encryption_index) {
encrypted_index = current_index - frag_stream_info->index_base;
encryption_index = frag_stream_info->encryption_index;