From patchwork Mon Jun 6 03:08:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 36078 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp5986637pzj; Sun, 5 Jun 2022 20:09:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy6iCp5qjf4VuFqCTUIOdetiTNlW54R/WqhCffdPt9fET8YI2vyQ4jGAqnZ+mQTcsFF4GGY X-Received: by 2002:a17:906:482:b0:6fe:86fa:a5c5 with SMTP id f2-20020a170906048200b006fe86faa5c5mr19365776eja.28.1654484946041; Sun, 05 Jun 2022 20:09:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654484946; cv=none; d=google.com; s=arc-20160816; b=SFcfb3lOLM9leuw0v8wZ7jwzC3Gj8g+qQEq8nsv1d7xBcu2Z8V7hBB3b2NVPBDpI9P 0IyoEQ8mOVbQmhgFH0sdNB/nTGQAzCbWVRDIWr3i4/Nenx3vXv1wJys50uBdT2wVxwBA v7LBLvwNu9RGbC6jmScYCrd9muvKYbH0j76XRdiEg90MAI13q4Tf+ruZ5cso7OkuP0a8 C8WZAojUGpx1ZzMiJb8s9/0xwh2ZX3/IEhkqwIfJGlf2ZD9M0aLLaJt0EfwD06SdfP4F hfr9D+WuVN+vhkeyw5pY/IrRB+ORlUPOIuFQ+5VrabMYs2AcgxL3L0W7RbdUuhJpzzup fXpQ== 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=fZ4C4msiScv3DcjQVptghlNu0DILdNlfZ+TM3AfKJuA=; b=HS+bbGPgOWL72OATNajQnMqtDLNzPmrclG+AmqsLzhvHx5zG1R6yyNt5pa6l1Idt6m dhSs7e2mqWVnbzwEuycoK037oFgx1GFAM2lHCuIBhrqlqbVU/EMGbT0Igzcy8FNwulHW yRlAqIVve8fzkn1MajSojAkBjAslopxh5oOP7uNb7CmZnzd/L7jL875OhXOKR+m1TLAY tO8zkA88/dNNIQqyPtVqSPJjOZUINq9xwMC+fRhoVnl1M2RMgYfg1piK9jnoDu79znlO hzERagKhU31nGRhr4zF3qqAV/KFlS1Gn0IxpsZw2LCdHZypD6ZsEWHasr6AUJgxUM1dd dp/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=nVjZnZyu; 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 ho13-20020a1709070e8d00b00711d83340bbsi122004ejc.728.2022.06.05.20.09.05; Sun, 05 Jun 2022 20:09:06 -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=nVjZnZyu; 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 C79A668B5C4; Mon, 6 Jun 2022 06:09:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1491F68A966 for ; Mon, 6 Jun 2022 06:08:52 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654484939; x=1686020939; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=YANFtN36aNnWRvacOocQoobmun5Vsp1ey2DV+tOB6Uk=; b=nVjZnZyu3AAQlhFdNxsy8JaOITN3Vrv1e1nZLdp33Z9Y9AeNDogl9W0C hdWtOH8br0yDUpNHM33CgprP+AHrDtAnMDSjHISoZ4R1tyPHB2PNpYjHa TgoEyGjJxtw2OXCxwNI37OSeK5JMHKu4a+snUMjnMG6VQpW8uZ8s09PLa 19YEwiEnAI3HG9cEjchlhslQMOE2VDhTusJYzuJfNPQH9FD5l0oEWZ8vS Be55cuA3OOI4/RzNo3z34TknsIrlJG5RYWPx0EbaAFCoLKjzsO4AHfXXJ 48b/6isGA+IXUFzIjJqfay7Fsr3ZArtO+vbrkn0ZXATO329nUknhgbVk+ Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10369"; a="264385992" X-IronPort-AV: E=Sophos;i="5.91,280,1647327600"; d="scan'208";a="264385992" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2022 20:08:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,280,1647327600"; d="scan'208";a="682049306" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by fmsmga002.fm.intel.com with ESMTP; 05 Jun 2022 20:08:48 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Jun 2022 11:08:31 +0800 Message-Id: <20220606030831.3604913-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] 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: 7e7NSmgUF7nh Use The mfxEncoderCtrl parameter to enable ROI. Get side data "AVRegionOfInterest" 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 | 86 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 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 2b3b06767d..0e88a10489 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1373,15 +1373,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); } @@ -1419,6 +1433,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; @@ -1520,6 +1535,68 @@ static void print_interlace_msg(AVCodecContext *avctx, QSVEncContext *q) } } +static int set_roi_encode_ctrl(AVCodecContext *avctx, const AVFrame *frame, + mfxEncodeCtrl *enc_ctrl) +{ + 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++; + } + return 0; +} + static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, const AVFrame *frame) { @@ -1582,6 +1659,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 && QSV_RUNTIME_VERSION_ATLEAST(q->ver, 1, 8)) { + 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; @@ -1704,6 +1789,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;