Commit 8c3e9c9c authored by Bela Bodecs's avatar Bela Bodecs Committed by Steven Liu

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: 's avatarBela Bodecs <bodecsb@vivanet.hu>
parent dd5c7378
...@@ -642,13 +642,14 @@ static int do_encrypt(AVFormatContext *s, VariantStream *vs) ...@@ -642,13 +642,14 @@ static int do_encrypt(AVFormatContext *s, VariantStream *vs)
int len; int len;
AVIOContext *pb; AVIOContext *pb;
uint8_t key[KEYSIZE]; 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); hls->key_basename = av_mallocz(len);
if (!hls->key_basename) if (!hls->key_basename)
return AVERROR(ENOMEM); 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); av_strlcat(hls->key_basename, ".key", len);
if (hls->key_url) { if (hls->key_url) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment