From patchwork Mon Jan 17 05:11:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 33637 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2453782iog; Sun, 16 Jan 2022 21:12:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxeSAPGaK597JUMm9PkvQtkqCmwaEfjUHBibrAqnSvCWO6YiRdj2bCSpnuL9eArYupmIgHZ X-Received: by 2002:a17:906:7c4:: with SMTP id m4mr15289549ejc.655.1642396377469; Sun, 16 Jan 2022 21:12:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642396377; cv=none; d=google.com; s=arc-20160816; b=frWP9qI7Ol2Uo97oMlm52js5Tl7zN+Py6J+bTuA2k8kw1mwJYLDenmvu1bROLR29ak 75l4sjiHGFhzSgBX/2JV4/pX73/73nvp25HseXWSjGDRSl2KDE9kUzx1YkQE1cqLVunQ kSochhrRMHJ5gIhjBWIJw+s4hLRBYXwWpejdXSgP95o0293Cvmu5YMlJNwmPwD9C1Vm7 CPas7tOFqaCBOfN3wocW1UGkVbyoMwdgZY80o0Rtp32Lzkk+mdIfM4dLanG+p1C8Le0G D80eEsKWKqOsfT2YYJ/Ro/Zmrouxs8H5PZV79is3Mtw5QieXJAoTLYuHb3APn9g69vQv B4WA== 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=odbBiR8yyDa42U4NJxvP8e1710mlaGDwAiOxcmzaVR/b892vEqJSnfqm6msuSUJ9rZ BJU8xwIHQ5xDjZ7WByuI1lrv/7lHIsye5r6b3qMY/aAmXRPeDv2Mvu3KtP5K8b2CB6Rm okr3mi+mASuREAsHCUq9xdl6ce2d4day8cvLYQM6IV770HrEI3CJ1Jhkjt1b0E0k53W8 BFOMfWSORI5BLnkfkNl1T0mAy9xj0GJOIqlDznfLptyE1nirVhhVq2dfubxC7GuEz+jS 2U2XB1mYK8eVbBSZyEhwVqTgmLUJmg8HVWYjTFAwjQLZ3tIZTJOHr4EWdz7croF8c+4P dGMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=U8SkYfsY; 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 z7si7770038edd.76.2022.01.16.21.12.56; Sun, 16 Jan 2022 21:12:57 -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=U8SkYfsY; 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 0F9CF68A62B; Mon, 17 Jan 2022 07:12:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C18868AE9C for ; Mon, 17 Jan 2022 07:12:44 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642396370; x=1673932370; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=T6aGtPlM4FJwhVKXDWlmYSBz4uY2mGRV+YXwNdQBJBI=; b=U8SkYfsYRJoAhkQWYMHaogKnDgux91kOI+xNer1oaUoJkjJlpib11x2N u3faCmRgdhZwwjuEak2lkB2LHZ0Q8NsMWc/k/DbM6slFqwpd2VxDjO0jK t8DAKp7dPe63yTeODj2X0bDGDMP8OUrlraYXN9H5ihcHXTISUJ87sFc2X 2g4JugwrQ5mcMyQR0mzkEq6kkgqRYqqBRNYlV9yjRbPqhIIQPAumOfISy ATLiVYiWmWug5GiNpftvf6/AiuvqgmmCqi1qNqUMxQpn4DAkVJEDzsD25 QEuXqbRaKk20fkcuYnD+MPOVFlqpTQutzBK0mHPJuA+ex+CB0YCyGgRsB g==; X-IronPort-AV: E=McAfee;i="6200,9189,10229"; a="242111658" X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="242111658" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jan 2022 21:12:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,294,1635231600"; d="scan'208";a="517278345" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.110]) by orsmga007.jf.intel.com with ESMTP; 16 Jan 2022 21:12:40 -0800 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jan 2022 13:11:19 +0800 Message-Id: <20220117051122.628422-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V5 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: dO5FWsjZjk8P 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) {