From patchwork Tue Oct 18 04:59:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 38766 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1932584pzb; Mon, 17 Oct 2022 22:02:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Ga+Q1N1ODkRJCN/xbRp2ZZ2oepUhaT6rR5gIr4wCV9oP2jzeiwr5CaUmSvHG3MaYuiWe4 X-Received: by 2002:a05:6402:26d5:b0:45d:8d93:d5be with SMTP id x21-20020a05640226d500b0045d8d93d5bemr949414edd.13.1666069352823; Mon, 17 Oct 2022 22:02:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666069352; cv=none; d=google.com; s=arc-20160816; b=hIc+fCv0EDk6S4zniGbk41b54uZKPwwywUmxPVXE+zPci50M+YucEVHQ7UZlqUKch/ mZtF3jSuupgvaADGT9t0LZd3TD9saWTib3gwRRmpOGJFUtjiuU7DO/496v/B+VtV7ywm JsqDcZ5Ws0c+z2LinsPL6nvxWZj8mnSsI6D7jn+H1/VAHabJBioZ127o0kFTnOJ7DrwA 7IKmh3/bAHgpOlf0rdnHKQnh/Z8PaSqnasvUPNkS23X+sTBlAVc3qbOoNAbBWf/iysCr ClyvdczzcR/OhhyxPW5NsEK7U4EEce+/dqM877N3bPygw45LMJRH0UZwGO59GOLgQ/tv RaMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=UEpXWkI8qR37fDEcUYAMfa88yap0YHi+53SmKAOsnzA=; b=MQiqa5iu+5OBUMjLl5AmPP35AvxgmuDRjqauVsYkiedHHjNPIKyOqk2tj1P7XoLdVK JVBZ8e178Vmt5NAl+v/pPFyvJRW5hqM/cpHiVC7uB+SdQzfhr8yTidUzQjtPCs0ZjL/9 Wi+Ti+LBEGzIvU2dGK8CUzLBqXfVskiT6NRZN4Dd4Ysmlm+0eUmnS+jrRN4vHEp0/oVx DMLLGOcbBltnobOVQNMAu/HrjILcbXK8zxJz7QAyTvz0YZm6eGxCgKWyUUhAJ6+Dc3VR UuSHjlDHsOONuJs8+x4oXXENF6a9JZsAMkvUv/I/+RibkkXyF6Z+YD8ebbVw2BSYJhhJ B7Zg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=NHgVew9q; 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 e5-20020a056402104500b00458bef9c70esi9919404edu.612.2022.10.17.22.02.32; Mon, 17 Oct 2022 22:02:32 -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=NHgVew9q; 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 6207B68B15F; Tue, 18 Oct 2022 08:02:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E160668B15F for ; Tue, 18 Oct 2022 08:02:21 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666069347; x=1697605347; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=G3U+clLkNDvKounySusYJsr8p+FaVgAMBNDclXfjIKQ=; b=NHgVew9qMohge1o6lyJpfpYYQK7w0zm7oMtTB3J1zvO73MNIz7QxfzxK RcSlYx9SenMt2612njW0cNTa/5li51zQz54vCylDsMPg7wruF/14Lsc+k IMbCOFlkKkLBPc2/hUnY6vyUtiasC6U82VpESFihl4EuT/B5B8r38Al9t 6alg+q1GcKoooChn2Ar+Z+WhCMCR7ClVGdrI2Pjz/vXOxMmJjhgNIypiR pEPrP6acYBj3gJb/GxEFDiRXc2s+VeS17g1cqCDrl7R/6R0+vkDs+IWPL U1Hx73702U/Ng5ZvEDkkeTN89Eowcdm8+aYf6BcEnKKmo666UTLTJN4VZ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="286388460" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="286388460" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 22:02:18 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="803598091" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="803598091" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 22:02:16 -0700 From: haihao.xiang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 12:59:23 +0800 Message-Id: <20221018045925.258081-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavc/qsvenc: fix check to avoid segfault 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wW8/yJOKSXCv From: Haihao Xiang Signed-off-by: Haihao Xiang --- libavcodec/qsvenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 15e6936a65..19fe6e59a2 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -2093,8 +2093,8 @@ static int encode_frame(AVCodecContext *avctx, QSVEncContext *q, pkt.bs->ExtParam = enc_buf; } - if (q->set_encode_ctrl_cb) { - q->set_encode_ctrl_cb(avctx, frame, &qsv_frame->enc_ctrl); + if (q->set_encode_ctrl_cb && enc_ctrl) { + q->set_encode_ctrl_cb(avctx, frame, enc_ctrl); } if ((avctx->codec_id == AV_CODEC_ID_H264 || From patchwork Tue Oct 18 04:59:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 38767 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1932630pzb; Mon, 17 Oct 2022 22:02:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ix/Tivt5ZA2tzNBZlv+NOYCNwlzlu7lG9sjL34ITGNR4OqMY6PZNNX8EkQ+C+rrqea9nt X-Received: by 2002:a05:6402:2b85:b0:457:6216:d251 with SMTP id fj5-20020a0564022b8500b004576216d251mr1009508edb.56.1666069363464; Mon, 17 Oct 2022 22:02:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666069363; cv=none; d=google.com; s=arc-20160816; b=oGLiPur4ItbKSdyNjCIJkr+x2UBq4i97vq67yyw9/MJadUm7PNoPYEpeoDs96/ovDZ PEy0qnh68MGwR+Jz61DKOjZPDbo7ihfr77Np7ofZ1UskfZkIBToEv5YTMrBgGH11lDdE uzmygAaZpN7JPDZRY2AZftZ1Cwi610Mxp4opHnIS7328VsbyC3xECb4ukYtI6Sd58S83 gF/wOkS3+eoUBd//LTYxX+qibIDsti/Za2Wqf1umOGfDhcGLSL+PIuWKdOpx0nxAnnew flECtDnlhumok7TZTJzU+19a7rCQTvVfQezHyvMCwshaq7hjB3fNe1+MnbqrgJ0jx0QE KSMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=OG4Q/ovEph+c00NyvFPNyAM65Ql2UoBGeQspEl8FWm4=; b=Z6pSmH8mZim4lw2bxn3fOQhsMB0SSH7FYoitBqxWk/tTMn0gY22X0xwcynpkEj7n0f mt3a+fsDsVr8R+rAA8iTOg7oo1gAraZv5HY4dmPo4wLVxLO603jHNMQcBPFisimEbnni fIrLqgsDGeTqXmCYElgfs3Prrvu/VayMMM6f1wBnvI1y+/76oWKImgslwx1vuMywnx5z 8KNiHtEvZQAFxaDmIcSUqOPtQVnhHm3jhoSUmCdVyo9sm6Z9fGyPtIUZcuGyQQiU62lU jEQpmQNDPzUjAQAKWJcqBuF1sTu3y9RdoAjwFnb+14A4GH5ZFa1QxFyFLYzIji/l99sE XEng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="b29tpDI/"; 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 g5-20020a056402090500b00457e6752422si9696933edz.189.2022.10.17.22.02.42; Mon, 17 Oct 2022 22:02:43 -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="b29tpDI/"; 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 A27F668BBBF; Tue, 18 Oct 2022 08:02:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6B7168B32D for ; Tue, 18 Oct 2022 08:02:27 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666069353; x=1697605353; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ckahf7s/1+0gLAPv5RA81luK4xXK9Qr0KOXVNNEJKz0=; b=b29tpDI/OunjA1NGzK4SEnwCwoYgaunW73w6wdpZRQz7Y4QX528JSbHv pocazGxtzeRk7C3uU7Z7Vag0VrobU+jr5tg4pIMJfP4MaCLWpVzagS2a3 Qzb/zf0e53Co6CWOXpfHAaIBkYb2Z0P6OprdxaIxiDGv0ap7SoqrWcDRy x/P5P+PT0T+/gDq5+ZKH+2jK0L3RG4hjQDBymWey7GyhxY3aiT8UKYlPc w+JLxmNsFNZP10oOJGweuHcP4584GLMPQ98ftCUYxMVMy9AI1ohIZ3dJ0 FTY3J9sBty3WfRsUIANSJVHpahyEdycCXNLL8YtvNvKwmo7/rxhbGnXkc Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="286388465" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="286388465" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 22:02:19 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="803598095" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="803598095" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 22:02:18 -0700 From: haihao.xiang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 12:59:24 +0800 Message-Id: <20221018045925.258081-2-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221018045925.258081-1-haihao.xiang@intel.com> References: <20221018045925.258081-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavc/qsvenc: enlarge the maximum number of ExtParam buffers on mfxEncodeCtrl 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9Id8IlyHpyOk From: Haihao Xiang The next commit and other commits in future will use more ExtParam buffers. And combine 2 free functions into single one Signed-off-by: Haihao Xiang --- libavcodec/qsv_internal.h | 2 +- libavcodec/qsvenc.c | 27 ++++++++------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index 768f707ffa..5119ef4dff 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -51,7 +51,7 @@ #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_ENC_EXTPARAM 8 // # of mfxEncodeCtrl extparam supported #define QSV_MAX_ROI_NUM 256 diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 19fe6e59a2..690a076016 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1434,25 +1434,16 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q) return 0; } -static void free_encoder_ctrl_payloads(mfxEncodeCtrl* enc_ctrl) +static void free_encoder_ctrl(mfxEncodeCtrl* enc_ctrl) { if (enc_ctrl) { - int i; - for (i = 0; i < enc_ctrl->NumPayload && i < QSV_MAX_ENC_PAYLOAD; i++) { + for (int i = 0; i < enc_ctrl->NumPayload && i < QSV_MAX_ENC_PAYLOAD; i++) av_freep(&enc_ctrl->Payload[i]); - } - enc_ctrl->NumPayload = 0; - } -} -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])); - } + for (int i = 0; i < enc_ctrl->NumExtParam && i < QSV_MAX_ENC_EXTPARAM; i++) + av_freep(&enc_ctrl->ExtParam[i]); + + enc_ctrl->NumPayload = 0; enc_ctrl->NumExtParam = 0; } } @@ -1462,8 +1453,7 @@ 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); + free_encoder_ctrl(&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; @@ -2231,8 +2221,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); + free_encoder_ctrl(&cur->enc_ctrl); av_freep(&cur); cur = q->work_frames; } From patchwork Tue Oct 18 04:59:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 38768 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1932671pzb; Mon, 17 Oct 2022 22:02:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6eXRD22Fxj02s+66SrHBHHpYHyg8AYsLWpKMy7RvSBmUXPnZ7Gu2T0UFTCOmcpbdkJZHNR X-Received: by 2002:a17:907:7d8f:b0:78e:2cba:560f with SMTP id oz15-20020a1709077d8f00b0078e2cba560fmr893810ejc.173.1666069372033; Mon, 17 Oct 2022 22:02:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666069372; cv=none; d=google.com; s=arc-20160816; b=UodJk/YqpIVMpF7iWbPDqvjwkwEczC7VMY915FA5qXAL5OQlDUu0qGvYvQ8YI2Wei2 1qoGknhbik/IRT0bjnpj04zDSt3VBoptpKh/yR0do7SmLzuxThMWC4Ta3wEHe7caBXlw EpE+odupnVRUuMRFMHV3/zVyes0ODHDCIi5A2tIbF9aoDBSU0Pcg/fNdzCVua/2oN+vM bz7h0vqIAA0bu1yDaj09pBzOQ8TZj/IkycfIMyqVISUHayYYfzUOFxYWZBcpzRTk4HgM HjwdpD0uS15WBMvYT2yKXjWngzo7TUiviirdNGBRpL8TLtyUpa0eo0nuodD6mytERkqm ZLeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=jZWctGxjYojyBI4lPVGiD0u1fZ6koWMVn8IbVVUlbHE=; b=Fjy1Kj8AcovcXoBazSgZNbFsCSMsu0j5xsYYxS8fAtzJLWenoFRBcZvKqRp3MS40sL 42tSNnD4p8m7zWy99rAm7tli/anJKr3zbszOodAnhenESO4D8O833wJpL128PbfFJMXG Ie0YgnudcbSMFEG0Vd7kUxtJUUChaWSrMB3zBb5hzKMMEuGzX5tmOvBipyDfi8suj/Zx 0tVXx+ANTF3rU/Ym+bK2b44jbEpba6cXvhLl5m7RVFm9jn3oBavUZQqfpnjz2pFjzmBF mBoWP5JGBTLy3lvD3gfERsKdixNEqBEfhsGT+U/oK8jHOkJ86ot+G11RFXWDrBewYNpS Al3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=fNB1b42g; 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 ji3-20020a170907980300b0078e254ae419si12450427ejc.643.2022.10.17.22.02.51; Mon, 17 Oct 2022 22:02:52 -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=fNB1b42g; 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 BD34468BB22; Tue, 18 Oct 2022 08:02:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 134DF68B52E for ; Tue, 18 Oct 2022 08:02:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666069354; x=1697605354; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xlEUeTzA1ej17TZqKCL3yw3qfhk/6R7cenEzrvhFulI=; b=fNB1b42gGrXWZRcgL83F7CNxNQAskwU58+WZUzFMPcbhcU1H/c5HZpx2 CWP1kwH9z0Hm2PYmwypJMWuGWX68//rdGKB59p3tNTyE0RDQ22/pstumD OvP15XC1FMMYY6n0ETSydzPgdXmTL6Fc7hmcCJC6wCi0eNCT87DflvQqs 1OLnQFudi1PnKiSBvrImDDhjFhZQbjuAEY8jKlQyHcKrAhw4KKEZmSV1b FqBDq5PGoBk9cQ1HEwGKNG9pgi9RHlzXVhjFd22wUsvsEPeCDkJq4uRTk Z0vOU2UCU2uiChZnhqmY9isI/8ng+/3woidjsmomuwuX8HL/dCVS1B62V g==; X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="286388468" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="286388468" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 22:02:20 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10503"; a="803598098" X-IronPort-AV: E=Sophos;i="5.95,193,1661842800"; d="scan'208";a="803598098" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Oct 2022 22:02:19 -0700 From: haihao.xiang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 12:59:25 +0800 Message-Id: <20221018045925.258081-3-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221018045925.258081-1-haihao.xiang@intel.com> References: <20221018045925.258081-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavc/qsvenc_hevc: accept HDR metadata if have 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 Cc: Haihao Xiang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Jt0ooW8ovLFC From: Haihao Xiang The SDK may accept HDR metadata via mfxEncodeCtrl::ExtParam Signed-off-by: Haihao Xiang --- libavcodec/qsvenc_hevc.c | 80 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 2a3f34b915..28d2cfcae1 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -26,6 +26,7 @@ #include "libavutil/common.h" #include "libavutil/opt.h" +#include "libavutil/mastering_display_metadata.h" #include "avcodec.h" #include "bytestream.h" @@ -160,6 +161,83 @@ static int generate_fake_vps(QSVEncContext *q, AVCodecContext *avctx) return 0; } +static int qsv_hevc_set_encode_ctrl(AVCodecContext *avctx, + const AVFrame *frame, mfxEncodeCtrl *enc_ctrl) +{ + QSVHEVCEncContext *q = avctx->priv_data; + AVFrameSideData *sd; + + if (!frame || !QSV_RUNTIME_VERSION_ATLEAST(q->qsv.ver, 1, 25)) + return 0; + + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); + if (sd) { + AVMasteringDisplayMetadata *mdm = (AVMasteringDisplayMetadata *)sd->data; + + // SEI is needed when both the primaries and luminance are set + if (mdm->has_primaries && mdm->has_luminance) { + const int mapping[3] = {1, 2, 0}; + const int chroma_den = 50000; + const int luma_den = 10000; + int i; + mfxExtMasteringDisplayColourVolume *mdcv = av_mallocz(sizeof(mfxExtMasteringDisplayColourVolume)); + + if (!mdcv) + return AVERROR(ENOMEM); + + mdcv->Header.BufferId = MFX_EXTBUFF_MASTERING_DISPLAY_COLOUR_VOLUME; + mdcv->Header.BufferSz = sizeof(*mdcv); + + for (i = 0; i < 3; i++) { + const int j = mapping[i]; + + mdcv->DisplayPrimariesX[i] = + FFMIN(lrint(chroma_den * + av_q2d(mdm->display_primaries[j][0])), + chroma_den); + mdcv->DisplayPrimariesY[i] = + FFMIN(lrint(chroma_den * + av_q2d(mdm->display_primaries[j][1])), + chroma_den); + } + + mdcv->WhitePointX = + FFMIN(lrint(chroma_den * av_q2d(mdm->white_point[0])), + chroma_den); + mdcv->WhitePointY = + FFMIN(lrint(chroma_den * av_q2d(mdm->white_point[1])), + chroma_den); + + mdcv->MaxDisplayMasteringLuminance = + lrint(luma_den * av_q2d(mdm->max_luminance)); + mdcv->MinDisplayMasteringLuminance = + FFMIN(lrint(luma_den * av_q2d(mdm->min_luminance)), + mdcv->MaxDisplayMasteringLuminance); + + enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer *)mdcv; + } + } + + sd = av_frame_get_side_data(frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL); + if (sd) { + AVContentLightMetadata *clm = (AVContentLightMetadata *)sd->data; + mfxExtContentLightLevelInfo * clli = av_mallocz(sizeof(mfxExtContentLightLevelInfo)); + + if (!clli) + return AVERROR(ENOMEM); + + clli->Header.BufferId = MFX_EXTBUFF_CONTENT_LIGHT_LEVEL_INFO; + clli->Header.BufferSz = sizeof(*clli); + + clli->MaxContentLightLevel = FFMIN(clm->MaxCLL, 65535); + clli->MaxPicAverageLightLevel = FFMIN(clm->MaxFALL, 65535); + + enc_ctrl->ExtParam[enc_ctrl->NumExtParam++] = (mfxExtBuffer *)clli; + } + + return 0; +} + static av_cold int qsv_enc_init(AVCodecContext *avctx) { QSVHEVCEncContext *q = avctx->priv_data; @@ -189,6 +267,8 @@ static av_cold int qsv_enc_init(AVCodecContext *avctx) // HEVC and H264 meaning of the value is shifted by 1, make it consistent q->qsv.idr_interval++; + q->qsv.set_encode_ctrl_cb = qsv_hevc_set_encode_ctrl; + ret = ff_qsv_enc_init(avctx, &q->qsv); if (ret < 0) return ret;