You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
2.3 KiB
47 lines
2.3 KiB
--- a/libavformat/hls.c
|
|
+++ b/libavformat/hls.c
|
|
@@ -207,6 +207,8 @@ typedef struct HLSContext {
|
|
int max_reload;
|
|
int http_persistent;
|
|
int http_multiple;
|
|
+ char *key_uri_replace_old;
|
|
+ char *key_uri_replace_new;
|
|
AVIOContext *playlist_pb;
|
|
} HLSContext;
|
|
|
|
@@ -1205,8 +1207,16 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg,
|
|
} else if (seg->key_type == KEY_AES_128) {
|
|
char iv[33], key[33], url[MAX_URL_SIZE];
|
|
if (strcmp(seg->key, pls->key_url)) {
|
|
+ char *key_url = NULL;
|
|
AVIOContext *pb = NULL;
|
|
- if (open_url(pls->parent, &pb, seg->key, c->avio_opts, opts, NULL) == 0) {
|
|
+ if (NULL != c->key_uri_replace_old && \
|
|
+ NULL != c-> key_uri_replace_new && \
|
|
+ '\0' != c->key_uri_replace_old[0]) {
|
|
+ key_url = av_strireplace(seg->key, c->key_uri_replace_old, c->key_uri_replace_new);
|
|
+ } else {
|
|
+ key_url = seg->key;
|
|
+ }
|
|
+ if (open_url(pls->parent, &pb, key_url, c->avio_opts, opts, NULL) == 0) {
|
|
ret = avio_read(pb, pls->key, sizeof(pls->key));
|
|
if (ret != sizeof(pls->key)) {
|
|
av_log(pls->parent, AV_LOG_ERROR, "Unable to read key file %s\n",
|
|
@@ -1218,6 +1228,8 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg,
|
|
seg->key);
|
|
}
|
|
av_strlcpy(pls->key_url, seg->key, sizeof(pls->key_url));
|
|
+ if (key_url != seg->key)
|
|
+ av_free(key_url);
|
|
}
|
|
ff_data_to_hex(iv, seg->iv, sizeof(seg->iv), 0);
|
|
ff_data_to_hex(key, pls->key, sizeof(pls->key), 0);
|
|
@@ -2319,6 +2331,8 @@ static const AVOption hls_options[] = {
|
|
OFFSET(http_persistent), AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, FLAGS },
|
|
{"http_multiple", "Use multiple HTTP connections for fetching segments",
|
|
OFFSET(http_multiple), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, FLAGS},
|
|
+ { "key_uri_old", "allow to replace part of AES key uri - old", OFFSET(key_uri_replace_old), AV_OPT_TYPE_STRING, { .str = "" }, 0, 0, FLAGS },
|
|
+ { "key_uri_new", "allow to replace part of AES key uri - new", OFFSET(key_uri_replace_new), AV_OPT_TYPE_STRING, { .str = "" }, 0, 0, FLAGS },
|
|
{NULL}
|
|
};
|
|
|
|
|