RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/hlsenc: fix default AES key file url with variant streams 

Currently when hls_enc is active and there are multiple variant stream
outputs, default key file url construction does not work, because it is
based on the FormatContext' url field. But in case of multiple variant
streams, it contains the variant m3u8 output playlist url that contains
the %v placeholder. So the result key file url will hold the %v
placeholder causing run time error message about "could not write the
key file".
This patch correct this behaviour, and use the master playlist url for
constructing the output key file url when master playlist is vailable.

Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu>
This commit is contained in:
Bela Bodecs 2020-01-19 23:01:32 +01:00 committed by Steven Liu
parent dd5c7378bb
commit 8c3e9c9cbb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/hlsenc.c
View File

@ -642,13 +642,14 @@ static int do_encrypt(AVFormatContext *s, VariantStream *vs)
int len;
AVIOContext *pb;
uint8_t key[KEYSIZE];
char * key_basename_source = (hls->master_m3u8_url) ? hls->master_m3u8_url : s->url;
len = strlen(s->url) + 4 + 1;
len = strlen(key_basename_source) + 4 + 1;
hls->key_basename = av_mallocz(len);
if (!hls->key_basename)
return AVERROR(ENOMEM);
av_strlcpy(hls->key_basename, s->url, len);
av_strlcpy(hls->key_basename, key_basename_source, len);
av_strlcat(hls->key_basename, ".key", len);
if (hls->key_url) {