From patchwork Sat Mar 7 03:47:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 18076 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5857F449B13 for ; Sat, 7 Mar 2020 05:47:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DA9868B09C; Sat, 7 Mar 2020 05:47:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbguseast2.qq.com (smtpbguseast2.qq.com [54.204.34.130]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2027768B06C for ; Sat, 7 Mar 2020 05:47:43 +0200 (EET) X-QQ-mid: bizesmtp2t1583552847t363fb0g4 Received: from localhost (unknown [221.220.17.5]) by esmtp6.qq.com (ESMTP) with id ; Sat, 07 Mar 2020 11:47:26 +0800 (CST) X-QQ-SSF: 01100000000000K0ZTF0000A0000000 X-QQ-FEAT: c1D3sbPsXF5dsfMM/btcA/JxP0tC9hFgiAy3ORLmEJvrabJVj2F0xhY1FzRtF KCcuKGKvL6nJZZEILRrXwe6m4OaaESw4OzWKpDGprVzyJIloR828zccnEPjg+gT1sbGGmlc aQfLJi5bssbEGvunoUiO5zs8lNNXXoNxMTBfpQzJLdCAX11rmodNr+ckgqNWG3Ij1aTA5U8 jHRmcc0tuh7B03DJ6CryVfM49VgMtb4ePZRRU24salQtfYz/uILKXcmQYYyZQb5fxKVeykn y4C2PNFPvEqT7SQHLQPk1DJoVarOrjEQqjIIh2n4me54S10j3W/opv/1BYBdtUYBefzOfX/ uO6YK9/ X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Mar 2020 11:47:23 +0800 Message-Id: <20200307034723.65257-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <99819ce6-ac7d-f2af-700b-6e53bf69e020@gmail.com> References: <99819ce6-ac7d-f2af-700b-6e53bf69e020@gmail.com> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign7 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2] avformat/hlsenc: set the options when open the key info files X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Steven Liu , Steven Liu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" make the options same as segments for the http put method Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index f6dd894343..4b28c412fa 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -685,6 +685,7 @@ static int do_encrypt(AVFormatContext *s, VariantStream *vs) } if (!*hls->key_string) { + AVDictionary *options = NULL; if (!hls->key) { if ((ret = randomize(key, sizeof(key))) < 0) { av_log(s, AV_LOG_ERROR, "Cannot generate a strong random key\n"); @@ -695,7 +696,10 @@ static int do_encrypt(AVFormatContext *s, VariantStream *vs) } ff_data_to_hex(hls->key_string, key, sizeof(key), 0); - if ((ret = s->io_open(s, &pb, hls->key_file, AVIO_FLAG_WRITE, NULL)) < 0) + set_http_options(s, &options, hls); + ret = s->io_open(s, &pb, hls->key_file, AVIO_FLAG_WRITE, &options); + av_dict_free(&options); + if (ret < 0) return ret; avio_seek(pb, 0, SEEK_CUR); avio_write(pb, key, KEYSIZE); @@ -711,13 +715,16 @@ static int hls_encryption_start(AVFormatContext *s) int ret; AVIOContext *pb; uint8_t key[KEYSIZE]; + AVDictionary *options = NULL; - if ((ret = s->io_open(s, &pb, hls->key_info_file, AVIO_FLAG_READ, NULL)) < 0) { + set_http_options(s, &options, hls); + ret = s->io_open(s, &pb, hls->key_info_file, AVIO_FLAG_READ, &options); + av_dict_free(&options); + if (ret < 0) { av_log(hls, AV_LOG_ERROR, "error opening key info file %s\n", hls->key_info_file); return ret; } - ff_get_line(pb, hls->key_uri, sizeof(hls->key_uri)); hls->key_uri[strcspn(hls->key_uri, "\r\n")] = '\0'; @@ -739,7 +746,10 @@ static int hls_encryption_start(AVFormatContext *s) return AVERROR(EINVAL); } - if ((ret = s->io_open(s, &pb, hls->key_file, AVIO_FLAG_READ, NULL)) < 0) { + set_http_options(s, &options, hls); + ret = s->io_open(s, &pb, hls->key_file, AVIO_FLAG_READ, &options); + av_dict_free(&options); + if (ret < 0) { av_log(hls, AV_LOG_ERROR, "error opening key file %s\n", hls->key_file); return ret; }