From patchwork Thu Jan 13 05:12:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33542 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp132566iog; Wed, 12 Jan 2022 21:14:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSMsGvog6eRlX/hkom5DCC1TzxzDC3+7/nIUrC0RzzWjedSchGQGF1T7L9mOOvaXoycAIG X-Received: by 2002:a17:907:b1a:: with SMTP id h26mr2249720ejl.175.1642050855557; Wed, 12 Jan 2022 21:14:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642050855; cv=none; d=google.com; s=arc-20160816; b=NYVO0IlWCErgdZMOrls8N3qjtl4qBweLRXdzvMo/kANlu05pNeasddcxRnlcraqyD/ cSwG8FCemfbKw7SAzrbbadO3+XQXT2Oa8U9DjI1nC2GjUmLMkQy4zLR249hSXjhdDoKK sYTnKTqgoWs7z+IIkWCk5Rtx6dEV6w403eW34Q3KrfjA7jzCLkd8OBL1jyTJ4Uns5ack HbhuQWl8t6d2q/UNsBHxu5jJ6+d/YXQDg3wrs8xRLwJkMSVmVa5qTpQ5UQRBvQm0yrXf nQdy71zjn8tRfDMDJbfl4r8h6LXCY8+PlCrO1A8lWSLz+mjBO7dOzinHScxcGshcHpud /dTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=CB7pdnfm95joWHxwGDFFXu7yLfNZ8jmQPNcOgpp9Ga4=; b=MkwxIIZSjKzgJ08XhJevoqxTDoUDuDT8RvBVv3PWFVdIxwqPZfOVJ7E6ymD6/5JHch nf75HyQQ5ijGMpV8Gb58RjAzGGw+GVRTtonVgI04nLh5gpUG0IC/aqXVxOP5fDIsOAbX rKD+9t73M+Xt4idlX2TcY3zlqJ4efudnCXO69DHsxUbaXdPkrTI5EgWLPuXHSVG2JTuK r9H591AoqDQemHXK9T1BxZkq1+qZPIMr3y7fPbKKzQ5/8BbM1JsNN2nx/5nIL7qLZY3p 0Z7xx8jjrksDmDjajg3no1LHp/RzcPTOpP3FP0GwJkFmTUlrLDMnlPQqYZs1NxT9V23G 0fQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=HYGChdsx; 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 g3si1237893ejt.101.2022.01.12.21.14.15; Wed, 12 Jan 2022 21:14:15 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=HYGChdsx; 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 17F8168BB81; Thu, 13 Jan 2022 07:14:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 351F668B394 for ; Thu, 13 Jan 2022 07:14:05 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642050851; x=1673586851; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=T6aGtPlM4FJwhVKXDWlmYSBz4uY2mGRV+YXwNdQBJBI=; b=HYGChdsxrB/8KpOd6KUjJoVol1PEIfVTKyp+sSa0Glp0tIRRVHE1L2jt 1jatpBV/hIu06YokBhzdE/XHgBa6wUtAyTrwjKC0QxbsDrTWwFSAnaGZl JN8FKr+ZUDohjENZaipO/7HRjEY5ycJttZY4hSXBCaND0hauLzErlinHG crp7qlLzYnyYuB3dt13LYz2cWNsytkHfU09BfbEnYhDF983jd9lQ+q/Wq clUO+J5zwLkcMXsnQNSjLpaEP9BMfwj+gxyYWuDOWyrqTO4BCjEskwgcS nqGAr9EEvvfMi/61yYXQN8RSa6HwRXToUQI6zutrFeK2Ic2+6R7DHRUvg w==; X-IronPort-AV: E=McAfee;i="6200,9189,10225"; a="244138122" X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="244138122" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 21:13:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="623736713" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga004.jf.intel.com with ESMTP; 12 Jan 2022 21:13:40 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jan 2022 13:12:18 +0800 Message-Id: <20220113051221.66453-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V3 1/4] libavcodec/qsvenc: Add max_frame_size support to hevc_qsv X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ePFydz2Bpt8m Add max_frame_size support to hevc_qsv as well. Signed-off-by: Wenbin Chen --- doc/encoders.texi | 3 +++ libavcodec/qsvenc.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index 7cc8be1209..68921fbd40 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3388,6 +3388,9 @@ intra refresh cycle. @item @var{rdo} Enable rate distortion optimization. +@item @var{max_frame_size} +Maximum encoded frame size in bytes. + @item @var{idr_interval} Distance (in I-frames) between IDR frames. @table @samp diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 4e7a15f060..b3728d28d5 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -859,8 +859,6 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) if (q->mbbrc >= 0) q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; - if (q->max_frame_size >= 0) - q->extco2.MaxFrameSize = q->max_frame_size; #if QSV_HAVE_MAX_SLICE_SIZE if (q->max_slice_size >= 0) q->extco2.MaxSliceSize = q->max_slice_size; @@ -889,6 +887,8 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) if (avctx->codec_id == AV_CODEC_ID_H264 || avctx->codec_id == AV_CODEC_ID_HEVC) { if (q->extbrc >= 0) q->extco2.ExtBRC = q->extbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; + if (q->max_frame_size >= 0) + q->extco2.MaxFrameSize = q->max_frame_size; #if QSV_VERSION_ATLEAST(1, 9) if (avctx->qmin >= 0 && avctx->qmax >= 0 && avctx->qmin > avctx->qmax) {