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 06CD840AF2 for ; Mon, 27 Dec 2021 03:13:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 840F368B072; Mon, 27 Dec 2021 05:13:35 +0200 (EET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0EF068AF04 for ; Mon, 27 Dec 2021 05:13:28 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1640574813; x=1672110813; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=YmiAKu34yWp2eWroujaB7vG1CAzGjC1tCcBRRXb6tKk=; b=gRRuwVUiCw3vUicMVDMsqbxO3+qHUklHHzgwKj/MmyrpY89wEfZ9SI/C dvohBWx+Gk6odhBtMwFzlD3RLT94osCMQoENZ3Ijno8+5UrHN0vmtsYC5 Z92P+wEg7cmcx1vW3ux40kOmPg//wWK1xzA9bu6RNF0H3Q+sxcZlY78kk liqMxWoefgNSVHjayoKyQT7APIJtNuwr9UlVw7cOngCqgFa27sekobltM ZDEpsdTe5MG4XGr8eSjEtqLOaLYPx+e6GZnq55DbwLd356xG3J5eL7dza WK1TU6plGFV7lTaZoFRstxGSRa/A12zWMbpVDPjLz4X8CYPeqlqFhTst7 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10209"; a="327480057" X-IronPort-AV: E=Sophos;i="5.88,238,1635231600"; d="scan'208";a="327480057" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Dec 2021 19:13:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,238,1635231600"; d="scan'208";a="686155110" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by orsmga005.jf.intel.com with ESMTP; 26 Dec 2021 19:13:26 -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 19:13:26 -0800 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) 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 19:13:25 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx605.amr.corp.intel.com (10.18.126.85) 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 19:13:25 -0800 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.172) 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 19:13:25 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mFN9oELyrkMvaNBUHJ8A5e3869N5yHat5kzSd8RzFDeqhLGbe1TWAyxehUeuJViPoi2GyYeis8JdVcOx8FmaRGh5qbandYrCv4jRd+Po6EGOPifL2mmMVFyuN4YUp2WUllkfSca3SpJ46WLpCyxm9JOef0BY7ZTigg0d346+B++y/w3kIVbJPX6s1bYHwdbSSWleugH12EF//MjLGVi9JPxYQtxCnMmVweTPXhO3uw9PWYVS6nb1+6D5zpc1DYDSe7VO/1ckiq00ImBECsaaDTwQhFo+Em3XkM2+/6sSuWU3KKFdmbqHRNC2D+dN9DMcN8dKPDDVADjtml85yHDeYw== 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=GJ371sUuoKQkv4IUQ6iDiWBFOcHcviikqm4gqTGjK9Q=; b=WcZ4L9DuN05J+DRWIUm9HkABybkT9je5zUMpYvP7JBgJx5cToUpb7dbixxjcPRT6UhjuVyrem2V0ZGrO3ExbckueshqWgNLj7tq8kQhsgqlsMxa61VWF4DKUim+kli6xbueiJadl6Bm/a8bVpidGrD98EziOhU/cm4t2HGME+n0SP3j/HWNzu1PdhlAIiudg+SdxpUIa8XGqaV1OCIwOfIcRGDa/eqp09QMuB2XvutxQ5vFITsHzlPRMwEu1nGVx+nhxHrsf3eZXnaRFw0lIOFdCwNK+fc2xjFTS44UhKMx+Wk3szu5aSHUU3+c4geos7kpwMGXjfzlJBDP05zVo7w== 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 BY5PR11MB3879.namprd11.prod.outlook.com (2603:10b6:a03:18f::17) by SJ0PR11MB4989.namprd11.prod.outlook.com (2603:10b6:a03:2d9::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.19; Mon, 27 Dec 2021 03:13:24 +0000 Received: from BY5PR11MB3879.namprd11.prod.outlook.com ([fe80::550:e7c7:13c4:7e0f]) by BY5PR11MB3879.namprd11.prod.outlook.com ([fe80::550:e7c7:13c4:7e0f%6]) with mapi id 15.20.4823.022; Mon, 27 Dec 2021 03:13:24 +0000 From: "Chen, Wenbin" To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH V3 2/2] libavutil/hwcontext_opencl: fix a bug for mapping qsv frame to opencl Thread-Index: AQHX7Yg5sdzqR77/Zkm61td958qVx6xBPHkAgASHrZA= Date: Mon, 27 Dec 2021 03:13:24 +0000 Message-ID: References: <20211210053818.3815652-1-wenbin.chen@intel.com> <20211210053818.3815652-2-wenbin.chen@intel.com> <60b6d3eb91e2ebb0f7fa7449deffbe7886553668.camel@intel.com> In-Reply-To: <60b6d3eb91e2ebb0f7fa7449deffbe7886553668.camel@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.6.200.16 dlp-reaction: no-action 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: 34a3d755-1d11-4375-826d-08d9c8e6d83b x-ms-traffictypediagnostic: SJ0PR11MB4989:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: HObxf2ECIADg4rV05b1DaKUxwOR9bu9sGSFELA3iczt00TJlB0DsW48SagCjyf501eAP+sm5/FjJ3wBM958OtDuP7xMLIXYJTI5aF0LZyCXTLycXByMupjqZ3ZvnaxPAjHFHDleGRTkMiruR9aHL46DPBbq2zvekpR7j3EDIcQkO1GYzB72ySqKJ/3T2zG7VSGBJFqMiRu80p3rNIGG7lslkqlJigicDUFRsKnq/OpVim+b2vPAmMhwM6ydC7eufNz/iV/Tl4YiKUh7NEZSW93hk9gc/ffZ7RmrHVbmA6doG0Z8WO5SAacYDW54v/2RgaHc4wz/E4X3CwGHSJ4kFAJrpmz9LFCG5BbhZBfTowbSL0CA/qLy/FnrVYYbw7UN9J7OeGa+vNhSP2ZLhy43dqBSjgZ24FXtm6pBqntVa0w+PNpJE3W4q+At+0Ci2BI6BcRdVpiv4E16TT1eIlDGpymBPjPUXkxi/xzqmwQjHhiM4H89fNs3AyLGRO0PWPDLtkMnMoyHT5AJo/s5bBg1hh1T0NfE70GID7tbxG3OzB59aYzMpO0u/Jw5R5H6UefaIiisG67/NB11EavtKFjwYljdyXh50bjdISRdGiSmYD6TqyLucfB4oZYw7+mNNmdz5d1LKZ3XdOfCwLafZ/jwR15FY+tB/P1XQU44MmTgRtZAfb8Svi1sFa3NoyFLX0prFhGdXsvhRpKYOHNXSbsOwlGbuc/BC047ZApNDJB/qxDwDuiL+Gly9/4ZLBSOw+ecixDqmhfnPiYR89Mvw+IuV4nW9nppogsOWHkouC/6ai7M= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BY5PR11MB3879.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(9686003)(66446008)(71200400001)(122000001)(64756008)(66556008)(66476007)(66946007)(83380400001)(7696005)(6506007)(8676002)(38100700002)(5660300002)(38070700005)(76116006)(55016003)(316002)(33656002)(8936002)(508600001)(82960400001)(2906002)(52536014)(4001150100001)(6916009)(186003)(966005)(26005)(86362001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?hTIT6tu+FKuicBUr7518VcYP5gfAAU1RK0KxWRpcCeFYhYJZ7SFwONOD086p?= =?us-ascii?Q?iJvuz2bPqbsftp30fm8WSAhZoWUdJ6nnRSR6HeeOjrbEbogrs2EglV/nP0ZK?= =?us-ascii?Q?xT1MGVN/lLR16yywxuArJ1tNw/dl8Dd+6U7aIiGqfF/xJonpqrGUQjFy+yCu?= =?us-ascii?Q?3YTUOX/7KYKGuIq2JOpxI+BiCOweLCPSJ5EHC2OUhCBmRlypkV/0BT/YRCLt?= =?us-ascii?Q?vfcVt15ogCZDmn5R8qeFC/+NO/YQEbIsTtSD//WVAJaCOz9qaEfY/8LeLUs2?= =?us-ascii?Q?8WjkhFUHrGFsw9CD+ty+7NIAblUaRwZdNwvyUF1q/1NHbRGZmxa0RT3zHGX0?= =?us-ascii?Q?Ry8hApY/EcqzfJ7jXzI60RFgwd80+FeGjY/3unFS+eWmoFHdykyUjOlefxFl?= =?us-ascii?Q?z57ij98T0SP3SxtHKg1cQZkgfTu9RszTRaOd3zzZkxuzQVkZumTnMhKJ/wty?= =?us-ascii?Q?bI9k24zT7idsp/8/q2K5QljLNtMXsXJVqKQWFvmISdFV6ixn4BS5WU3iHOQJ?= =?us-ascii?Q?hwEOITFCMMsdvisU7MVmvPRBEKYlXTAzL7SQi62EMdD/jYSO2IH+9Ja3iBI9?= =?us-ascii?Q?SywCTIPZVS7pDdyuQfYo8XBKZhJgMQedb0RBzwgHKSvfC3tD7l0gxwJxhYLr?= =?us-ascii?Q?ChQBiE8J2YKd+7LdPKAJ1ZF0+60Oo7ppPODxn8bPf+8e3PxzqrqfoxIwx9aO?= =?us-ascii?Q?GYkRRReD0qy3XuB764BmVbVG7i5EJhJFigiR74JwX+IZWQn2iwgqGS2nXahw?= =?us-ascii?Q?iZFKyOmfisnwRuA2T0DZoc6yqPtXhQRgVRuha6wMqT4gHdEpWDm+Ro8vvvoI?= =?us-ascii?Q?MUU+i3hM3Pj9xHGC0UMh0efJc1SxSOvzhRuCm1LoU5G2G7tEHzsXvEf/KeHJ?= =?us-ascii?Q?mtgEra2p2xKXlOVOvnUAFkx4XsegXDT103WvgJmcZ0dZkfHqqyMLcGRAzJyn?= =?us-ascii?Q?1pgTvgCKDtTxPaCMnSF17msqJXefNaUKoY3YINo62FDLuDY4Nn5MylK8qUVd?= =?us-ascii?Q?HIKWyHyD/UNI8KPpy8GAmTNLezR/9DQLDPQOW9US3sQPh0OjwuY2ZZrfHaO3?= =?us-ascii?Q?PtTgb0fvrfidwh3gD0KyjAaYy4h11h6N9JcFOaDteIRgkr4sMAr1gkR4qFps?= =?us-ascii?Q?UmlebY5jol3Oe/zHOjWgBpIw4bVgj/FUdr9TftL/yxTzUIvcXm33twD35d8g?= =?us-ascii?Q?a8QGcfEgYIQlmvH4idAbt132lbbWexcDoNqJz2CLJ130Mq53U7QTf2qBpq/U?= =?us-ascii?Q?+PrsrOaaJiZrmvdHztyOs/TONaCl2Ekjl3IUpXMFgfYFRGaqWUXuxVrzTmT/?= =?us-ascii?Q?WbiJW6OBK0Tc0MY41q4nRa/r5acRmpCzbqPdbLtQ1R+iwYr2M0RDk7kfL/hr?= =?us-ascii?Q?utdEVxYbRGduqx5567pD4ILU8fx6V+v8aK/MvgwoBGlPqs8RgpTEdAooRGID?= =?us-ascii?Q?NtoLjsKvdGThv29pt/KAcUFe+a0KM0O3dBE5IUobRzI3JhLMqcufiZ7iTf0o?= =?us-ascii?Q?0d1L63p0B9EJV7RLj1pzHyUBlmdsgwYNipVUNSL+cfGyUj/10R7bi9z6znpl?= =?us-ascii?Q?MbX7BBhJMtEZeLXW2W15uYa+A8Njw1VQp18wtcWWvH3VI+/KjHgesB/XDZfV?= =?us-ascii?Q?ZovdzfiIZlO6CkfajIDnsOc=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BY5PR11MB3879.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34a3d755-1d11-4375-826d-08d9c8e6d83b X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Dec 2021 03:13:24.4354 (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: ykps4Miow9Ga456nrzlXTmV9WV7sQhzTTntLYlNdU1AA2pviZATrtlprmeZCRAcYdvrWYJPofWlB07zf5J82+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB4989 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 How about moving this to qsv_internal.h? > > > /** > > * 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". _______________________________________________ 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".