From patchwork Wed Mar 27 12:51:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 12497 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 0F0914475D4 for ; Wed, 27 Mar 2019 14:52:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC07868A88C; Wed, 27 Mar 2019 14:52:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 491D468A15C for ; Wed, 27 Mar 2019 14:52:08 +0200 (EET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Mar 2019 05:52:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,276,1549958400"; d="scan'208";a="126295955" Received: from blue-kbl.sh.intel.com ([10.239.13.16]) by orsmga007.jf.intel.com with ESMTP; 27 Mar 2019 05:52:05 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2019 20:51:46 +0800 Message-Id: <20190327125147.21358-3-zhong.li@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190327125147.21358-1-zhong.li@intel.com> References: <20190327125147.21358-1-zhong.li@intel.com> Subject: [FFmpeg-devel] [PATCH 3/4] lavc/qsvenc: use the common option "trellis" of AVCodecContext 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" Signed-off-by: Zhong Li --- libavcodec/qsvenc.c | 5 ++++- libavcodec/qsvenc_h264.c | 2 +- libavcodec/qsvenc_hevc.c | 2 +- libavcodec/qsvenc_mpeg2.c | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 2e98de93f1..914b9479c0 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -693,7 +693,10 @@ FF_ENABLE_DEPRECATION_WARNINGS #endif #if QSV_HAVE_TRELLIS - q->extco2.Trellis = q->trellis; + if (avctx->trellis >= 0) + q->extco2.Trellis = (avctx->trellis == 0) ? MFX_TRELLIS_OFF : (MFX_TRELLIS_I | MFX_TRELLIS_P | MFX_TRELLIS_B); + else + q->extco2.Trellis = MFX_TRELLIS_UNKNOWN; #endif #if QSV_VERSION_ATLEAST(1, 8) diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index f458137848..4fea69fb2c 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -181,7 +181,7 @@ static const AVCodecDefault qsv_enc_defaults[] = { #if FF_API_CODER_TYPE { "coder", "-1" }, #endif - + { "trellis", "-1" }, { "flags", "+cgop" }, #if FF_API_PRIVATE_OPT { "b_strategy", "-1" }, diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 1e822efece..94a81d8c74 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -260,7 +260,7 @@ static const AVCodecDefault qsv_enc_defaults[] = { // same as the x264 default { "g", "248" }, { "bf", "8" }, - + { "trellis", "-1" }, { "flags", "+cgop" }, #if FF_API_PRIVATE_OPT { "b_strategy", "-1" }, diff --git a/libavcodec/qsvenc_mpeg2.c b/libavcodec/qsvenc_mpeg2.c index a7427d8109..e4ade56d62 100644 --- a/libavcodec/qsvenc_mpeg2.c +++ b/libavcodec/qsvenc_mpeg2.c @@ -87,7 +87,7 @@ static const AVCodecDefault qsv_enc_defaults[] = { // same as the x264 default { "g", "250" }, { "bf", "3" }, - + { "trellis", "-1" }, { "flags", "+cgop" }, #if FF_API_PRIVATE_OPT { "b_strategy", "-1" },