[FFmpeg-cvslog] avformat/hls: support decryption AES128 fmp4 m3u8 list

Steven Liu git at videolan.org
Wed Aug 22 14:15:41 EEST 2018


ffmpeg | branch: master | Steven Liu <lq at chinaffmpeg.org> | Mon Aug 13 18:15:23 2018 +0800| [9e61141905b5197c8fbab2a651b4013361c8550f] | committer: Steven Liu

avformat/hls: support decryption AES128 fmp4 m3u8 list

Signed-off-by: Steven Liu <lq at chinaffmpeg.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e61141905b5197c8fbab2a651b4013361c8550f
---

 libavformat/hls.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index 3d4f7f2647..8ad08baaed 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -811,6 +811,27 @@ static int parse_playlist(HLSContext *c, const char *url,
             ff_parse_key_value(ptr, (ff_parse_key_val_cb) handle_init_section_args,
                                &info);
             cur_init_section = new_init_section(pls, &info, url);
+            cur_init_section->key_type = key_type;
+            if (has_iv) {
+                memcpy(cur_init_section->iv, iv, sizeof(iv));
+            } else {
+                int seq = pls->start_seq_no + pls->n_segments;
+                memset(cur_init_section->iv, 0, sizeof(cur_init_section->iv));
+                AV_WB32(cur_init_section->iv + 12, seq);
+            }
+
+            if (key_type != KEY_NONE) {
+                ff_make_absolute_url(tmp_str, sizeof(tmp_str), url, key);
+                cur_init_section->key = av_strdup(tmp_str);
+                if (!cur_init_section->key) {
+                    av_free(cur_init_section);
+                    ret = AVERROR(ENOMEM);
+                    goto fail;
+                }
+            } else {
+                cur_init_section->key = NULL;
+            }
+
         } else if (av_strstart(line, "#EXT-X-ENDLIST", &ptr)) {
             if (pls)
                 pls->finished = 1;



More information about the ffmpeg-cvslog mailing list