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 8905840905 for ; Fri, 24 Dec 2021 06:02:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5ACF268B0FE; Fri, 24 Dec 2021 08:02:14 +0200 (EET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B96468AF62 for ; Fri, 24 Dec 2021 08:02:08 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1640325733; x=1671861733; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=9vK6hJmrq0Aw2NZ7+FaVF9X9Jvih6tC2eKklY8Bu1gk=; b=bMp2esPqKV0pqhi7iBrMieViNfh26kMmS15cYIATaG+v/RtjT5NkH7b0 4Gj7wgMh3EETT0G8rZQCL+VvVdP0S/aBb75b1nf6rStHy16srC/ksJEQB pQump8nOaPLPijpvKyMQhAlNvq4V/W1AfZxd6kcK+EHNv/alTrxyXI6uq h3+bjBjbX+f+ypO8XFPf+muA0Ak0rDWsrXVkFeorjbt83g7Wi9MugyMsH iu4laZs4vG7/dQwCZIYZ6YjjvxGagNAjePEQ25CALOX+E+z91m25LRZHC 1T972/85AXRYoFJxboVI60uKp83vPwR4AakAiOZrFPnaMWdkuaBN1MHDi g==; X-IronPort-AV: E=McAfee;i="6200,9189,10207"; a="301695685" X-IronPort-AV: E=Sophos;i="5.88,231,1635231600"; d="scan'208";a="301695685" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Dec 2021 22:02:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,231,1635231600"; d="scan'208";a="757049155" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga006.fm.intel.com with ESMTP; 23 Dec 2021 22:02:05 -0800 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Thu, 23 Dec 2021 22:02:04 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20 via Frontend Transport; Thu, 23 Dec 2021 22:02:04 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.105) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.20; Thu, 23 Dec 2021 22:02:04 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cakBDh0IxGzsWi4NhCTev+Le9HIlSWy2BLnxVjTruSJdIoqfIBfHPs16v+CZejOSdo/v1BS1QqeN+PCU8mog6snW3j6RouDSlFGJxRbJVCwmKsxLwxGzLlQNVP1qHlrJPsfF7qsz6fiDK0Ib5Uku+0/zBtIuk/H37bM08+wDFM+1LBieVeKBlnzMBoznPR15xfsNeKzpM1+KTM8PNP7ycusjLMvg69MiS2LXvHDcjjaHRdhrFTrdT182JsaKm53nfae4tRLgLB8VwlJ/yQkKsuXuDEOELRcdSW0aX2LghEDwg6GbLHCGbIyKSNAJ4WshXO/J0abNm2tv4LxRwD5Pow== 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=9vK6hJmrq0Aw2NZ7+FaVF9X9Jvih6tC2eKklY8Bu1gk=; b=jQWxJtNc+EvvCi9+MKyy18t00I3OOHV4NuRnBVNxmDBcIuMfm/XT5wHYyonD7zhABUmQciZkKRBzJagA2IR/XZCSpC6abP2b00DreqguFYEsMqgn1Nf6QLI+Oasyny8ZGSQ6MsK/RYQxHUk0D5iEjeFsGk3r0D9thFJ3oUuXflNO8zJRwWbTyO8hKduIjlUXvwqvc8x2fTg4LITDC+g0N6QGmPt8MNksHSUdGdPD/mPetEnX/Hb32cvvqtYx07GI9hnUwAuofSTyTc6NGlQn4ZnHMiaYqAG536qMCin5sC8crN/nlVxq0hpf9z65u03DsyG1gpq7f7dPp2lBm70fjQ== 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 BN6PR11MB3923.namprd11.prod.outlook.com (2603:10b6:405:78::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.19; Fri, 24 Dec 2021 06:02:02 +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.4801.023; Fri, 24 Dec 2021 06:02:02 +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+FqxBPHQA Date: Fri, 24 Dec 2021 06:02:02 +0000 Message-ID: <60b6d3eb91e2ebb0f7fa7449deffbe7886553668.camel@intel.com> References: <20211210053818.3815652-1-wenbin.chen@intel.com> <20211210053818.3815652-2-wenbin.chen@intel.com> In-Reply-To: <20211210053818.3815652-2-wenbin.chen@intel.com> 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: 89918c9f-071f-4885-2209-08d9c6a2e7c6 x-ms-traffictypediagnostic: BN6PR11MB3923:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Dcvz9rmdvbEs37hdHR1zyND67khHRrmLOyknhIdmRXqDn5Ksf4nwvqw/1GybdXXU39I2DB2H8mkvXoO9KkDgZxR/qmSY9ZWpSW5nKKQrvmOqlJ2H3ydkNNhAISoKZI6MsYyOW9hPfd7k7b86WluGBvZ5SVNgqCJVor+cz50oXgrWzYkTLJMFaEeUHuptxxIGgLcA5Qtkb2WvPmAZsKEBBvpSXMRQwK4tiNbOWKiR/W8aRxwbPsa9bEq3le4+LLD6KuINIXIC+HOJXXpYnhRlcBSX9e3/+e1KMTqEouKwN8zJNZghF/9i5ow9GzrINdPFbeJgD2QRT9qQd6coujXsOzf7oOpZjvKim3ISPAHFKuVmfCjRfTMPhUTzes4IgTa6LhDYv1/IFstgVTTdm5uODD3tnye42VNrXE2ZZ2fdIuuBS7zwburTlLk64g7IMQEW1F3z2DLp8/vj7n6NY6n9LXHQEDdnbym+waUcFNLo8L2GJ8Ns/1Amh27NeS3IyKFB+6zou8NFzXWy/E81zNuwEdwbUWUdX41K3Dwe79Croz8WnyuiQ/5t8j2xr5nt02rP8c6F0nUr+EsxvTjk+3wNuhQEywSAJ8I0XsDCf2xX9oUiWa3DHzb2yJYh3pONvV7vjQbeD628pWOEMP3UZfyGvdoVCz8NpzJJqYjbFA8CYlepKkLBwxHCUo7raH8+AOIGIAWd5qbfLkQyCyklhl9uOH+HHSX+HnCO+hxR6+ly7XQ= 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)(6486002)(6512007)(2906002)(316002)(38070700005)(38100700002)(6916009)(8676002)(86362001)(508600001)(71200400001)(186003)(36756003)(5660300002)(82960400001)(8936002)(83380400001)(4001150100001)(6506007)(2616005)(76116006)(66946007)(91956017)(122000001)(66476007)(64756008)(26005)(66446008)(66556008)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?TFo4Vks3cVpKanIrdEVYVElzVWNrbVBObXdGYVRkQUt2cVpOQ0pOY1VOTXFS?= =?utf-8?B?a1NOMm1jRVRsV2xadGREK2Q1OU5wVzA2UHZHYVU2WmNPQzV4MDN1NjdHU05R?= =?utf-8?B?TklDKzAwM0tPL2t3ME5CNWVzZGZVSGhDdmpDZWpzOGxZOGNBZHA1azVTVnJF?= =?utf-8?B?OGczT2xYbWNHYllwREdpS1RMYi9EMEZmMjR3emxuOUVOYURTVytzUFJSRjdz?= =?utf-8?B?dW5OMVo4V0xLbnllVnozK0MxdGMwdHVtdkpxdndKaHNxK2hIZXJDUWRtZ3lY?= =?utf-8?B?SEcyRy9pd1dpM2NkdzB3SExDTlpyTWgvT21VcE1sSGF6VzlFbTVFcTZYUEJP?= =?utf-8?B?dEhrV3JpQ3dOdzRvRnp2YWgvU0JBRkhyYWsyOE9mTVJLRXZJN0JRcHJSbTR0?= =?utf-8?B?MkJ4c2VXRVJTUkF1WVEyak9KclY5RHEvWlF2K2JwQ0ozS3ErQjFQaDBreXJ0?= =?utf-8?B?dm8zeVl3NHE1UmJDaUNlSGxvNTFQSmJoeWFQYWs2TnJEMXRGNFlKcFF2TW5S?= =?utf-8?B?c0hKWFhwTVluMmFSNmRDdUx5cENPTURoMHlvV1hhMEJ2aXJSbTl0cEV6MU1D?= =?utf-8?B?UUNZRC84SVkwblVxZzRWSGQ4ZmxuY3B4ckJBelJIbTdJWTNhckNDVWdtQlhG?= =?utf-8?B?Z1kzNFVKNG5OTGZoMGdwY043K2RuRWZBZ05WNW15NENCL0NXaWVNN3NnY2lQ?= =?utf-8?B?OWtGT2V6bmRYelp6L0JEOWZ4ait4NmpRaURGalYrOXhxTmh6d2I2UWl1M2dz?= =?utf-8?B?WWJpSkVUKys4QzdwSFRXK1M3N0g1QVlZNUdURGswUTdPckVwb2xWNjVLRUN3?= =?utf-8?B?OXZkbXRBQTdGUjFiQ3NaYm1xbUorZ0cxazZRSWgzbUJtNUxiQU00ZThqUHV0?= =?utf-8?B?eTlSaUxqRzRzZGtpQ2M5bnBCekJ5UTJaL0VZeEJtWUtyQU9LZFA1OFBZSXBG?= =?utf-8?B?WTVlR05aREM0a3JCb21oUlhVL0VLaldtZjNyajhVeFpZZDYwRjJNbGFiRjlh?= =?utf-8?B?S0hnMWszMnZ2V3N6dGd6TS9kUVVjeS8wUjR5NjJWc1JWNmFLWStxK3o4cG5j?= =?utf-8?B?dXVSVWo3NlFTNVVQQWdDbWJYREF5VkJRanNreldaSXRNbWFtWHprc2NGSVdH?= =?utf-8?B?S3dsd2xrd2RlYjdKMFgvdzZJUTk4MzhKWEo2MThYZHpYdklyM1lNUG9pNU1n?= =?utf-8?B?clh0WG9QRVpBWWJZVkNsdlZRSUpqVW1hQlBQUm52L1Vtcm1uaXBxcmdiaGky?= =?utf-8?B?MnlsUHFBSGM1amt4UGI1SGExM3R6ejV6d21GT0hQWngyb1BlNEZqaTJTZ2xh?= =?utf-8?B?d3ZpSTJtMXlLNUlKaDlMSXZqKzlXdXVZQ0wxQTJQaW1zUERKRGxRR0FYMWg0?= =?utf-8?B?eXBucGNwTEF3Z09odHFwTHlaV1hHNUVTbERXcG1qT0hmL2k3eXFTSnFJMXUx?= =?utf-8?B?cUduTjYxKzIwQmkycjRVVm9mbURtQkwxclArelc0WTcxWU10c2RLYlZUQkJU?= =?utf-8?B?eDMrNzVRc0JYRDVrK25sUHc5RTB4WlgvOExGak9NR0wxb1IrdWdORUF1dk92?= =?utf-8?B?ME5kYjVzWEhXQ0l5bzN5TklTTGlweTlaUHpwb1FsWjNWN3hBbHBhT25YV1NR?= =?utf-8?B?bGNjUzhYTUNmYlZpbndrN1IwR3JXaXpHVkJxaWRrdDUxaWF0dkpQNUxWWlRW?= =?utf-8?B?VWhJS2NrWW5XNkQrSTc2NU9iS0s3TVhBZ0RFSUc3Y2NJaC9VZGVUcGNnZXM3?= =?utf-8?B?UWFkcFpQVlRpc29sRGw3dGdMQllPS0Z3YUlMTmNrWi9UWExnUXJlRVZKcXI0?= =?utf-8?B?anorS3lWeUt1cE1OYi9KZTB0NlpnS2xqdld6MlF3OWtDMkdWclRBRFhudVB3?= =?utf-8?B?RGJ3Z05KQUdxNEd5eHpHMU5YRGw4WnJwL3NSY1JSYWVBNS9TSXBicWY3QTQw?= =?utf-8?B?bXkrM2ptQlZEQ2FtNWVER05sVnJiUS84MXNuaVFzeGZRS0tCVXNGcEFzVmxw?= =?utf-8?B?UkVuazkvdXd4V00ydEdtWkdBSm4wTHhSY1hiTmV1TTc0TEhqQmhnSUJoTHpl?= =?utf-8?B?ekhPV01VZTJ6THRkbHdyaTRpL3hYc1plR0xtVWJRS2trMGJHVm5wc1c4ZW92?= =?utf-8?B?b3RlTWVuTld6K3NzWitobGVtVzJFeEh5S1dSQ2o4VElPVWhWNjVtalpzNlNE?= =?utf-8?Q?rVmPht5dOC8rR5nRJ/QmXNnoltV8nB45OMcTtnC5jvo5?= Content-ID: <0A1EC30E475DEE4F8A27E9D8A5FC221F@namprd11.prod.outlook.com> 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: 89918c9f-071f-4885-2209-08d9c6a2e7c6 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Dec 2021 06:02:02.3909 (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: eVY9R7kYNL7PxsX/p99dLioBa8GLjo/S4qxaH2zQxd59LnQY9gQAufRNdciDbJzKwXnsop9Viav5avnu22RN+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB3923 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 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 > /** > * This struct is allocated as AVHWDeviceContext.hwctx > */ _______________________________________________ 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".