From patchwork Fri Feb 24 05:45:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 40486 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp981290pzk; Thu, 23 Feb 2023 21:45:37 -0800 (PST) X-Google-Smtp-Source: AK7set+J/dh9L760UY0dYOBIvb1NMNyBxZX16HYYW37wz4jNSkWi/SfrS0MoIzOsI/+4eUa4KkhA X-Received: by 2002:a17:906:d118:b0:8d9:383a:be39 with SMTP id b24-20020a170906d11800b008d9383abe39mr15904554ejz.41.1677217537188; Thu, 23 Feb 2023 21:45:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677217537; cv=none; d=google.com; s=arc-20160816; b=ZnCHwt2zrXKa/0FeGloqxl8T/nyeW5tSQOOxaGt5NQQCPhf0gQKQx4gZdJY+t7qY6b 6XxaaRl9qj0uvcasatKeA92Wzwr5rbl04J+Hcuwb/Rli/QovJYcbsvVZagCWvqHIaV+6 BGWyL0GAeCI9blLxOjEA/ny+fhxJ4eesYuxFwRZEnEXnt/05oqcJU9MKfFd8H7JLgePh 7vDynJwRrYiGjWkgz8t1oeckaNR9ifUqag2hCZmASZACxjoBIxK295qY34lOKFBXyjUh dubax29VHgaC80Rn+aQaOwVv+6hXSMih3Ivx1Dmfp+t8fsMswoPY9ZfvM+hrDUC7bD92 RReA== 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=4P/JkjNhKOq0Osj9TE+r57bsiNIToH3sob75Qk7a4Zc=; b=TQyE8/Zgwy9UJtIyMmTCfKYdTtRjTp83VrlMCGdOkd2bYikoEqXz2xnia+7dJ2JQzH RdOVdltFEXpkMfABsZeb7yWnDD8g5owat5IzbyE1Ap86b2oHgs0UVprGB2rz/aeTtmAs 1/Ywub4MJjZ3aSE5MmnHqU4QPuq0Df6oCuqdlqRjn3Wsqgo/e9T6OlKhrwh83jWONUuV 0moq60ATHJ5k5t/zxJbGWo0+G7NkPhPUwSAKXtd3d087bEjE5cHFI5Lm4Dgs6eNLsPJ5 mptR1RKnULWn3OxxtrvCESAwpJd6NbFgb4LRmSgXsZRfIqti2NPufz7uVp0ocf/sW4Ve kBvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=RGoIIoru; 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 p14-20020a170907910e00b008de4a641fdasi11558723ejq.193.2023.02.23.21.45.36; Thu, 23 Feb 2023 21:45:37 -0800 (PST) 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=RGoIIoru; 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 CB7BE68C0E9; Fri, 24 Feb 2023 07:45:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 269BC68BF0E for ; Fri, 24 Feb 2023 07:45:24 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677217530; x=1708753530; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=WN76dFKI7bpvmf6LZhySel17g4i09ZYv73QGkaon+3c=; b=RGoIIoruq+flchQWOePaEKxdm7/7ujDUPVi1KfmQ2l3KzoY1aGJ+Z0Sf /LxwXXUoi8wPpMhPO6f+RmQPK7Ux/6XgsQ6aI/C1S3y8w+aXnhNQe/wr5 ZY1KHl55tU55w9jmgq1vUvCWurncKqBBZbwCwMBN6ZxKwPfr6/Xiif+Ok M8o7hI6G15kdqzilhIUIIKbuO4w3vGHVCcMVTlae4hBBMCnwVh62BLLUO gAd4/+5sWgchWs/01peeOI/xjL1w1bOW5WGMlaDh0l+BiGNSmfd1CytcM QwkO/qZpjRlkjUi6LAl702mD/JHeLL3rob5y4jFd3Z11vW5n/sjX/94C/ w==; X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="395912634" X-IronPort-AV: E=Sophos;i="5.97,322,1669104000"; d="scan'208";a="395912634" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2023 21:45:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="815616429" X-IronPort-AV: E=Sophos;i="5.97,322,1669104000"; d="scan'208";a="815616429" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga001.fm.intel.com with ESMTP; 23 Feb 2023 21:45:20 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 13:45:49 +0800 Message-Id: <20230224054549.863132-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] lavu/hwcontext_vaapi: sync surface before export its DRM handle 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: be6TYIj7hBQ5 According to description of vaExportSurfaceHandle in libva, vaSyncSurface must be called if the contents of the surface will be read. Fixes ticket #9967. Signed-off-by: Fei Wang --- libavutil/hwcontext_vaapi.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 938bd5447d..90c2c191d9 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -1319,8 +1319,17 @@ static int vaapi_map_to_drm_esh(AVHWFramesContext *hwfc, AVFrame *dst, surface_id = (VASurfaceID)(uintptr_t)src->data[3]; export_flags = VA_EXPORT_SURFACE_SEPARATE_LAYERS; - if (flags & AV_HWFRAME_MAP_READ) + if (flags & AV_HWFRAME_MAP_READ) { export_flags |= VA_EXPORT_SURFACE_READ_ONLY; + + vas = vaSyncSurface(hwctx->display, surface_id); + if (vas != VA_STATUS_SUCCESS) { + av_log(hwfc, AV_LOG_ERROR, "Failed to sync surface " + "%#x: %d (%s).\n", surface_id, vas, vaErrorStr(vas)); + return AVERROR(EIO); + } + } + if (flags & AV_HWFRAME_MAP_WRITE) export_flags |= VA_EXPORT_SURFACE_WRITE_ONLY;