From patchwork Fri Jul 21 03:49:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 4406 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp397411vsb; Thu, 20 Jul 2017 20:50:53 -0700 (PDT) X-Received: by 10.223.155.145 with SMTP id d17mr1742485wrc.193.1500609053401; Thu, 20 Jul 2017 20:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500609053; cv=none; d=google.com; s=arc-20160816; b=grXctu7rOLifuRysSewXCCuWpScdVCbua6G/XaQXDKMnpJQYORvuFsfeKyFF3SJULn 3nPcVpj1+Qa/cVOY0usmSahTvrrfhrzCJU+BRXbvD5FVnpr5SQYkIAvhOFPY0TI2A6PF 8duO6lqq66JHHGXlqx3/liu1x6BNadVEHlAfQKIH1eN+dJXpl7YII//7DuvNNF2C7nO6 hXo0kHwgRix1Z9n3EwaOreLJfiTcdjDeiP4I1QzpdCchmjsMnw2ffV2Ctc6Dy6HfIqGd iMhGOWCR6u6QkQnMnnOXZeAn6ZCP6Q17qnKILxwRMLewJTzWxOrrtwueEc76z3OUw6P3 xpkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :delivered-to:arc-authentication-results; bh=FoiNhSG5I7GBPW4mJmKK7wGVlGRAYr0XMvrZrgYUgH8=; b=plx/Vs4PsIUOFw+HRdQ4gYz9obeBnP8Ou7Y5SNaktmmJWD7797ZUp8GIljYWJoXSkz Fba0D06Qrl6SvpGCA5lGVqQfnPpqM1DJwR67wZef78QwrIQPEqu3bPBXVfqsGLNcWhGh XXSaXFWMlxtDc5oeDZZJj6a4B5U3+4+Vow5TB8nhUHkz0fSrOh7vcXfCeLU3S8SyKPNQ PGGQjgfGLmZ2RKILpGUjCgnUwvMFW06gqGDkHI4/MEjGD+Yln8io/7fyrsAOEQ6E6bqD +bEpHlYOT5sPofaoqmGx8w2dddvCtRYVT8Ms8HhGhxdyuny6qwCyKqoxurel/H39JWDm Kcbg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c17si6961808wre.387.2017.07.20.20.50.52; Thu, 20 Jul 2017 20:50:53 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4C1F689BDE; Fri, 21 Jul 2017 06:50:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg278.qq.com (smtpbg278.qq.com [113.108.11.203]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CA8B689A7C for ; Fri, 21 Jul 2017 06:50:34 +0300 (EEST) X-QQ-mid: bizesmtp15t1500609005t2b684ys Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Fri, 21 Jul 2017 11:50:04 +0800 (CST) X-QQ-SSF: 01100000004000F0FG41B00A0000000 X-QQ-FEAT: wbEa/wNpOMwMIECekMUXmSOTDq0umHI4P5scYQ9N/1qNtWAq8xpPeXre8JiIf uX0Ha8FlhFk2vEi6upLS+DVQpa/Jd2jDpbmrwwTRw4SEEgRs5RpkdjeKhnlO7pjqyb6Agfd um/eTcwL/2Jkoq64qQw+2bZsruzFs1ji+NrsOibbIJ0GxXHNX3C48PBe/VctCuCPLv2cT1l rwvCStCbNXJ3Ki2807wq8acSDpvdevptnCCFIXGfHQnqXYmIDcDUFdJT6dYYhmc0II1KM/m 8BhukaJe1K32B+ X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 Jul 2017 11:49:59 +0800 Message-Id: <20170721034959.21403-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: improve hls encrypt get key file operation 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" get key file only once time is ok, no need more times. Ticket-id: #6545 Found-by: JohnPi Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 8a233270b5..6f721eb010 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1222,12 +1222,15 @@ static int hls_start(AVFormatContext *s) av_log(s, AV_LOG_WARNING, "Cannot use both -hls_key_info_file and -hls_enc," " will use -hls_key_info_file priority\n"); } - if (c->key_info_file) { - if ((err = hls_encryption_start(s)) < 0) - goto fail; - } else { - if ((err = do_encrypt(s)) < 0) - goto fail; + + if (c->number <= 1) { + if (c->key_info_file) { + if ((err = hls_encryption_start(s)) < 0) + goto fail; + } else { + if ((err = do_encrypt(s)) < 0) + goto fail; + } } if ((err = av_dict_set(&options, "encryption_key", c->key_string, 0)) < 0)