From patchwork Mon Apr 16 06:22:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 8463 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.85 with SMTP id c82csp456890jad; Sun, 15 Apr 2018 23:22:48 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/dtx5W1YycItWZLvrscP0ijUAMPLtHub8Tl8mFTs4FSZP3Aes0z07AQBZfI4EdPV8ROS2b X-Received: by 10.28.24.76 with SMTP id 73mr521881wmy.24.1523859768018; Sun, 15 Apr 2018 23:22:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523859767; cv=none; d=google.com; s=arc-20160816; b=FTowqKik19vxCbSdgDMEry1qFdAilisvjYI91XW15Tz0/BgJcSS6i4oj7BOK/0l7A2 iCu9idw7n2EukVu2LErZ27uJMlwDkcKdE2Zjc/WNSTvYnCQ21sffNfO4R6tngIjyW6u7 +cnj8YCrfKjkyh7S6aUHuQ7LnSBqgQIbK2Tqf/LsubfsOijoY7MyVt2aqlT87cN3/t61 omtiXJDx1YgbZlb5T8hvEmW/IkFUQwRpzP5e7VIwwdIkjYCmBCGJrEGPs7qqNtL6XTCJ vXncl55xMFJlrmGsDP/KUs5T+ImDUPvMeUT0WE5bZtJwl0+aFE8aa3bvdo7I8nkZA6ep AF5Q== 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=GRKXvquYTPo4QNKD2CRA0owPjq8wFxVZidQDfZp2wT4=; b=oHEeycfj/ItC7t4VXwYIBZNW8oSx7meVq/N4jq5iIUTQjsduVFHSz2F7B8TVcdlpaD /75kkX1fb+uo+AGZEFmu8OZrL2LB7YzL3hXROjAOn+DggJ5B5EMJ6N+R33esvWH5UhWq a8tipW99Hwd5Bmnd9jCOlWrow6RUuFsdgpDCvsHl3h/FIHzEaEYSHRyMMHfmtTrtBkmw 3BLsTQr5s6HygnO/w2UfLGaxgT35HeAZmt+udSe3Uq0ucUWB7GlwNS9HJtv2Veab1I6D YXLNiZlktbs0mFv4ArcaPGMjWxiNyCy2PGb9z4vRmHwl/TXQm4W4FuLB8Vk/XX1EPAQS sxyA== 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 c9si8105933wrf.337.2018.04.15.23.22.47; Sun, 15 Apr 2018 23:22:47 -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 463F7689A22; Mon, 16 Apr 2018 09:22:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg202.qq.com (smtpbg202.qq.com [184.105.206.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 630F3680118 for ; Mon, 16 Apr 2018 09:22:13 +0300 (EEST) X-QQ-mid: bizesmtp3t1523859754twy68g981 Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Mon, 16 Apr 2018 14:22:33 +0800 (CST) X-QQ-SSF: 01100000002000F0FKF0000A0000000 X-QQ-FEAT: elJf6J2hZTXs2TYSAEWKeymr6Nh2yysHJr2KgyR985i5TseMOQMsctuWcxWrr Hl0huhTWL6p6mkck1D3IzEP7jzBhNnzZDWxSBFABU9ZCsfK0kUjzyYRy/0058zmxudQBaVt kzm9W24Zr1EfhZWJ3WmGiXFsQMoBfYMrmDMrz9NfG10TDCrWxXJitgCRgDG6823RQXoey4n TuVEMGtFBfQxxYSlec6rpNj1XCry20khJPfQ0RugGT+0ZGn9Ypa+L5YI4DpWud1O7mk662J QdbkEmRnF4Ty5DF6d2tceezQIk2OsUJQmuTg== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Apr 2018 14:22:30 +0800 Message-Id: <20180416062230.2892-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:qybgforeign1 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2] 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" and refine the warning message when use both hls_key_info_file and hls_enc Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index c7540166ab..c27a66ea79 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1591,9 +1591,14 @@ 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, "Encrypted fmp4 not yet supported\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"); + " ignoring -hls_enc\n"); } if (!c->encrypt_started || (c->flags & HLS_PERIODIC_REKEY)) {