From patchwork Fri May 6 05:49:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 35610 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1489064pzb; Thu, 5 May 2022 22:50:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaLsyLo51rC+gAjaQMPp6e2LA8ba4xjuOB0inZvIYMKtIahEw8fyZVAG3uAV2kTXk6U0Ga X-Received: by 2002:a05:6402:3208:b0:427:d928:e3d2 with SMTP id g8-20020a056402320800b00427d928e3d2mr1825831eda.240.1651816231716; Thu, 05 May 2022 22:50:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651816231; cv=none; d=google.com; s=arc-20160816; b=hRaplSH5qGUPdp49kUbzfPLEOesKS+Kf77hlKuZCrSak1zYCC0WAC5Uo/XPDeQeGLE 1VXdQldpqLCzr4gOD41Ld35ODZZRa8im+So4PR/tlbWaSFprbs6gqRilk6myhe3v7T+I 8oRcCzbf6VXUe4dhS2Wpg7GNHn6QENOm4la52CQkyGcezV7dAwDkit1Dj5Yc7ud2ynVb pYgLMMU7FJS0Y8EMHUNZvYuvgtO6gixO00v4QWnkqir7TxqxWkdgZJld/TlP01ZXINxi IE7txi94G5L99zDvlKAyW2oXOn5lJarWLQtG6e4Y4wRWT1uItWIDYO/cctwH/Zlpzp+b 12zw== 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=cvAnr9WRj10vc9LNZJ5km8pjEPgGTqEH7be7Ulh5W9E=; b=zp4n7YD1OerLvVqGIe5nY+ElZZWsWqGQ/U6K8zpTiNYFGw09hQmbrfb8o61SDH0RrU cKMfEmUvjSeLpcIBM+ZNEytORXor4w+r1w41leoJpgg235BhcN57fPU2zCfC9WhAFHZg sNgKTMJ/XZR214FQ/uNS576Bnmg88iHT6TAuDM/QQTVx3K4up+5N6lqyZnd9EnvRg2zP Ot3nS/En4KMErdxTSo1ViklaG0cUeeq1+z9ri+yPpYfGAsvG6ReDHZ8/3a1voyhmqMqh MwToWLo6/guRJNeIjLBX1Rq07WLIEam5sglV5sMxkqYuPqI/IUtN3GSt9gIwWbqRvEof fvjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Xyesd2UU; 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 s10-20020a170906060a00b006e8da072889si4000510ejb.687.2022.05.05.22.50.31; Thu, 05 May 2022 22:50:31 -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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Xyesd2UU; 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 A6B0768B233; Fri, 6 May 2022 08:50:27 +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 89EA468B192 for ; Fri, 6 May 2022 08:50:20 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651816225; x=1683352225; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=dNqxbhwAvdWI+0RcTXvUujEEzYnf/vlpydDSoJdWh3U=; b=Xyesd2UUF97pzsuNJ1cTU1lVy4J9E2YzoBaj4Ugm5JBQ8G0CNEZaEJ+X nJEQOcw1J5mQBjiPixAUox1DZZjkMuHylBGf5qKZkTTEcYYcR6qi3BVC8 VFXX9tkgxuJyuLwRk9s3jR5u7fz6w03H4swu8xMwjveKxdOeWDt95Wp7u ilNHfsyTALTJsPprIymIS90HBfsigYfMX2xn3qjQaxE86/iJ6W+kbKc7a ZvmO9F6IGgDieTgn78KWFenBvNaPHUi0hJybxgfPlYQUjzAlFikljEcUW PNb/ls5zLPPPb1YfIYSf8PsAFFVlUxM1fKt5vGuxUzYMrKV2B/q46Pl13 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10338"; a="248267088" X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="248267088" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2022 22:50:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,203,1647327600"; d="scan'208";a="568950607" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by fmsmga007.fm.intel.com with ESMTP; 05 May 2022 22:50:16 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 May 2022 13:49:57 +0800 Message-Id: <20220506054957.2291057-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/qsvenc: add ROI support to qsv encoder 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: wRdyJfVNF3ga Use the mfxEncoderCtrl parameter to enable ROI. Get side data "AVRegionOfInterest" from filter "addroi" and use it to configure "mfxExtEncoderROI" which is the MediaSDK's ROI configuration. Signed-off-by: Wenbin Chen --- libavcodec/qsv_internal.h | 4 ++ libavcodec/qsvenc.c | 88 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index e2aecdcbd6..8131acdae9 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -51,6 +51,9 @@ #define ASYNC_DEPTH_DEFAULT 4 // internal parallelism #define QSV_MAX_ENC_PAYLOAD 2 // # of mfxEncodeCtrl payloads supported +#define QSV_MAX_ENC_EXTPARAM 2 + +#define QSV_MAX_ROI_NUM 256 #define QSV_MAX_FRAME_EXT_PARAMS 4 @@ -83,6 +86,7 @@ typedef struct QSVFrame { int num_ext_params; mfxPayload *payloads[QSV_MAX_ENC_PAYLOAD]; ///< used for enc_ctrl.Payload + mfxExtBuffer *extparam[QSV_MAX_ENC_EXTPARAM]; ///< used for enc_ctrl.ExtParam int queued; int used; diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index fbb22ca436..9abead604b 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1501,15 +1501,29 @@ static void free_encoder_ctrl_payloads(mfxEncodeCtrl* enc_ctrl) } } +static void free_encoder_ctrl_extparam(mfxEncodeCtrl* enc_ctrl) +{ + if (enc_ctrl) { + int i; + for (i = 0; i < enc_ctrl->NumExtParam && i < QSV_MAX_ENC_EXTPARAM; i++) { + if (enc_ctrl->ExtParam[i]) + av_freep(&(enc_ctrl->ExtParam[i])); + } + enc_ctrl->NumExtParam = 0; + } +} + static void clear_unused_frames(QSVEncContext *q) { QSVFrame *cur = q->work_frames; while (cur) { if (cur->used && !cur->surface.Data.Locked) { free_encoder_ctrl_payloads(&cur->enc_ctrl); + free_encoder_ctrl_extparam(&cur->enc_ctrl); //do not reuse enc_ctrl from previous frame memset(&cur->enc_ctrl, 0, sizeof(cur->enc_ctrl)); cur->enc_ctrl.Payload = cur->payloads; + cur->enc_ctrl.ExtParam = cur->extparam; if (cur->frame->format == AV_PIX_FMT_QSV) { av_frame_unref(cur->frame); } @@ -1547,6 +1561,7 @@ static int get_free_frame(QSVEncContext *q, QSVFrame **f) return AVERROR(ENOMEM); } frame->enc_ctrl.Payload = frame->payloads; + frame->enc_ctrl.ExtParam = frame->extparam; *last = frame; *f = frame; @@ -1648,6 +1663,70 @@ static void print_interlace_msg(AVCodecContext *avctx, QSVEncContext *q) } } +static int set_roi_encode_ctrl(AVCodecContext *avctx, const AVFrame *frame, + mfxEncodeCtrl *enc_ctrl) +{ +#if QSV_VERSION_ATLEAST(1, 22) + AVFrameSideData *sd = NULL; + int mb_size; + + if (avctx->codec_id == AV_CODEC_ID_H264) { + mb_size = 16; + } else if (avctx->codec_id == AV_CODEC_ID_H265) { + mb_size = 32; + } else { + return 0; + } + + if (frame) + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_REGIONS_OF_INTEREST); + + if (sd) { + mfxExtEncoderROI *enc_roi = NULL; + AVRegionOfInterest *roi; + uint32_t roi_size; + int nb_roi, i; + + roi = (AVRegionOfInterest *)sd->data; + roi_size = roi->self_size; + if (!roi_size || sd->size % roi_size) { + av_log(avctx, AV_LOG_ERROR, "Invalid ROI Data.\n"); + return AVERROR(EINVAL); + } + nb_roi = sd->size / roi_size; + if (nb_roi > QSV_MAX_ROI_NUM) { + av_log(avctx, AV_LOG_WARNING, "More ROIs set than " + "supported by driver (%d > %d).\n", + nb_roi, QSV_MAX_ROI_NUM); + nb_roi = QSV_MAX_ROI_NUM; + } + + enc_roi = av_mallocz(sizeof(*enc_roi)); + if (!enc_roi) + return AVERROR(ENOMEM); + enc_roi->Header.BufferId = MFX_EXTBUFF_ENCODER_ROI; + enc_roi->Header.BufferSz = sizeof(*enc_roi); + enc_roi->NumROI = nb_roi; + enc_roi->ROIMode = MFX_ROI_MODE_QP_DELTA; + for (i = 0; i < nb_roi; i++) { + roi = (AVRegionOfInterest *)(sd->data + roi_size * i); + enc_roi->ROI[i].Top = FFALIGN(roi->top, mb_size); + enc_roi->ROI[i].Bottom = FFALIGN(roi->bottom, mb_size); + enc_roi->ROI[i].Left = FFALIGN(roi->left, mb_size); + enc_roi->ROI[i].Right = FFALIGN(roi->right, mb_size); + enc_roi->ROI[i].DeltaQP = + roi->qoffset.num * 51 / roi->qoffset.den; + av_log(avctx, AV_LOG_DEBUG, "ROI: (%d,%d)-(%d,%d) -> %+d.\n", + roi->top, roi->left, roi->bottom, roi->right, + enc_roi->ROI[i].DeltaQP); + } + enc_ctrl->ExtParam[enc_ctrl->NumExtParam] = (mfxExtBuffer *)enc_roi; + enc_ctrl->NumExtParam++; + } +#endif + return 0; +} + static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, const AVFrame *frame) { @@ -1714,6 +1793,14 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, q->set_encode_ctrl_cb(avctx, frame, &qsv_frame->enc_ctrl); } + if ((avctx->codec_id == AV_CODEC_ID_H264 || + avctx->codec_id == AV_CODEC_ID_H265) && + enc_ctrl) { + ret = set_roi_encode_ctrl(avctx, frame, enc_ctrl); + if (ret < 0) + goto free; + } + pkt.sync = av_mallocz(sizeof(*pkt.sync)); if (!pkt.sync) goto nomem; @@ -1842,6 +1929,7 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q) while (cur) { q->work_frames = cur->next; av_frame_free(&cur->frame); + free_encoder_ctrl_extparam(&cur->enc_ctrl); free_encoder_ctrl_payloads(&cur->enc_ctrl); av_freep(&cur); cur = q->work_frames;