From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7B97940AFC for ; Mon, 27 Dec 2021 05:46:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0721068AFE2; Mon, 27 Dec 2021 07:46:15 +0200 (EET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 242D468AF04 for ; Mon, 27 Dec 2021 07:46:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1640583973; x=1672119973; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=BSxk053wpMRuJo8rAbJ9Vz6lLgcBelirb6orCglkh+Y=; b=mafbCIzp2Agc4nOe8Mf90jsXI4i0pcxB4DMGl6MY1o2bAMhJLeWr7Qbx 2IJnEEu7zQaBZ14Kk2GkzxAPmcYenD805/cwFi/bHbJlufwTg1Epf4kUD /RCmhD3ylnZNeWA/eh7A/E7O8o7/tNaEzoR+cmRLRY0pcQboTm89/Ee/v T8sBlclaAsZzYob5qNtd+N0Aca7fyBURJw9COJZrOypm1dz1CgF/azbwL bZ//r8AmCXMqsoVoyQGDFpfmybFZFVPS8mOtvVW99O3YRADWrEmIo5SkC KRyJt+joP5Pf7v94mM7l1mRg8hNF/tGPBB6KEplELggVqCLcxlXuJdR4Y A==; X-IronPort-AV: E=McAfee;i="6200,9189,10209"; a="240968238" X-IronPort-AV: E=Sophos;i="5.88,237,1635231600"; d="scan'208";a="240968238" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Dec 2021 21:46:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,238,1635231600"; d="scan'208";a="469629070" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by orsmga006.jf.intel.com with ESMTP; 26 Dec 2021 21:46:04 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Sun, 26 Dec 2021 21:46:03 -0800 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Sun, 26 Dec 2021 21:46:02 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Sun, 26 Dec 2021 21:46:02 -0800 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.40) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Sun, 26 Dec 2021 21:46:02 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=En+3GL9JDMj8FEDZkt0YqyOqACGNx1WNxEqERl4jdN3CItkyJwYW8WcSmDs8p+exBM6VIW6FRO5V0pU0fjYCJcAvEWjBDO1Ww36owxOFGqTW4UQL1apDAfOc0NRhw9mg8UjKO2rX7AJhLpqrwn2qDabJW4qA0gb1PLSQElFlkJA6W8tzxReP+gyr9qp++0er5+6MGaqw4Ox5Afie+BvttPhBGKklXm+UcQ+yxAidjHqOUsquTuxWbr1ZCLhtVf1G+SEH2U7q4qiYpSif9vpiUc35YUr9RK6A6RpF609i8w8JiKGFXDGh3l2tA1iife9IyXgl5lfuDbZ5oWW+tj6YcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BSxk053wpMRuJo8rAbJ9Vz6lLgcBelirb6orCglkh+Y=; b=OTHzWLEx5t6OMnCEuQEqbYwyDn/TVCgEQYP8wPzk71zLNQneEnV41+gssa6Ejw+uwytDiciMcP6LOekKXk9rcHeFNkW+ART2CWAr8HrVOpliPBDPGqm8PFNn6d8SsQnAwmkv7Okvo3gyNiyXBywyMxEvDoUETonQWucbFM5asL1xXSMt4s5G7lFLmDgFyOQymBbjiFlcZ0yqOFIkviVwD6zAe1baJ2AoYnpWT4Sjbw30I9azgw/EHzcrm6oerJbw4yFE5hfLA27RRUk8HMjRsNJaS/jCnuoBctlAr9IMxDk3FfpxgIi3nN4C/763Md+GTJBfzGJtIq47BE4RSDPg2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BN9PR11MB5515.namprd11.prod.outlook.com (2603:10b6:408:104::8) by BN6PR11MB1363.namprd11.prod.outlook.com (2603:10b6:404:4a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.17; Mon, 27 Dec 2021 05:46:01 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::bcfc:ceef:cd03:dd16]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::bcfc:ceef:cd03:dd16%3]) with mapi id 15.20.4823.022; Mon, 27 Dec 2021 05:46:01 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH V3 2/2] libavutil/hwcontext_opencl: fix a bug for mapping qsv frame to opencl Thread-Index: AQHX7Yg5isi20B8IvUKM/lz5eqL+FqxBPHQAgASH5gCAACqgAA== Date: Mon, 27 Dec 2021 05:46:01 +0000 Message-ID: <1895d7d08f2b0f80373b9b98f7b0e8c150d3f812.camel@intel.com> References: <20211210053818.3815652-1-wenbin.chen@intel.com> <20211210053818.3815652-2-wenbin.chen@intel.com> <60b6d3eb91e2ebb0f7fa7449deffbe7886553668.camel@intel.com> In-Reply-To: Accept-Language: en-AS, zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.28.5-0ubuntu0.18.04.2 authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4dda4e4b-a8dc-4429-3599-08d9c8fc2a08 x-ms-traffictypediagnostic: BN6PR11MB1363:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: dkk2vlsso9Z8+c/vtgZFFUTeyyK5sWG0/VXFAKi5+JshrH3yuMqi+jlmfUJ3Q8YeWhdABquoDT6nFQv8BIS5Eq6/rvKYNj+QbeburR1wXyiePeoQgcOPY1AYG1yYH1VM/6n6iL9Ju9B2FVbB068VItn5qnECBwrvAdFKcgwzqORfYR/UJ6+Tya/sZJSS2H9kiw3/UP78htkgiUWypUQQYGZaQ2P3gsBTGr/4SblgrrPw1nvZY5WH87wbp9H9KO/jmmbsq0d4q1cEyg+2lAF3dPfUW6Og1ajwiprzN1+36dk/zBKCQlskM3EWNvc/PTcd690RRJvjgJh6CzSEQYNobNgzrqGXZNPnxgBr4dfspfdaxXsrePrxtu19qEp9QLT4qx1iXgse4ouyruaC5XTUMJahExWoCWNc0y28/6NEvtZrcmFYx3uHRfmQJLGyZef/FhSn0uWb5wGg+2/hT87ah6vbVjbcxay2DP9YUAl7II4OAVQHZM4VdIFCzxD3C3rQkE96Nr5/73DHoTOTFq0eLE3zv/QGukuBOe5lNFo8f9TDR/+lJtOs6Tgnj5GBBMbZNQqhnwnsLyVQZdg7iTU6n2hCMZShbMw1v2hS2I7iuFvP+58zzP9Uul2FDy7JLaqu7Curq6ozwQfmzOxcsvw72xiSFNllUeGOPcNIN4rkL2WNYgiWpZjlgneSx1ggA9UaJ78klJwa87YXp8my1fVW1V5sBrPjYhSvE0/vZco8y0E= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN9PR11MB5515.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(38100700002)(6486002)(83380400001)(508600001)(26005)(122000001)(38070700005)(6512007)(8936002)(5660300002)(6916009)(316002)(186003)(36756003)(4001150100001)(71200400001)(91956017)(66946007)(76116006)(66556008)(66476007)(2616005)(6506007)(64756008)(66446008)(86362001)(82960400001)(8676002)(2906002)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?Qjk0Ynd1QVBoKzJPZlZiZE1RZkd5dHRVdlBKREc2L2ZJd3FLM1hpZ0JFWmtk?= =?utf-8?B?YWlFU2xqR1BLSXFKYU41OHQ3Yk05ZXR3TFEyVjJGeXNlNDFLbFprZk5JWGxx?= =?utf-8?B?OGRnbkI2T0JiMVFKVXI1MWlNRDJ3NmoycDN4OHhkSEU3L2Q3b2xlb3YyeUln?= =?utf-8?B?SGc1elJUYkw0Nkx2M2EwSkVremNQNTVCKzZ3SHh1enpkU0J2WkxmOUEvZ3ZG?= =?utf-8?B?dXIvNVdPUEZsbHErRFNabjNkVHViZC9pRjZ2TEVnYmdGVkdhYlNJcW1FSjIx?= =?utf-8?B?UHpJY0thMDFZVTA3Uk0rRDhlYnkrMDJDbzJPaFBPTDBOeVkrYkF6QTZ6bm5K?= =?utf-8?B?QkFXeWxSTlJtcnU1NG01QzI5VGp4ZVcvcys3Q25GZk9Zc1BOMGZ2MEh2MzZq?= =?utf-8?B?VlpMQVZZcXpWK21LMUlKVVBxdHVHdXRrRmJNRzQyek5OTjQvblJVeFVxRjgy?= =?utf-8?B?NUViYWU0SHdiemJiaHp2ZzRVbUVycHljTmZiMkhPVmgwTk9pZ2x0WVRhUWVU?= =?utf-8?B?TUtBckpBbXZOemwwUkg1VFcxTzI5cHZISzFLUXp5RzdreUZnZjlJQTFzYW54?= =?utf-8?B?bVhLcUw4dkRJa2grRGVyQm00YXd6TVBXUW9zMGNDUnh6Q1pjQlpPRC9Ed05X?= =?utf-8?B?djlZZVhILzV4YjVpZXRoNW9QR0pWUnl5Z0F2TkZGcFI4ekVnSkcxZDEzNnc1?= =?utf-8?B?RnFXcXgvUkVoMVNhQWkyd2RrNzVBdEJPY0ZtenF2QzlobU1pdGRFZ25uSlZB?= =?utf-8?B?citsbFZQaTY1c2x4ZkFsMitRNjVHM3BqWGV1NXo3K2pNZFlUT2VVZ0dYaWxs?= =?utf-8?B?YktzNWtHbU5tZHhwa1VUSFVEQ2YxczBVTlVZcGxTRGlaRE5hbXZrMStRZ3lV?= =?utf-8?B?emhNcDViTm1GS3YxNjdRd0liMXdWNnNGSVh3aVdtRENWcDJMQ0M0TTNyYTUw?= =?utf-8?B?c29ZcTRWbzlGM3NHSlVSRndyTmU2ZEU0WWZQOFpQS2F0ZTNZWFdUeEtKYVBE?= =?utf-8?B?UlQ3cUpVQWdpcUtScVdjS1FlYnVLZE52bUdmNFBuU0Nsc1BxK3RLZ1lVSDFF?= =?utf-8?B?MzJpcTJKUWp0SjYxTTZmQVNYZTZNRTVNRzVha0NyK1Fmd3IyNytQbTdaNnlw?= =?utf-8?B?Ky9RVTVkdlFmVTNiUGJ2YlE1LzBXRytjWE9NODJOcFh4Zmludk5PakxDcUVv?= =?utf-8?B?cjhuVDFwVS9ic3RRR0NaTWNkSFUyQXdoZVRlbkR1ZlQ4SXhlenlNV1Rmb29y?= =?utf-8?B?dXpRVURZanl4cThxMllieFpzZVhpb1FCSWhId2I2NHYxcm9EL0ludmQvdUlh?= =?utf-8?B?RlRZM01ZbkkrL2NmRUVQSm0yT296UXVIbytPdUtnUlQyYmRma2lHUGFUYlBJ?= =?utf-8?B?ZmpjaTBua096K0xhOE4rY2I4ZkVNQmNuT21Nbmo4a2IyVE5sTURIRmY5ZHls?= =?utf-8?B?Z2oxODdQdXgzM3NyVitsU2NFN3VhRW9FWkdVOWJ0VTQxS0hSNTdmQkhkNzYy?= =?utf-8?B?dGxPYkdVbzVodXVOY3RWL0Fka0tLWmw1KzRNaWxycWtyeXpzanQwUkxLVVlJ?= =?utf-8?B?NE05UTJYNnpybEpJckU1QlpjcHdTNFVhakZyY1pvbXhTcDJaUmRocTFIRTdu?= =?utf-8?B?T2NNQ081UUxMU1dhZVZ4dUczams5aHJUZjRCeW9Xem9IbWtzdVZFaURZVUZo?= =?utf-8?B?cG14UWVrRVptL1N4RjhNTDlhWTcyUzExNVVUaHl6RFFhcENJWHpiNXJ0aEtZ?= =?utf-8?B?WHpCbmU1UGhRN1YwOWNOQzZQdnpoZzBhVVRleFJXMFRqTzBSUlVmZlo2Zkxm?= =?utf-8?B?ZHhmUDcxN1Y3dmpTaDYwZG1DTk1ZNlV0V2hzT2VaK050YjNwM1E3MFpreGVK?= =?utf-8?B?SlByM2FYdFR0anhQczZtQThLNkcwR1JFZkNibm1yZ0tCZ2N3NUM3eXU2SGZK?= =?utf-8?B?aW40NUxyZ0pvSDcwU2VVUHNJWDg0eE02Um83VDBjcXBMU3dOWnJpYUo0TjE5?= =?utf-8?B?UkpPdVpmU0MrSFRlMmVpbGFpK2RUMENJWVpTbFVnQnI1R0x3ZlNjb3VxbHpx?= =?utf-8?B?aVg5Y0ZFVlc1OUh5eWJZTmtoOWdyaDNVYnB2eFpDbHd4SmliWnJxNDJiMEM0?= =?utf-8?B?RGhWSEJnZ0pLNFVQOXZLRFk0QVpaRnkvSFlCc1ZiZ2gwNEVYeUdnUDNuVkZW?= =?utf-8?Q?UfZiNeOxmELuDSjlqG5TE8Y=3D?= Content-ID: MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5515.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4dda4e4b-a8dc-4429-3599-08d9c8fc2a08 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Dec 2021 05:46:01.1063 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 9zp2RtAIC6c0O52sH2ic51PODZ3ryFOdjMigVHtVuBOC0FTN62lzXx7VrHnKs9DllmiQ3UUiRObeLiY5a8A1Qg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB1363 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH V3 2/2] libavutil/hwcontext_opencl: fix a bug for mapping qsv frame to opencl 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Mon, 2021-12-27 at 03:13 +0000, Chen, Wenbin wrote: > > On Fri, 2021-12-10 at 13:38 +0800, Wenbin Chen wrote: > > > From: nyanmisaka > > > > > > mfxHDLPair was added to qsv, so modify qsv->opencl map function as well. > > > Now the following commandline works: > > > > > > ffmpeg -v verbose -init_hw_device vaapi=va:/dev/dri/renderD128 \ > > > -init_hw_device qsv=qs@va -init_hw_device opencl=ocl@va - > > > > filter_hw_device ocl > > > \ > > > -hwaccel qsv -hwaccel_output_format qsv -hwaccel_device qs -c:v > > > > h264_qsv \ > > > -i input.264 -vf > > > > "hwmap=derive_device=opencl,format=opencl,avgblur_opencl, \ > > > hwmap=derive_device=qsv:reverse=1:extra_hw_frames=32,format=qsv" \ > > > -c:v h264_qsv output.264 > > > > > > Signed-off-by: nyanmisaka > > > Signed-off-by: Wenbin Chen > > > --- > > > libavutil/hwcontext_opencl.c | 3 ++- > > > libavutil/hwcontext_qsv.h | 5 +++++ > > > 2 files changed, 7 insertions(+), 1 deletion(-) > > > > > > diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c > > > index 26a3a24593..ab812999cd 100644 > > > --- a/libavutil/hwcontext_opencl.c > > > +++ b/libavutil/hwcontext_opencl.c > > > @@ -48,6 +48,7 @@ > > > #if HAVE_OPENCL_VAAPI_INTEL_MEDIA > > > #if CONFIG_LIBMFX > > > #include > > > +#include "hwcontext_qsv.h" > > > #endif > > > #include > > > #include > > > @@ -2249,7 +2250,7 @@ static int > > > > opencl_map_from_qsv(AVHWFramesContext > > > *dst_fc, AVFrame *dst, > > > #if CONFIG_LIBMFX > > > if (src->format == AV_PIX_FMT_QSV) { > > > mfxFrameSurface1 *mfx_surface = (mfxFrameSurface1*)src->data[3]; > > > - va_surface = *(VASurfaceID*)mfx_surface->Data.MemId; > > > + va_surface = *MFXSURFACEP_TO_VASURFACEP(mfx_surface); > > > } else > > > #endif > > > if (src->format == AV_PIX_FMT_VAAPI) { > > > diff --git a/libavutil/hwcontext_qsv.h b/libavutil/hwcontext_qsv.h > > > index b98d611cfc..957df01ef1 100644 > > > --- a/libavutil/hwcontext_qsv.h > > > +++ b/libavutil/hwcontext_qsv.h > > > @@ -29,6 +29,11 @@ > > > * contain AVBufferRefs whose data pointer points to an > > > > mfxFrameSurface1 > > > struct. > > > */ > > > > > > +#if CONFIG_VAAPI > > > +#define MFXSURFACEP_TO_VASURFACEP(surf) \ > > > + (VASurfaceID*)(((mfxHDLPair*)surf->Data.MemId)->first) > > > +#endif > > > + > > > > Is it possible to remove the dependency on VAAPI in a public qsv header file > > ? > > > > Thanks > > Haihao > > How about moving this to qsv_internal.h? > There is no qsv_internal.h in libavutils. I think we may provide a function using ff_ as prefix to get the internal vaapi/dxva2/d3d11va handle, user may call this function and cast the returned handle to the right type in other hwcontext. If so, we needn't add the dependency on VAAPI in this public header file. Thanks Haihao _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".