From patchwork Thu Sep 9 09:13:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 30084 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp322953iov; Thu, 9 Sep 2021 02:15:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzs7j3QQjIh1Zg495Ov4Zto/JWbS/vkmnu2QjYdex3KgcCAZY5q4yS2aPu6Vv+nIYozgRVw X-Received: by 2002:a05:6402:705:: with SMTP id w5mr2242865edx.344.1631178924190; Thu, 09 Sep 2021 02:15:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631178924; cv=none; d=google.com; s=arc-20160816; b=QiJ9NQjPaOdERF93Cq3+2FExtHOgN5/tufFS9dVALLXxiGkiEYWOVSwiBOLIe2rGtB jp+qhcnjbdTBVJGknyNiwPt8eIBZqhz8ghJBteEGK96x52sYioGb2WDwarhDvnfsq9IO cV2bwkMIqFMkzI7DqEYuL+X4zxWnlY1+jZ/IGBsey86/JeygXL+OXgzzGhvetZk3gm7G 5/pYSntGMNbqofLjLFjCQsS/uF6GQ9dKFHWHozDbd7HjVTP3SZzRZA3OLwhKJpCWJUx/ h+yEOqGPPeTPhoAY/4GVezslwibSI6FiA/27IbaUE8HNDUb+vqGAOYC5H8VCPZu4J+ZY RuYw== 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 :delivered-to; bh=2+W+XpxLrrapumQ81q6l9Sekk1Qq7ypK/MeOtxMNNOk=; b=H1Tujxp258XLcExVbTLGWLJUm0uvBu8s7C/id2IYb1S5q3VtmnL+fVfpAm4H8FaCsN KvuaruxTWGIwqzGaT6XfLjyq0emzwOEUNH54RCRVxWJDvFf7jM/OXEL72Xsuy0kgi5Wb C9QKEXdRRCo2rR0/2vQfdTF5VljrKiefRYM6hDXy3wV2/QkANqJ+RGd7FkcxUWFMV9LV iEeAoUvN6jaMk9CRkVNRKyU8W7X61GBAijx6brqxI8FGfyro2BHOe1qwrsOfT8R5abK7 2HJgKtvbbNA8Yqit5w9a1hFjbFhShyvh1qjEKlUCfR32i7lkoyP63b5hO7pdZbH4Z9x9 pDjQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 6si1387251ejl.543.2021.09.09.02.15.23; Thu, 09 Sep 2021 02:15:24 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB97668A6A1; Thu, 9 Sep 2021 12:15:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C8C668A5F7 for ; Thu, 9 Sep 2021 12:15:12 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10101"; a="207843125" X-IronPort-AV: E=Sophos;i="5.85,279,1624345200"; d="scan'208";a="207843125" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2021 02:15:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,279,1624345200"; d="scan'208";a="694034973" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.5]) by fmsmga006.fm.intel.com with ESMTP; 09 Sep 2021 02:15:08 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Sep 2021 17:13:01 +0800 Message-Id: <20210909091301.2629659-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavutil/hwcontext_qsv: fix a bug for mapping qsv frame to vaapi 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: Wenbin Chen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: g5Iw+vZTJJe+ Command below failed. ffmpeg -v verbose -init_hw_device vaapi=va:/dev/dri/renderD128 -init_hw_device qsv=qs@va -hwaccel qsv -hwaccel_device qs -filter_hw_device va -c:v h264_qsv -i 1080P.264 -vf "hwmap,format=vaapi" -c:v h264_vaapi output.264 Cause: Assign pair->first directly to data[3] in vaapi frame. pair->first is *VASurfaceID while data[3] in vaapi frame is VASurfaceID. I fix this line of code. Now the command above works. Signed-off-by: Wenbin Chen --- libavutil/hwcontext_qsv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index d431e71eab..6539cae619 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -781,7 +781,7 @@ static int qsv_map_from(AVHWFramesContext *ctx, case AV_HWDEVICE_TYPE_VAAPI: { mfxHDLPair *pair = (mfxHDLPair*)surf->Data.MemId; - child_data = pair->first; + child_data = (uint8_t*)(intptr_t)*(VASurfaceID*)pair->first; break; } #endif