From patchwork Fri Jul 10 12:19:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 20941 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 A30DA44AC1B for ; Fri, 10 Jul 2020 15:20:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8ADD0688151; Fri, 10 Jul 2020 15:20:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau2.qq.com (smtpbgau2.qq.com [54.206.34.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62A96687FFA for ; Fri, 10 Jul 2020 15:20:06 +0300 (EEST) X-QQ-mid: bizesmtp28t1594383587tc613nqa Received: from localhost (unknown [103.107.216.232]) by esmtp10.qq.com (ESMTP) with id ; Fri, 10 Jul 2020 20:19:47 +0800 (CST) X-QQ-SSF: 01100000002000Y0ZXF0B00A0000000 X-QQ-FEAT: GqceBTtlgSx7DxBsQ9qTG1ThmulfPgvK+Yz9/zzmwfFZ5ccoPDKYAHyvmMcHf ThyZtInV2MIHKWXiEBfKvlrzM21AULYS/fdxxatzF1Obd7KKDAqmsPfykmgZ4w8W3dW0Cpl M3Odqzdov87ZaoRjq4R3cgiWM3CSEKSqVZXxowo4PJIZmvPS2/pqzjYTEYq9QxWsl8Cnknk V21fRqTH3dmF3YStpGvAryoc2gRZlWhleIfgwGOKBvi//wOYBbuZ7lAnkaD6xc4nRWo4XBl fnyfMvys12o+xLM20rehitMj7VtNICffwylaJg8a/rgjgIH7OIu1rbWrJYbmFyWdKi9T4qK Gs1nVMh X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jul 2020 20:19:37 +0800 Message-Id: <20200710121937.2321-2-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200710121937.2321-1-lq@chinaffmpeg.org> References: <20200710121937.2321-1-lq@chinaffmpeg.org> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign6 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/hlsenc: support single file mode encryption 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fix ticket: 8783 Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 1d816a61e6..cce6b2faa5 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1722,6 +1722,15 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) av_opt_set(oc->priv_data, "mpegts_flags", "resend_headers", 0); } if (c->flags & HLS_SINGLE_FILE) { + if (c->key_info_file || c->encrypt) { + av_dict_set(&options, "encryption_key", vs->key_string, 0); + av_dict_set(&options, "encryption_iv", vs->iv_string, 0); + vs->basename = av_asprintf("crypto:%s", oc->url); + if (!vs->basename) { + err = AVERROR(ENOMEM); + goto fail; + } + } set_http_options(s, &options, c); if ((err = hlsenc_io_open(s, &vs->out, vs->basename, &options)) < 0) { if (c->ignore_io_errors)