From patchwork Fri May 4 22:11:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 8772 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp256396jad; Thu, 3 May 2018 23:12:39 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoWDytev3H3JD3g4+6+dmgDnhkKnoVfMaXkHI0h3MMy5M03mhlGmuYXxQ+C5rdQha5eVUNh X-Received: by 2002:adf:db0b:: with SMTP id s11-v6mr19313624wri.241.1525414359600; Thu, 03 May 2018 23:12:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525414359; cv=none; d=google.com; s=arc-20160816; b=vw4lzil/O/OEpOIiCw3bavar8cLg8/bpe5kZUjbYlVTvL+qMCO7rjct0biVdi10mwV b+VpZPECEG8cTyUOsoQIFy340V6wXB59iuyhGdXe/FbUthuHKkHrJy/tU2PlhB0bp6Ol ymEq1hitGQVrWTA2ZPZTVfsJXnQ6i9UrNxXPxtwgRAPa0FPwYoyeTnvI1SkvLQEjYfXQ GKSELA/TO4vEzXEqNER2nGoNCiovKHmLFHVehg8gOIw1aRJtEWFdXJ9qdhnQ4aFzmHEY L3QwVGxvwpQuaNO+Faqzp9pDBTlUD3tPq5W7bh5/s9vJ+FjUs9Sev86NBnguOCuv7izB 7V2A== 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:message-id:date:to:from:delivered-to :arc-authentication-results; bh=Z1z5zPqwcHCw5spUR6VBTypi4qcW00F/1uowdamzViA=; b=0esPcWNMRL5pWiokQvCxwyIR3Esxy/WwF30CmHQpTtCa9hRJv3oo1C8280F44vZjWU 4TAfA/F8QkqIxpSi36m8CHYwk2eJDLXRimO+TakkgjwuE+QDY88/S3E/E77WnWmx3rXy Gc0pyuaQjZSL/2/me1FzXSOUtGdiTwxWKjf0gyodCCTkSqFR7fX75+lVtX5/GasKxHdA +UCf5FOdPtW4M/Ox1lo4ayy5n9aKQQcN7ZIWXCz5VL3r+hUEBd/ieHM0e6YtEYWkFUR8 y+m2FKTvXUx40u3bopTh5aiQaS7n1XcvesvLNjHR0Xd3gVNODibF8SHZehDTPsVVR1c8 OH+Q== 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 t20-v6si816940wmd.203.2018.05.03.23.12.38; Thu, 03 May 2018 23:12:39 -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 45FDD68A4CF; Fri, 4 May 2018 09:12:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75E7668A3B0 for ; Fri, 4 May 2018 09:11:56 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 May 2018 23:12:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,361,1520924400"; d="scan'208";a="196643837" Received: from media_ffmpeg_skl_e3.sh.intel.com ([10.239.156.42]) by orsmga004.jf.intel.com with ESMTP; 03 May 2018 23:12:26 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 May 2018 06:11:39 +0800 Message-Id: <1525471900-3645-1-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/qsvenc: add detail options for MFE 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: Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Not convenient if using numerals to set MFE mode. It is ambiguous and misleading (e.g: user may misunderstand setting mfmode to 1 is to enable MFE but actually it is to disable MFE, and set it to be 5 or above is meaningless). Signed-off-by: Zhong Li --- libavcodec/qsvenc_h264.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 718bf9c..5278a04 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -146,7 +146,11 @@ static const AVOption options[] = { { "aud", "Insert the Access Unit Delimiter NAL", OFFSET(qsv.aud), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE}, #if QSV_HAVE_MF - { "mfmode", "Multi-Frame Mode", OFFSET(qsv.mfmode), AV_OPT_TYPE_INT, { .i64 = MFX_MF_AUTO }, 0, INT_MAX, VE }, + { "mfmode", "Multi-Frame Mode", OFFSET(qsv.mfmode), AV_OPT_TYPE_INT, { .i64 = MFX_MF_AUTO }, MFX_MF_DEFAULT, MFX_MF_MANUAL, VE, "mfmode"}, + { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_DEFAULT }, INT_MIN, INT_MAX, VE, "mfmode" }, + { "off" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_DISABLED }, INT_MIN, INT_MAX, VE, "mfmode" }, + { "auto" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_AUTO }, INT_MIN, INT_MAX, VE, "mfmode" }, + { "manual" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_MANUAL }, INT_MIN, INT_MAX, VE, "mfmode" }, #endif { NULL },