From patchwork Mon Apr 16 05:44:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 8462 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.85 with SMTP id c82csp432493jad; Sun, 15 Apr 2018 22:45:10 -0700 (PDT) X-Google-Smtp-Source: AIpwx48NYlQLkFFZCUGEEoSz6mP9uwR+HuWmYFl+me/W23+Q/rHisVDnBWyLqklBVRzTAvL5NN1z X-Received: by 10.28.69.86 with SMTP id s83mr8564796wma.156.1523857510210; Sun, 15 Apr 2018 22:45:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523857510; cv=none; d=google.com; s=arc-20160816; b=uECTMYp9NhC7wQMwSr0pjkqLOyW2SEZ4j2aOZ6Jhh/QLFyYlLWIQwEihM/uhVuOO8O 4E60XjwthLvW+EAUyfRfVQ79qWIystGbc9xxR13AqQGgdhqPqZ5Ex1pURAetitl1XrPJ dwM8vGbPMPtjGrI0fNx2d5nsQ6I6Tc/i6ZqN8U6Q/9C+1HyqT/im1pGk6xCloDXTn9pE TxOqew+onlPXMB6I19KaVz+jUOaZVfJohHh3BEwFB/MNQ17YhrPpcWJBflb+dqxeXlm0 G7IuJei7Lr2CYjMm28hVQyWTD+E7dFa6xegK2EaemBBynwlMk46Uzsb7i+MsvX7/4Ihu n/pQ== 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=rYlOzN+Sk3JntrJbOgDPfO2WVN9ex1ggWmgcHdLaGjk=; b=QzKsizbQEaAG1VPfuAZoQu1dV0l0fz3BZeAmjAF91lE+XpgnjyB2Vx847lexLRVXep EUQn1Sclsc1SE0mspMYOBPP3tHJhnHdUAsOZJ1QIRqhDeQZrgXvLX16UjfyT9xob4ZZN C1BnEirTVfzN9WEZyYWtaPjtRH6rbclT4B4JpvpW4HGcx5WPbISBn3yUBtch2a6cLkK+ YQh7h0Axk0D8Gyced+2n0jdJTn1g68HQuXpR7Q/YFafqS6pv9KabnFalcBT7WTIroqKS QFfsUiYJoCa7qM4dsxZmgOLrqpMIzFtTLxzU5ebhB8tDEtKh26onb4EnheWb6wBuzodI Wz+w== 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 s67si1548972wrc.56.2018.04.15.22.45.09; Sun, 15 Apr 2018 22:45:10 -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 D9DEC6898CE; Mon, 16 Apr 2018 08:44:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg342.qq.com (smtpbg342.qq.com [14.17.44.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E49C68975F for ; Mon, 16 Apr 2018 08:44:34 +0300 (EEST) X-QQ-mid: bizesmtp1t1523857457t4ym5pejs Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 16 Apr 2018 13:44:16 +0800 (CST) X-QQ-SSF: 01100000002000F0FKF0B00A0000000 X-QQ-FEAT: 5t7Y1p3pIzEgExXQJYnvZ5jiSYAK42ed2KTPWQjGqVNGlW3ACmeznXBHoHCQP CmDyIpgJvmfNgAFOR3ugT3rQX29MsRI9AmCjpXzN36g0jm+H2d+OCrFA0O9pSChovNQxonD Lzf2bmgtPjUzIw/OAOVJRxM6M6DZtEt/UKOjRuNg7AopQWJ9Cp3bIAerotNTM2Zr4HejMa2 eQWAlG5dq7Bo/hSIrzmLJq2QK+Vgo7LAUcyOr/2/lu/sjDm57z6qRICwgZNoa/1Rc0yP9PV aSCrWzPad7puirZTICr6/Z7NI= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Apr 2018 13:44:11 +0800 Message-Id: <20180416054411.2233-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: add error message for encrypt fmp4 mode 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" hlsenc have not support encrypty fmp4 yet now. Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index c7540166ab..5c9e646962 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1591,6 +1591,11 @@ static int hls_start(AVFormatContext *s, VariantStream *vs) } if (c->key_info_file || c->encrypt) { + if (c->segment_type == SEGMENT_TYPE_FMP4) { + av_log(s, AV_LOG_ERROR, "have not support encrypt fmp4 now\n"); + return AVERROR_PATCHWELCOME; + } + if (c->key_info_file && c->encrypt) { av_log(s, AV_LOG_WARNING, "Cannot use both -hls_key_info_file and -hls_enc," " will use -hls_key_info_file priority\n");