From patchwork Mon Sep 13 06:22:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wenbin Chen X-Patchwork-Id: 30203 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3725089iov; Sun, 12 Sep 2021 23:24:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw545wlgp8uDx/l/INeMjEXTfyDcqrk9A64FUQ8qxczRkhecYkvBkf+ovrXuTSPD/LLvcR6 X-Received: by 2002:a17:906:48d0:: with SMTP id d16mr10743888ejt.562.1631514279064; Sun, 12 Sep 2021 23:24:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631514279; cv=none; d=google.com; s=arc-20160816; b=e3nACF5zK9DRCMNtvnpVRV0ITXPvskYKEdtwaaxxK4FnfBOCVw+KZDO5VbCSVHZyGY MDnLyuDz1ScGymaCM7+bCeaDORbnjK/Sv7OuxTZMVJRUHPPF69qumdgjf9dIhljOB5wn mlgJ2es4NLSkPSrJOmpoRP5dtmWuDBe7TF5eL7OzIWLqUw3CJ62Z8EN0jvGBFXT1zpyn w1eu2+KHr9FNEpJBcM8jSOBGq2IBHZKxTZch7R7BqgB2KUFQWLw/bat7rTnGTD4lg5Yo SkVMBjaWJSEqcXjetG2Px66fb7V5VP8DXfNFvPBkhEsLukYfBYbmHVYgh6taF/1SFsis YhDQ== 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=5mj3skW+cpAi+0RxPF8jPoThfJxTzEsz98bHcRRjbWk=; b=MUynH8LIwzDwy1+UViiP9s411XBllLa2kFa0Ra8ZLyyiDL3jqTTfHgu0heT4YStByH pnSMXQNgb2q/a8HXuzW7esheQ2mG3S37TNQhhLIsV3QMvrP5nulp4g0COwStmeXmSgtD BTWYxlt7L8ShqhRC4rmbMACseLGK2TaOfEPkmomPhha7KjXWC3JjuCVL70VpA/isS9DI czJkL4t79zhMDQyewQ4t2l3TG0cVkKrJwGPubEOqjCIBO0S3vFp9DG1/Z4rHP3sKhd/4 LiwG6zs3ou2dWleupIcw3RijYTmAr41jLlUUHT+lN/7ubM5LoShpg4Iv7WBWEUsVqqF8 O/Uw== 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 v20si7276775ejv.515.2021.09.12.23.24.38; Sun, 12 Sep 2021 23:24:39 -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 7A04A68AA53; Mon, 13 Sep 2021 09:24:34 +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 D2A0168A717 for ; Mon, 13 Sep 2021 09:24:27 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10105"; a="201092643" X-IronPort-AV: E=Sophos;i="5.85,288,1624345200"; d="scan'208";a="201092643" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Sep 2021 23:24:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,288,1624345200"; d="scan'208";a="515318476" Received: from chenwenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.5]) by orsmga001.jf.intel.com with ESMTP; 12 Sep 2021 23:24:24 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Sep 2021 14:22:22 +0800 Message-Id: <20210913062222.3221575-1-wenbin.chen@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2] 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: 0BtBUgWzpj1x 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index d431e71eab..b01236889e 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -781,7 +781,11 @@ static int qsv_map_from(AVHWFramesContext *ctx, case AV_HWDEVICE_TYPE_VAAPI: { mfxHDLPair *pair = (mfxHDLPair*)surf->Data.MemId; - child_data = pair->first; + /* pair->first is *VASurfaceID while data[3] in vaapi frame is VASurfaceID, so + * we need this casting for vaapi. + * Add intptr_t to force cast from VASurfaceID(uint) type to pointer(long) type + * to avoid compile warning */ + child_data = (uint8_t*)(intptr_t)*(VASurfaceID*)pair->first; break; } #endif