From patchwork Thu Mar 31 07:43:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 35103 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp1236991pzb; Thu, 31 Mar 2022 00:44:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDL25QMaSa3Q0owtRREi2kcKPk+d4gmWDdAIK8zuQ2RCmuC0kCDvSFvwQzXuhSh+tgTylL X-Received: by 2002:a05:6402:681:b0:419:dbec:9909 with SMTP id f1-20020a056402068100b00419dbec9909mr15275463edy.310.1648712660190; Thu, 31 Mar 2022 00:44:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648712660; cv=none; d=google.com; s=arc-20160816; b=KZTjZ2ORiJnx+8bwbk121n2DJCqc48DBJz/NnU8ihnuwp0rSGf8mhBGh3KaddolSGo yOA5H3Nhx7bg3v2VIAjq+PAffIXmOrtk2DjKDWZW+2mnnV5bnP5MT91X1TpFVyU0lxXN 3MrW8Yvf8nj4ioJ0oDa3otjf5d+/9HXeRKB6VPwaUSvsK7ewvyclFHE2k1e2pHq6063V jCn1trGdeObFjVAT8wnkGWy3Qqv23i9cEewNb8Zw2R1jUf9Em3pEs+lBsrSqZjOFQ4fJ 6jgkgTlqEG66We6aCKxoGRslBUE+3TlVYH4/cSRrjt+Li5oVoCto1HaLcUAEmszM1uNG akBw== 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=6U5245g6b0XQyhOoyiP1xj3gMVs1w5Be7/VwaXbtrEs=; b=BADF8r2CVOMMxbyA0AED8VDKu0eNe6H9+kD2NisiPHzBE68Pz7i2GsjNrRoJUc5Ht6 gWK6IxYakR7VqU5aV3KjmKX8HJIlGBSS9eSzyY71iKgmq3Dn7uSWyhV68uKVKAFVIkYO nus3dNaegWdBG1H79FGWkmajzac0+1gnSZE+Bg8IP6gARhDBNzKJOagrf98JXH1okxvJ h4tLNwoajpY4fUhhHvkpyRb2SvlcOR5ZVNudSFCo5qO30M587WCPRXIAmdZknKRRgQ6T k/s6TJdrEh7xNVVIzKqKOXDKlmcgKflGU6FfOQ2klW/Mzqy1CkmDxmkaaj0kKstS2u6v wlCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=bMMP2J6R; 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 bx9-20020a0564020b4900b00418c2b5bd7dsi8916481edb.95.2022.03.31.00.44.18; Thu, 31 Mar 2022 00:44:20 -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=bMMP2J6R; 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 17AFB68B1DC; Thu, 31 Mar 2022 10:44:16 +0300 (EEST) 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 C2BE568B0BE for ; Thu, 31 Mar 2022 10:44:08 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648712653; x=1680248653; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=zpYRDEhJeBcY00g//vurdFmMz+M5acDGixeybxVo3Hs=; b=bMMP2J6RMsUZ+06BqfogMIoqc57Vp9qHYJvndl1Y743TLOTT8OwdsQuy ZTv+Ux2Q/rVLQI/KuA/DJkd13nvTBrPeByVNJf6IUIFG42LvYrWUKfVbg FRNb1L6F3z0zNkfQJmX7f+eyavw7KkcmF0DD6NXzcmb4E0RG9ezroXVSN r5cm4FQzBSyfAntK5hud6Y98AMT3qDI9DLiSvNI7px+BwyKb6wERK7IFE w9Um+2KiERiLLDHLFqw3ryDjWGM3d2l4dQtEmLtTDTvg9DKTMUK6C5Szx CYCKti6s6sUVWl+Q7In/W1tNKuHcL8SWIKM3zGn32KIGSGuk2jo36/o4c g==; X-IronPort-AV: E=McAfee;i="6200,9189,10302"; a="259929600" X-IronPort-AV: E=Sophos;i="5.90,224,1643702400"; d="scan'208";a="259929600" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Mar 2022 00:44:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,224,1643702400"; d="scan'208";a="566240633" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by orsmga008.jf.intel.com with ESMTP; 31 Mar 2022 00:44:06 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Mar 2022 15:43:41 +0800 Message-Id: <20220331074341.896911-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavutil/hwcontext_qsv: Align width and heigh when download qsv frame 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: G/CzrTCqQOTZ The width and height for qsv frame to download need to be aligned with 16. Add the alignment operation. Now the following command works: ffmpeg -hwaccel qsv -f rawvideo -s 1920x1080 -pix_fmt yuv420p -i \ input.yuv -vf "hwupload=extra_hw_frames=16,format=qsv,hwdownload, \ format=nv12" -f null - Signed-off-by: Wenbin Chen --- libavutil/hwcontext_qsv.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index 95f8071abe..1e7c065902 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1063,6 +1063,40 @@ static int qsv_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, if (ret < 0) return ret; + /* According to MSDK spec for mfxframeinfo, "Width must be a multiple of 16. + * Height must be a multiple of 16 for progressive frame sequence and a + * multiple of 32 otherwise.", so allign all frames to 16 before downloading. */ + if (ctx->height & 15 || dst->linesize[0] & 15) { + AVFrame *tmp_frame; + tmp_frame = av_frame_alloc(); + if (!tmp_frame) + return AVERROR(ENOMEM); + ret = av_frame_ref(tmp_frame, dst); + if (ret < 0) { + av_frame_free(&tmp_frame); + return ret; + } + av_frame_unref(dst); + + dst->width = FFALIGN(tmp_frame->width, 16); + dst->height = FFALIGN(ctx->height, 16); + dst->format = tmp_frame->format; + ret = av_frame_get_buffer(dst, 0); + if (ret < 0) { + av_frame_free(&tmp_frame); + return ret; + } + + dst->width = tmp_frame->width; + dst->height = tmp_frame->height; + ret = av_frame_copy_props(dst, tmp_frame); + if (ret < 0) { + av_frame_free(&tmp_frame); + return ret; + } + av_frame_free(&tmp_frame); + } + if (!s->session_download) { if (s->child_frames_ref) return qsv_transfer_data_child(ctx, dst, src);