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 B4BBA42AE5 for ; Wed, 13 Apr 2022 06:05:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 866FC68B366; Wed, 13 Apr 2022 09:05:50 +0300 (EEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5BA168B272 for ; Wed, 13 Apr 2022 09:05:42 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649829948; x=1681365948; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=GxYMP5XbypLHK1QPMV+E9aeGodAnNBoNkU+SsLgsUxI=; b=ZE0sovymqhuQN8P8BaMGEHaveaudLUaCuz5RQFeQ4RK3dlAFbxOxpMQR EHlXzZksRTVpJiFe+/YNc/Q4+YgV+rJ6zPf2I2CcC2K+PN4fdkLpQDAU1 rXyOMIX+2T7op1coIjVnQA2fDK2oU6n9Y6BMtU2691eeECwe6yFPIF0Tm ZFmHr6O0G99WkZDC6vIq9r4RmA/3zkefFunmesMaBBRxPqK76z/OhHrj3 sSF4HG+gQcYzh62rW5/LBzwZRWtKFsdJqhLIsNmTotnjUUDkI9dViaTpc f3uxSq4UnEXvbHiuKyjlbK0wTThaaWLexXi4+G5nujV35+MVL36RWKR9y Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10315"; a="262763693" X-IronPort-AV: E=Sophos;i="5.90,256,1643702400"; d="scan'208";a="262763693" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Apr 2022 23:05:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,256,1643702400"; d="scan'208";a="573127594" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by orsmga008.jf.intel.com with ESMTP; 12 Apr 2022 23:05:39 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Tue, 12 Apr 2022 23:05:39 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Tue, 12 Apr 2022 23:05:38 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Tue, 12 Apr 2022 23:05:38 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.100) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Tue, 12 Apr 2022 23:05:38 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BBrxukI6z0I5c/cuP3ffke9rT04dOtNB3OB7ftmsZVBvAb2SYFG0v/xsBb5EihJBVI2WdjFhK/rMBvcTQW2Q/c2m3oY4jTxNG322BruQSaKasEr42CsXq6/TrEvxLIoORS9UPuEvfinQ/eE/oK4+4zmZ/5SkcQsDVpgNdSIOGwlMxeHIFMXizoqme/3INP0px21wU0pe1W6WawG0OJoEz7UWn7O+2mBYQX9Bv1g9ih0mQHEySsPl11baDZYa/mJbDpoYsSrgFPG0Ibs3SbSydJyX5wijfqpfLWjBYu9kqtgQJm+nQ17aqe9iCzttDGbvTCspww43BdnqWEBStTH1SA== 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=GxYMP5XbypLHK1QPMV+E9aeGodAnNBoNkU+SsLgsUxI=; b=SBLCEa60AqtDNULuQsm6m1nPjeFpRB+5qDJn2lDzO2qq8ukiGJHlN+n4zrPdafLZgvR9TSX6JeFJt/1Sxm5TgGyylMInSwGqRbG3mJtPUdNZLYlPG/tO8UM6DuRGfAog4dgtm3l0DxSM11Qu78bdKdwwIKDuVA1dpsGgRSs4BhNPAIF5XWD+xz5bhjozwSqVWjaEj9BySDUk2O22cXafuUG2JUsi0UntlsFLaWb5T6atngvEdAI5G0Z53ALmyLaRp2JLE10hBi+QpqfeyxWQho0cuUtrhxPpfpZj/qNl7N0AB06QMBV3cTfLagyE3DSMAKkTcwC+kcSNXLCBGkUuRQ== 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 MWHPR11MB1344.namprd11.prod.outlook.com (2603:10b6:300:23::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Wed, 13 Apr 2022 06:05:32 +0000 Received: from BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::6534:444c:a75d:4bf2]) by BN9PR11MB5515.namprd11.prod.outlook.com ([fe80::6534:444c:a75d:4bf2%7]) with mapi id 15.20.5144.029; Wed, 13 Apr 2022 06:05:31 +0000 From: "Xiang, Haihao" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH 1/2] libavutil/hwcontext_vulkan: Fix VK_FORMAT_R8G8_UNORM and VK_FORMAT_R16G16_UNORM map problem on Vulkan Thread-Index: AQHYQ+g4AQ4n7cvOJE+utfRVVjmvT6ztcSQA Date: Wed, 13 Apr 2022 06:05:31 +0000 Message-ID: <344f7c5ec0628329e97fce3201de7e84dc6a4732.camel@intel.com> References: <20220330034151.834450-1-wenbin.chen@intel.com> In-Reply-To: <20220330034151.834450-1-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: 2428e37e-0f87-43c1-438e-08da1d139dff x-ms-traffictypediagnostic: MWHPR11MB1344:EE_ x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ynhMjq1fIyw+cE/Cr9rAspdHzaZqlTIyca2p+XcLJwRteYSOnlXgMk27YJv6RDzeqpRgp75vC3cZAFE8JUl0nMCIASGUt469BTr53YfeGB/aIdD2QeiNK2Goy+5M/vcSaCsf3L9WcwIyJGqlve+bP9zXA0fg9NmG1yTV9GorH6NyK8DtxZcjtK5m9+xFnnAhcQbfWSHSd4oVlOJI815CwLDuXQc2LfPm8SH7l8iukhfROobvJcq61QNBkO3MfqBFmVeDX9zIqnEM+xuj8GLgOI/C4e8u0BWshxTTfrTF62fEqz4TKHQGxogxW/YKNhMf/VbFz9rMjHgsJCIN7HkfPqVjE5ynBErWmGxCcVpU1CDL0Tgk8H3U8PlNXPWbi9GQtB9F7qCDA2OkGPvWY8zQv0wl4g2/5CBavSJFI414BZUlGaZSmLmdA7J8rPFLls8224dV+v/TetiU1s7q8kFzk7bJdMT66itWdWmKAtUT+cGv0ZK/HJlCXzl/UpY7Fk0cf9n3i6cwBt4WYm8vJL6Kd8FeU9paVfKDQ3kn1gxEts3+WMP4z2MBoy5KGjU7fPOHoiDnJCXsCrkBGgw4e+qlHoP+qg4qTv65j/obLH+zStUSadBe1LYiuk77IjSlVOF2NwW591nxPS8DNaxWgw4JRZHxW46lQa+uHtO+xY3DNDOm0obpd1DhgzT+zA7VaejJQYUoZFIH2dCvI1VnVCBfNfdi2wtr3zfOhMN/6XU8eRE= 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:(13230001)(366004)(38070700005)(8936002)(91956017)(5660300002)(71200400001)(6486002)(66476007)(86362001)(508600001)(83380400001)(122000001)(6512007)(2616005)(26005)(186003)(6506007)(66556008)(66946007)(36756003)(2906002)(76116006)(64756008)(66446008)(82960400001)(8676002)(6916009)(316002)(38100700002)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?a3Fham1ZYi9raDRDTmtQbm9HUXhjTktRdC9nNExrY1ZIOStuaHRTTVlicksr?= =?utf-8?B?Q1p2SGZzbFJPaGNUeEJwUmQ3VUlYY1J4My9GZkIrckxybHYzLzZtQ2xtS202?= =?utf-8?B?TWQvSHVvcGdleEF1cklkVmF0U1RieVRJNG1ZeDZpWGVDUVdOdGZueGFEVWZ1?= =?utf-8?B?WHNycnpBVWxRb2F1RHNYNU9BTXVjUE5aaTU4VDVod0xVc0ZtSWU1YTlmYTBG?= =?utf-8?B?Z3h2bTVqaHkyQ3RpY2pHZjQzdXExMFdFQTUrSW1wcFQvNGN0ZkFGVmFaTkQz?= =?utf-8?B?a2JmS1cwZVpyalZVU1VQWFRldi9QV0dtUWM4WGt6WHYwbTYyLy8zVnQ2MS9n?= =?utf-8?B?dVBzUTRTWWdTS2NFV2dqQ0xtWFJnSjBlRFhwSGs1Z21GZjFyVi84Z2VRclBh?= =?utf-8?B?NTlucVdOZFIxalluUlY2RHl2Rkc2TmlpVld2b2NSckhuS2hlZE9HWUZTSUcy?= =?utf-8?B?cTdCWExURVh5c3VENzZEbkl2L3BrTVFhY3FrZGJVdngzTzRzL2w2eEszZERq?= =?utf-8?B?UHhCdmhxRE5aekNSODBFVDVESmd2VncyMWNIRzdmUlpMcjNqNEFPMGQwL3Qw?= =?utf-8?B?NjZOVHdwLzlpeDNhT2w2WUY5VWF4QzZyQTJyNXduVHo5ekpzSU0wdTQwUkI4?= =?utf-8?B?bmNhcDNEcUNodzBsdUVXREJkZFBVMmY3U1dnQTJ0T2NLbFVKdWVQY3RKNDBj?= =?utf-8?B?RHJ2by9qeEJialV6STRqVVRhUDRtQlFqalBMN0VlcndERE5SdHN0cjlTY3dv?= =?utf-8?B?bGV5MGlJSVJQNVMvM3JOUWNaZjAzdm9ra0ZoRFhuSmxqL3dERzZ3RGxwdTl3?= =?utf-8?B?QVdXbzRZTGFsZllwR2xTYVpic3hMNldzRDFINTdvRzE5ckF3NUNWUTltTWdy?= =?utf-8?B?SytHNnFXRzYzM3BYenBqdVpJL29wenczQWNRaktVd0gzVDBFbHgwRnNTTVpj?= =?utf-8?B?YmYxeFN0MFhwVmJnekRCTFNOM05aalNSR3YyVFQzTkU5TVBVK0kraUdWVlBq?= =?utf-8?B?djJFQ2JOQlNzYjZ6RjRZN2htTTRoYzJqSm5LNVplR0xJeXM1eEx0ZE5LRUdi?= =?utf-8?B?RFdQUnBRYUJvZFoxSGFxYjNmVTQyMkFzSnVoeTlsYlNNaTN4a1h5aTJNWXBN?= =?utf-8?B?alhXUjV2UW0wN0hiajJOVmFFNDA4QTRQSzNrWWtRZDlRWUhlc3M4THlrV1NJ?= =?utf-8?B?T1BFSkF1SWx0RURhZHVaNlRrZWRzYmNTRzdOSVpQbE03SnVCOFhMb2tENjdJ?= =?utf-8?B?OEN6Tlg3RjEwc2pjbjhjQ2podU9ZVUVLVnFpQ0dGdXBxRW53cEsxL3d4cU5T?= =?utf-8?B?UWFFZ0ZHUTNlTGpZQnliUnIzOWN2bm91Vzdkd212Yzk0QW51dnBLNnpXM1A2?= =?utf-8?B?UEhGaGlvTXpOUURuQXQxS3Q5ZEFNa3ZDL1QwblFmU1B0WWhyR1JBRkUybXY2?= =?utf-8?B?cU05N3RQM01qQjF4YTdJNEFVaFQrVDVTOEVlRUxPSUFKeWNpbk55Zk5HQzQ3?= =?utf-8?B?OGw1YlFMUlZDSUV3UFAyMDQySU5nbTNuekFlUlpqSitGVTVBd1JVVWlMbDhE?= =?utf-8?B?SnNVUVk2aFluakQyQmF1RC9vV3V6ZktZSmN2QU5FNzJnTmJOS3IxMWRUQUh0?= =?utf-8?B?RWlFZ0NHWEhHTlppYzNTV2xTMXpJUXdjLzEzdW1KUnBNQ1ZWQW42WDJtQ2xx?= =?utf-8?B?NWFGWS9PUlJva0NTanhwL2RrL1ZIUHU1SEphWlVHUjB3eWNnYUpGNlJIMEEv?= =?utf-8?B?ZVZWSXRzZzI4Q3NkQ1ZqYzZmSXdnb3lURExLUDFTZmZnOUxZbzI4Q1NVeXVK?= =?utf-8?B?VHA3WjhlbWREaDZlQ2FCN1J5ZDNlQTRBWjh5UytteWswV0w5L2VSOHFMOGtD?= =?utf-8?B?MGNxbmFUSUwzNXBtSFgzLzBaR3pxM2tyb3hNcVY4M2NvWDhLS0dFeFNoVzBh?= =?utf-8?B?Y211enVFWjhoNDB6R2YwUGx3Ymg1MCtjVHk1YzFVdHFOU1UxTG1oWHRtTlhl?= =?utf-8?B?RmcwM3ZYdCtLTEJobkl6ck9VWVlQYTZ5ZXRRMW4xSnZiaWd1V3pFMEFwckpY?= =?utf-8?B?VXYyeml0MEVIQXNzTlBCMEdraXpYQXY1a3YzNXB4UlZYZU9odlVoR2QwbWMz?= =?utf-8?B?aDVURm4zQkFCL0hFUTNEV295RTNvRHJBeGVVcHNtR0FFNDJXNVRYQWJVL2Fn?= =?utf-8?B?bnc1Z3A1cEZWbm1GckVXNGJ4eHp1cVhwSEpSbFhiY0ZKcVZEcU9XTlgwS0t1?= =?utf-8?B?OGpMUnYwUFRVMzI0dS9nR1dnSFNYZVgrTWpUKzNiUjRESkd4Z05FSXkrcjdE?= =?utf-8?B?cWZpdHdwKzFMZUtGcVFtekxGMGQ4VFFnYTQyYWJIaFdjVDRQMFlPMmVzY2lQ?= =?utf-8?Q?MlEw8z4OG1hh1cio=3D?= Content-ID: <2656174DEB251D42BBBA843BAB48C692@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: 2428e37e-0f87-43c1-438e-08da1d139dff X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Apr 2022 06:05:31.7745 (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: Bvjl3cXAa60hR1E2Bt7a+je2rNaoNijKmlypql1yupuwtAEHVZg1efZyPiUHnAFdDh4IAplC8OzLX9vf1Opb2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1344 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH 1/2] libavutil/hwcontext_vulkan: Fix VK_FORMAT_R8G8_UNORM and VK_FORMAT_R16G16_UNORM map problem on Vulkan 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 Wed, 2022-03-30 at 11:41 +0800, Wenbin Chen wrote: > Vulkan map both DRM_FORMAT_RG88 and DRM_FORMAT_GR88 to > VK_FORMAT_R8G8_UNORM. This cannot distinguish nv12/nv24 and nv21/nv42. > Vulkan also map both DRM_FORMAT_RG1616 and DRM_FORMAT_GR1616 to > VK_FORMAT_R16G16_UNORM. This causes issue when map back. > VK_FORMAT_R16G16 will be mapped to DRM_FORMAT_GR1616, while p010 need > DRM_FORMAT_RG1616. > Add sw_format check to vulkan_fmt_to_drm() to fix this problem. > > Signed-off-by: Wenbin Chen > --- > libavutil/hwcontext_vulkan.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c > index 237caa4bc0..791649001f 100644 > --- a/libavutil/hwcontext_vulkan.c > +++ b/libavutil/hwcontext_vulkan.c > @@ -3290,8 +3290,17 @@ static void vulkan_unmap_to_drm(AVHWFramesContext > *hwfc, HWMapDescriptor *hwmap) > av_free(drm_desc); > } > > -static inline uint32_t vulkan_fmt_to_drm(VkFormat vkfmt) > +static inline uint32_t vulkan_fmt_to_drm(VkFormat vkfmt, > + enum AVPixelFormat sw_format) > { > + if (vkfmt == VK_FORMAT_R8G8_UNORM && > + (sw_format == AV_PIX_FMT_NV12 || sw_format == AV_PIX_FMT_NV24)) > + return DRM_FORMAT_RG88; > + > + if (vkfmt == VK_FORMAT_R16G16_UNORM && > + (sw_format == AV_PIX_FMT_P010 || sw_format == AV_PIX_FMT_P016)) > + return DRM_FORMAT_RG1616; > + > for (int i = 0; i < FF_ARRAY_ELEMS(vulkan_drm_format_map); i++) > if (vulkan_drm_format_map[i].vk_format == vkfmt) > return vulkan_drm_format_map[i].drm_fourcc; > @@ -3373,7 +3382,7 @@ static int vulkan_map_to_drm(AVHWFramesContext *hwfc, > AVFrame *dst, > }; > VkFormat plane_vkfmt = av_vkfmt_from_pixfmt(hwfc->sw_format)[i]; > > - drm_desc->layers[i].format = vulkan_fmt_to_drm(plane_vkfmt); > + drm_desc->layers[i].format = vulkan_fmt_to_drm(plane_vkfmt, hwfc- > >sw_format); > drm_desc->layers[i].nb_planes = 1; > > if (drm_desc->layers[i].format == DRM_FORMAT_INVALID) { Patchset LGTM -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".