diff options
| author | Michael Schenk | 2014-04-11 08:14:40 +0200 |
|---|---|---|
| committer | Anssi Hannula | 2014-04-12 03:14:52 +0300 |
| commit | 513a431e073ab725eb85fe7021591da9ad27a55f (patch) | |
| tree | 46caf2bf0127c779a58e0f1b3880e341c650cff4 /libavformat/hls.c | |
| parent | 66e959682c49e0686667cd3cbde87d725bb3c7e3 (diff) | |
avformat/hls: reduce memory usage by using dynamically allocated url/key
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Diffstat (limited to 'libavformat/hls.c')
| -rw-r--r-- | libavformat/hls.c | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c index fbdd3cafd4..3897723b7d 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -68,8 +68,8 @@ struct segment { int64_t duration; int64_t url_offset; int64_t size; - char url[MAX_URL_SIZE]; - char key[MAX_URL_SIZE]; + char *url; + char *key; enum KeyType key_type; uint8_t iv[16]; }; @@ -192,8 +192,11 @@ static int read_chomp_line(AVIOContext *s, char *buf, int maxlen) static void free_segment_list(struct playlist *pls) { int i; - for (i = 0; i < pls->n_segments; i++) + for (i = 0; i < pls->n_segments; i++) { + av_free(pls->segments[i]->key); + av_free(pls->segments[i]->url); av_free(pls->segments[i]); + } av_freep(&pls->segments); pls->n_segments = 0; } @@ -504,6 +507,7 @@ static int parse_playlist(HLSContext *c, const char *url, int64_t seg_size = -1; uint8_t *new_url = NULL; struct variant_info variant_info; + char tmp_str[MAX_URL_SIZE]; if (!in) { AVDictionary *opts = NULL; @@ -624,8 +628,28 @@ static int parse_playlist(HLSContext *c, const char *url, memset(seg->iv, 0, sizeof(seg->iv)); AV_WB32(seg->iv + 12, seq); } - ff_make_absolute_url(seg->key, sizeof(seg->key), url, key); - ff_make_absolute_url(seg->url, sizeof(seg->url), url, line); + + if (key_type != KEY_NONE) { + ff_make_absolute_url(tmp_str, sizeof(tmp_str), url, key); + seg->key = av_strdup(tmp_str); + if (!seg->key) { + av_free(seg); + ret = AVERROR(ENOMEM); + goto fail; + } + } else { + seg->key = NULL; + } + + ff_make_absolute_url(tmp_str, sizeof(tmp_str), url, line); + seg->url = av_strdup(tmp_str); + if (!seg->url) { + av_free(seg->key); + av_free(seg); + ret = AVERROR(ENOMEM); + goto fail; + } + dynarray_add(&pls->segments, &pls->n_segments, seg); is_segment = 0; |