From patchwork Thu Jun 7 08:53:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 9277 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1848716jad; Thu, 7 Jun 2018 01:53:32 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIUhkWMsvdGRyBqJctAm7qd/Gu6vUjRup91wmGCRP6HjZcl/Xx2gnSfZMRisYX2Jqr5njBZ X-Received: by 2002:adf:92c2:: with SMTP id 60-v6mr895325wrn.70.1528361612472; Thu, 07 Jun 2018 01:53:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528361612; cv=none; d=google.com; s=arc-20160816; b=BqW6BSvS/u41/2oeaTm7rMlfKq8hqRl7HyYeEjOO26oTTWkdEQebOJLIJKlahV75Kw AmPDCU+BDr+fZuu6miny0Z2CjJ7fXa6i+y1qTe+zpGDc3jnpIx5DkgBhapauzxz2joVi cq8k4GtJJzHhQO9ypha3rIkszHEe9LTGzyTE2mCtIeQbe0witY8umoqIATdrU/PBlwmj +0GU6VDcAUY1tCU3wiGeK/hUVwL8RFpSPAddMzZYuNSD/NL/J4SkyJNd2l19cQVzPaW3 Q4oCSmhm2qulojSrCRRcQEpq++aspMO2CRCBVCvYu/A50E7uAFh+1Vb5iPv7ZTL0qYUw EP4g== 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=SGO0Bi2XP+St+jc3IYejUhtuoETseHAi7+YORY2H+/8=; b=OWc2i0UmhtdQomBGmWaSdNz7Trs67esOHPgukd0AjsQ0YsVuX71Ortiq0bTp37cnuP DQDupMTh7dXJnc4bjMY3H/Gu5T8ex3T2D70QGoC8QPWjrgl2MOSd6U9CXPsE5IzXB/OJ u8lWNNoC6gZ2t8uYhQ0hZjeEEsQPM8elFOyXMXbhIPqrnR3f/JSOtal/0I2CSrIpnHjU WblD+t/QKCazLAOr0uK23bMC9izi659TRWbkC0+UDzjI/Y9MzuWBHXg2ONBym0BT1xRO GgiuytYk6N3NsrPPxZa7lRAyYtlN0BzfXYMktVxg4EfnWsX2lpElf/qHZLX6CqHFMYZ3 a2fQ== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y195-v6si827497wme.33.2018.06.07.01.53.32; Thu, 07 Jun 2018 01:53:32 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D8CB468A70A; Thu, 7 Jun 2018 11:52:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28A7468A699 for ; Thu, 7 Jun 2018 11:52:35 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jun 2018 01:53:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,486,1520924400"; d="scan'208";a="57272417" Received: from media_ffmpeg_skl_e3.sh.intel.com ([10.239.156.42]) by orsmga003.jf.intel.com with ESMTP; 07 Jun 2018 01:53:20 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Jun 2018 16:53:48 +0800 Message-Id: <1528361628-26109-1-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] qsvenc: remove vcm option on Linux 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" 1. vcm mode is only available for H264. 2. vcm is not supported on Linux, but it is shown when run "./ffmpeg -h encoder=h264_qsv |grep vcm". This shouldn't happen. Signed-off-by: Zhong Li --- libavcodec/qsvenc.h | 1 - libavcodec/qsvenc_h264.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index d482722..b32b7f6 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -78,7 +78,6 @@ { "slow", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_3 }, INT_MIN, INT_MAX, VE, "preset" }, \ { "slower", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_2 }, INT_MIN, INT_MAX, VE, "preset" }, \ { "veryslow", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_BEST_QUALITY }, INT_MIN, INT_MAX, VE, "preset" }, \ -{ "vcm", "Use the video conferencing mode ratecontrol", OFFSET(qsv.vcm), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, \ { "rdo", "Enable rate distortion optimization", OFFSET(qsv.rdo), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ { "max_frame_size", "Maximum encoded frame size in bytes", OFFSET(qsv.max_frame_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, UINT16_MAX, VE }, \ { "max_slice_size", "Maximum encoded slice size in bytes", OFFSET(qsv.max_slice_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, UINT16_MAX, VE }, \ diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 7aa65e9..d5e8df7 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -103,6 +103,9 @@ static const AVOption options[] = { QSV_COMMON_OPTS { "cavlc", "Enable CAVLC", OFFSET(qsv.cavlc), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, +#if QSV_HAVE_VCM + { "vcm", "Use the video conferencing mode ratecontrol", OFFSET(qsv.vcm), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, +#endif { "idr_interval", "Distance (in I-frames) between IDR frames", OFFSET(qsv.idr_interval), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "pic_timing_sei", "Insert picture timing SEI with pic_struct_syntax element", OFFSET(qsv.pic_timing_sei), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE }, { "single_sei_nal_unit", "Put all the SEI messages into one NALU", OFFSET(qsv.single_sei_nal_unit), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE },