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 D92D84286E for ; Thu, 5 May 2022 12:12:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7113B68B2F2; Thu, 5 May 2022 15:12:14 +0300 (EEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11olkn2019.outbound.protection.outlook.com [40.92.19.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8E6768B2AF for ; Thu, 5 May 2022 15:12:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gur165+5LcM+pbCc599+1GlLHTumJFPkkoLmo5Ulx4zFiwaK8bnWrsnO9He0XyNn9MsfjuWs/pRqG/4vcU+pYETOe4uO9sjDIiPgVoHhagdG+iqv11bCcX3u54jwLdTsXGirY9QUyIfp6H2jHz0p2dXCgWQsGUJ/f5deWHwHOmmphY7eiyRyN2DdNR25qCzH3nVWMKJQTtYuwmN2+pM235fJqNLO4fLBbYpwb9k4ynMoGYR0fNJMZrgRue87P2tpgKPAc5Xlj6d+GQbRxxmaO6FEke/RrYqpaQybbrYKWKJJ+wA5k+sY3GHNdQIc8ENe+T598+03HTTh5kD3bJ46jA== 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=xQcRfAEViAHOP+sWCiwVVM0QAyoU4jY9bIbY5OLqgMw=; b=bXe8r8+pmOddosnoWNlZF7gdbmea7VRTxUKP7Z6JKnBIK4jlfh09bWdrpUkmRdsrx1Kki4r8vPj4ufozpdafXc8ExncEV09CFu1OSGvKpRToRvBjOA4SYOO88jNd26ehz1XdGzWbbKhBI2qPysskRPmhcRiRAcL7FEBj8X78n+ZzJC+U16sdG6At4JXMJaZcQIex9Me9E5EUP5/Aj/OZtZON5T0csVp3PhUZM6B1cVDUEwQSg+nkutKzX+4HTfE/82kyqWPFz7nh/bttj3TBgD+vkv4r0NCUfCw+dAiSli2qEP/AKhH29koV5MZshqrhxCLfzm5S0wOt1mJS136b0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xQcRfAEViAHOP+sWCiwVVM0QAyoU4jY9bIbY5OLqgMw=; b=O6ZEwmggFI8L8onNi4BUSRYhv/tY/ElksN5eB7ZbAHFbzairL8RyjcyjNzvkUrngNseJivuotqXnV95GEnuigmtOKhPBtBXprZ3s91xMocSuzdoUj8kz92E4kL/4g/FcaUnurBQ0E6tm+Fw/0u3ThrGhylfr0C/vUibVYK3ePJOMDwNUZotY4W2dZM65cWJQl6PWAoiB7BX0AFlNMD8wek0DRmzTygzQ8cnzqBpUVH6H+BTlnk48ZOpLPCKZ+GLqtqP0s/bedK7QFtD+6ArxTehF0WCPm9p1d5YZ7xjiYITroEGRX3IyZ+uQ36QBDuXK8bposB4VnL4Uyu+gCJRG3w== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by CY5P223MB0443.NAMP223.PROD.OUTLOOK.COM (2603:10b6:930:29::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Thu, 5 May 2022 12:12:04 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::7472:6f83:eeb:45e3]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::7472:6f83:eeb:45e3%9]) with mapi id 15.20.5206.027; Thu, 5 May 2022 12:12:04 +0000 From: Soft Works To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH v3 4/4] avutil/hwcontext_qsv: map D3D11VA frames to QSV frames Thread-Index: AQHYYG5qhHJItvXFP0etWp/LUFQYYa0QMJsA Date: Thu, 5 May 2022 12:12:04 +0000 Message-ID: References: <20220505105318.716-1-tong1.wu@intel.com> <20220505105318.716-4-tong1.wu@intel.com> In-Reply-To: <20220505105318.716-4-tong1.wu@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-tmn: [1nCYvQcNbJDcbHyCbK20j/m7pJSYWE+t] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 669d6886-e75e-4d04-7082-08da2e9077d7 x-ms-traffictypediagnostic: CY5P223MB0443:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: aZyS+x0wMNLiN+tno+DAd4LeBEG1b3Q8f3NJ0i99Nimvo+Za2/idOa9XwkfPHB2PZR1b/SEHVbgGUHrKy0/bMr6ql9v1atk2CgfVnT2KMN1h6UaUxFVAnQKlC+x2O00Carhs3WTVUe/5/KIrgP+q4yOuB5zxv6vCdpOmnn+YDkJnyZcxshQI82ViUOThqw5LVwSsJqSMYd0+JtpU7T+dPuVv6JRPS8k37/NWrlHt8/I+BPQI2kSRONNQQqUR1KgvuoAkt+bnAM0ROe9q7SarN08grV+HJmBUQkmcQB4FjDDikmnKxygoJgWDZ67AaQdDJY+qMS07hVo2O3hW6i8Rn30jmIzYF8cSKz2+4LSnT79kKgtGgEFOEBKJo32tbS2BQ+esDCAKvOYpgGmaXh8d6buAepEitzxeMc0E+yoFh3owoEozL6vf/Jf3dZYA90O4w8zdMS1sOZg7ItPXZeGikDONerWCg8x1sdMnKK0aag781/mmYGQq0WTfHCR+wJIwlT2WqtOb41jLLZLeWAwX3qpkJE2AmHZ7arEWTcrf9kDRtuxK+lcGeJiyrf2ZdxATB3Xh+RWeXbTftkLEUcSifU52vAR/ZNLcN3uhGfalFojQLEalTryNk//NsUkPjiED x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?ZjZlVlA4aGREZ2hxcnNnUmlkV0VWdFppL1NFNWkvRnkxS0I5clVaU3Iyc1k1?= =?utf-8?B?K1hEUE91VnBZcmZYMEFrNmpreXNOa0U0UUthYncxYnp1cVlGUGdONys0cm5L?= =?utf-8?B?c1ZBNkZhWm5Zb1VIWGpBSS9Yc1hCMGxsOHk4YzhyakN6Q0dHQWwyZktxVDNO?= =?utf-8?B?NkhVWlhUZ2Q0a2pSc1h3Z2UzR1dBLzI4bXBnSndGdnJNZFBldDk3QWc3Vkls?= =?utf-8?B?UWF4WDNGbHJISnEydEtveEpnbXpFZitkRTc1dndRaE1IdFFoQTVoU3Q4YlpO?= =?utf-8?B?MlUva0UyejR0aEk1U3hqYkljcmI2eDdtb00rZ1dXbEcvaCtRc0d3WXc1TWFt?= =?utf-8?B?NFRhUTdLUzBGYUoxaDZDbGtXRkliZXJXS0JFcUc2Z1pnb2hsQlR2eTJwSlMy?= =?utf-8?B?cktLcXF5WGFtWDI3NVdJS1dWQVBuS0NNUm9wU2VQc0ZFdEh5NzFiWmJIaDV4?= =?utf-8?B?ck50OEdMUDhrTjhEMUVyaXBXY1lneE1ZM2RPUU1RcmdhcU5qRTNsdk5yNnk2?= =?utf-8?B?T2NoeWg4WE5zcEoyM05FRkpPcHhoayszeWFEcVdKR3BWdFRHcUVGOWZOTXVv?= =?utf-8?B?VmlhV0lwRStOSy83Y3hzclNDaGdvclM3RDFJVVV5V1dNRThINmlhbXlIZ2lt?= =?utf-8?B?TVpveWhSN0s2VlVJUmdna2lRV0prRFdxc284R1BEM3phYlZZWVpGemJDSUtU?= =?utf-8?B?Vk1Mek5LL2Zva0J5S01mcWNiVW92cTZuc0tSLzV0Q2srTTNmK2ZrdFlZZm9W?= =?utf-8?B?SncwNEVvKzdnd0RxVHc3enFZNE5RTFQ1cTE5N1pheWtEY1I4ZGVMWDcwVy81?= =?utf-8?B?QUNiWmRWWGtoWENsVmxMbGhKazlUbzI2aG5zSW83b0ptRXRhNDlidm9aekVF?= =?utf-8?B?VzFPQVA2OWdkWnVpcnRRVmcvYThzTncvaWQxam83Mk0vWHY3MHFrVWFVSnFC?= =?utf-8?B?b1pxZzJzb2tFTS9hTDZ1UkNHUnFxa21YZml2OG0ySjEwS2RvNHZWdHZSN2R2?= =?utf-8?B?dTN3ak5pMXg4MDc3N01jSUNmTXJ1Z0VSaUhvZG5RWERBWjhpb3N0TTcyam5j?= =?utf-8?B?NUEzUW8wTW5JRnVHNXYyOHZJcVR0dmlEM1kvV2tOeklYeENpcVlGNi9YWkQy?= =?utf-8?B?MHJLbkNVVGVuYjU2MTVDUFhwaDEvMW5mVjBJd3NUTHBkUmFNZHVpV25QNy9I?= =?utf-8?B?d3pJZzdJSTl2Z3ByL1dveTNzbnc2NEFiVmthTEwzSUNPbHFra004bFI4b1Za?= =?utf-8?B?b05NemlOQWJZUnpLNm1zZ0dSTllYS256SVFTR1I5SG5OSnJNeVpyU2E2UEtV?= =?utf-8?B?WGRHUmRHNXF1VjlXVUd3d2tXRytOOWpOQTFyN0xtUUlMYUVENnlaLzZTaytk?= =?utf-8?B?NHdtT3UrNXNPZGw2U1RMaXFDZDErcFBKSDJKM2luZnppOWhUTmpHUVlHRkJE?= =?utf-8?B?eXk1TmtTR3hSeXFIT2UvcktMVzdQSVR6WHo4QXQxZ3dLeW5TdlRNM0FWbVFo?= =?utf-8?B?aGdvM1NOUWdVbnd5enJsSXVtMGd2Y3hmbDdJekx6aE91ZzZUWExzdGlaSHA5?= =?utf-8?B?QXRBRkpjZ2l0ZHIvTlNuNlRKQ2JGeHQ5bHBiRU5Yd1JoMU5LOEVxYUJJM1Vu?= =?utf-8?B?RnVrTlRMNDZuVGlhQ0ZWaEpCSEtFR1puVzIzdVRKY3RiTnZ0bWFlZXNscm05?= =?utf-8?B?VUIreDE1VlQxaldYZU8xZkljUlZLTTJmcEF5K1dzUnRiRGE1QXYzaDZMVUZo?= =?utf-8?B?TXVod2llSko3OXQ0YWQvWjh1c0pXVHlHN2dlOVdxMGd6V2d6Nm1tbndOSHJC?= =?utf-8?B?T3R3dzk5cUZSZGs2NlVTSFRhWE1aNHAvQnZkZVZCemhudWJxaEQ4eC9TejVH?= =?utf-8?B?SXNJMUVKb1g3TXgvM0hOcDFBUkdjcG5ISzdpR1BMY1NZbGtDaFdFakRINlU4?= =?utf-8?Q?22Go+45p/g0=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-1ff67.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 669d6886-e75e-4d04-7082-08da2e9077d7 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 May 2022 12:12:04.6496 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5P223MB0443 Subject: Re: [FFmpeg-devel] [PATCH v3 4/4] avutil/hwcontext_qsv: map D3D11VA frames to QSV frames 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 Cc: Tong Wu 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: > -----Original Message----- > From: ffmpeg-devel On Behalf Of Tong > Wu > Sent: Thursday, May 5, 2022 12:53 PM > To: ffmpeg-devel@ffmpeg.org > Cc: Tong Wu > Subject: [FFmpeg-devel] [PATCH v3 4/4] avutil/hwcontext_qsv: map > D3D11VA frames to QSV frames > > Fixes: > $ ffmpeg.exe -init_hw_device d3d11va=d3d11 -init_hw_device \ > qsv=qsv@d3d11 -s:v WxH -pix_fmt nv12 -i input.yuv -vf \ > "hwupload=extra_hw_frames=16,hwmap=derive_device=d3d11va,format=d3d11, > \ > hwmap=derive_device=qsv,format=qsv" -f null - > > Signed-off-by: Tong Wu > --- > libavutil/hwcontext_qsv.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c > index 27eedef5f8..30d3360d42 100644 > --- a/libavutil/hwcontext_qsv.c > +++ b/libavutil/hwcontext_qsv.c > @@ -1885,7 +1885,8 @@ static int qsv_map_to(AVHWFramesContext > *dst_ctx, > { > mfxHDLPair *pair = (mfxHDLPair*)hwctx- > >surfaces[i].Data.MemId; > if (pair->first == src->data[0] > - && pair->second == src->data[1]) { > + && (pair->second == src->data[1] > + || (pair->second == (mfxMemId)MFX_INFINITE && > src->data[1] == (uint8_t *)0))) { > index = i; > break; > } > -- I think this patch should be squashed together with patch 3/4 because mapping is kind of broken between those two commits. sw _______________________________________________ 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".