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 1088B43857 for ; Fri, 1 Jul 2022 02:11:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E53F168B78D; Fri, 1 Jul 2022 05:11:43 +0300 (EEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34AAC68B73B for ; Fri, 1 Jul 2022 05:11:37 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656641502; x=1688177502; h=from:to:subject:date:message-id:references:in-reply-to: mime-version; bh=xdEENxpDaXFM2sY2g2y5g3DEORdSDHgHHRkVxhdNuRw=; b=d0vAONXo+Af9h56f+8tHyrSXxPgvIOpmRyLEr5PxzAUAhWHP/egWM/lo 9cALUD5MMBTN1Hw8HfXo/abz0P6VPfH9IDQMImlRplD8AKju1y1c1Auak J4GPuWonO7W/dWYdvhMXPAz6UiiiNDFCgutntEmZaobQd5ojbXjkbg26Q +bD3cdlAJKoL8aYG3nD9FsuST2z+AHckITSPB+q6eJCjLID6r2jdTjJiy 9/QyupjblfRPG1nh5ckWXyzmJ2IG04wxSyzhJ3Cu+qqcj8Dsmdq9Tt3ig X954qwKmu5IJtFWhR0dcZi6OqlGk7RZ7HgChB91pzbIi53Nk9fOUPg+2P Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10394"; a="282559339" X-IronPort-AV: E=Sophos;i="5.92,236,1650956400"; d="scan'208,217";a="282559339" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2022 19:11:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,236,1650956400"; d="scan'208,217";a="589053022" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by orsmga007.jf.intel.com with ESMTP; 30 Jun 2022 19:11:34 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 30 Jun 2022 19:11:34 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 30 Jun 2022 19:11:34 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.105) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 30 Jun 2022 19:11:34 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gVa1T3SApOMHi9YY93qorlSM1oKucj8ansxFEVvjpecoiqnY9CWmuivot3V6yyqc1mUdEws+WnwQin19DGU5EzodpIzCxhmAJ8fSjjyREQIABhPaTH1xM4FpNBRr94aq/m0gPvhAQ1xzKcWrdvNZeUGWUykbf1jIirZpuYbposjjtwfpaUnhb8UMoLjs3F7hvZz2icZt+pT6W3o2XGwbxBMDBjkdjH/IpRX2g2M8O00urxRMfq0Iq3r+vebk6oBpFZYyZ/TE0IgJcRgqFDIIt58yK43ptQEg6ftCVH++l+wiJ6Djvt7/P0hyxx2VOTxQUrfaQ+TjqPhSqVBOsZylTg== 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=xdEENxpDaXFM2sY2g2y5g3DEORdSDHgHHRkVxhdNuRw=; b=CMoyYPZU4E9q1e4ecITWmISoW6MQ4ko4ZpIZaVXahMltwRFhHmvOkbwlVcqzBqp5ubFwKluRh+6Ewcwh9r34j3ZYEvonGwkUxKB48YQmdcFiMgUDJkIxAgLM5GJCp4fJpNUTHlNTOFsykp9yKBGklNpLTnDeuOk9zRby3a4JsMBFedIARgPPVnrHYDzn8XkFGB2tKtuVb+6s7RSgnU+x2GrAtRABDPkIuHKwzPOlnLbgGU2Ay1HFrtABvAqQrWOG/u6DBr04dnZA1+P5ElM///txvKjJzYwAE8EdclkQBtl//JFzhmD6ICTts79qeOAT5Odb3bZFkOASNSdkQd6B5Q== 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 SN6PR11MB2990.namprd11.prod.outlook.com (2603:10b6:805:cf::21) by SN6PR11MB2717.namprd11.prod.outlook.com (2603:10b6:805:60::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Fri, 1 Jul 2022 02:11:32 +0000 Received: from SN6PR11MB2990.namprd11.prod.outlook.com ([fe80::88c6:6be9:9703:f49d]) by SN6PR11MB2990.namprd11.prod.outlook.com ([fe80::88c6:6be9:9703:f49d%5]) with mapi id 15.20.5395.015; Fri, 1 Jul 2022 02:11:31 +0000 From: "Wu, Tong1" To: Paul B Mahol , "FFmpeg development discussions and patches" Thread-Topic: [FFmpeg-devel] [PATCH v2 2/3] avfilter/vf_hwmap: get the AVHWDeviceType from outlink format Thread-Index: AQHYjCu7qO+oLdLLlUe6WChKWbx5Ma1n1qaAgADwhPA= Date: Fri, 1 Jul 2022 02:11:31 +0000 Message-ID: References: <20220630024558.1444-1-tong1.wu@intel.com> <20220630024558.1444-2-tong1.wu@intel.com> In-Reply-To: Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.6.500.17 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: 881b3e61-81f1-4b10-e922-08da5b070421 x-ms-traffictypediagnostic: SN6PR11MB2717:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: +CFv0Oy7bdqvuWsJW3YrIGmnGeFh0WZa1K6ZmH1rAS5+dBqxZoQjLCuii806V+ICVb0ZtwfKh/BEBKoFumDqvsB9I/i6zBJ1pl9b6ljqd7fnXjtQjGqKyhxFbXPSrknmf4trMGl2m68G5Bh+ErXy578Mh60MhkpQtvh0xgLnlqpPBUZPaOqjdRblhNhfwRNIDeIDsYI7OsbIKFuFyKXak1xYODz59ydRsn2s5+i+uCqBMqDaErooBE/+69MbPOOyPuA3B3arxIJuB9ksHZZOTNkEJdzQshk4/S84uSIxuPXEGyzC32eYRvr86xzccZT/V8kIxKGbnHgnsaixIMquy6Va0stMX+70RgNNn6WBtq/NjAorknIX5PsCN8ez92WAn6Z6uu70Daf5HCUi+TRJX+B3MQg3lzekm7s2YufHRrW1zSUsLXLb/mzRx85zlT19sHgPLWJGmVL02tbS/1RDkTMld+v0pgLfpt+L7D1XiFUnrNfjLfYdaNMm53rsYJfeiLkpEe4feJycEdZr/lwB9a0xAsBZQXoILYKHkDtAsnay/fIJDMxrHphsezgpiVpXTbV6bcMI2ErkqbBfIcaDsFCQ8LYypXQSFsDXKVRVDSkAeI1MDA8IvvtChzUDfOVULOl8rcttWHkHJBtT/t6PhXctKeSYT0bDtCbi7D8AGqOIntt25U5K0faO6hkkdoLNcxFtk+IzO33k8+3awMu/5ufO8KEzj4+yUXqNiUc25F6oG6DLXOdl0E9zwCWW89fbD2W2iEengFcKvbBCTGhdfenhz5e7NRHz5CmfMHV31cvHTQ2iMGoK+s0H9JoRKT0aXnIBUH0lQzm21ndkpFNJy2VcC+NmJ2K6fazRLeryVOV514Nc0Mw+DGJT8aUuM3mU x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR11MB2990.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(396003)(39860400002)(376002)(136003)(346002)(366004)(64756008)(66946007)(66446008)(8936002)(26005)(66476007)(8676002)(52536014)(5660300002)(2906002)(55016003)(76116006)(66556008)(38070700005)(86362001)(33656002)(38100700002)(82960400001)(83380400001)(166002)(966005)(71200400001)(478600001)(41300700001)(110136005)(186003)(316002)(53546011)(9686003)(7696005)(6506007)(122000001)(15583001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?LzYzc2NWM3dNcTY4RzBsYkZEQm54RFdPMmhzVWIvOTI1QkI2aW1ZUWtmbDNn?= =?utf-8?B?a21qUnRmWFZiejZReGlqZGlLNElyNFN0a2dPRnExTGNSU1lTTjZWampWSGg5?= =?utf-8?B?UHdHd2xuK0FMZk9xOGpyNTFTS3UvVzNQdWRNVFduT0hUaU53VFQyRGk4UEkz?= =?utf-8?B?VzhCbnhpUWxteEhHU2xsM0tOSXhKa3hGYW5ONkJmcWRHSG1BTUc5VjR3YUIz?= =?utf-8?B?U3d3MDNiWGo5VjlUekVCcWdFYU1ySDgwdDJtbUVrcVI0Z0FMZENhZ0ttSnZp?= =?utf-8?B?TW1xcjYvV2UwZm9GcUJpekswRmlMWGI0bU1NV2dxQ291VjZJWVhyUmY3Q2RE?= =?utf-8?B?cUJiNE15N3lUMXJRQkJ1NUJGK1NQdFZhWjhQZ3owRWNRSmRUamJRK2VVajZK?= =?utf-8?B?czFDTkxQcDJaY1Ywa2x0MFh4bTRWRUsveldqdmxybnhNUC92OVFGUTlmNXdC?= =?utf-8?B?cFdtc1VxM3ZlWkxCWTcxQm95dkg3RXpZWG8wZjVuSzg3Mmo4RFE4bW9ia2pD?= =?utf-8?B?eUNOOFpWQzZJOEpJWi81UzU4NTNHRnVDNmxtN0dCaDI4Tm5zam15ckp4ckh4?= =?utf-8?B?VHJtN2dFeUVQcGREUEI5YmJTWmZzei9QcWZpUWs4RUJDeU9Qc3k2OHRtTng4?= =?utf-8?B?czd4MUdhZHR1SGhZNERwUkNCY25jTmZ2N09TZDFZa1lnamlyWElIdE5leit0?= =?utf-8?B?R0duVUVqSDBLQ1RUYnVveWNIWHhYWStjR2ZMTjB0Nzk1T0w0Ujc5cVBNOXJu?= =?utf-8?B?RXVzYzZFRWVQTDZ0U2kySGlUVDlxSTh4eEh3YkR3L0pkMkZvY1FWZytvY2FF?= =?utf-8?B?UEpRYm1uMS9WSFI3QmdOVUtFSXJ4cStJWGlickhCK3lrc2FLL2M2N0Fkc1Rt?= =?utf-8?B?ZkZGUjBxNURCaGJjRVhORThxQXVHbloyam9kTW93VjdUVlZPMTZLT3pOZmJj?= =?utf-8?B?R3hCZ3ZSaTJHWCtoZU92ekdTUkRRZWlYRCs0NXpvdDlBWnRncFowbFRWaVEr?= =?utf-8?B?dUJDTERZSVpHL0ZGWHpMWlVpVkZEOHBpVnhaSzE4ajBOS2tsSDZJZFNDU0li?= =?utf-8?B?MjVDeDBPMTlJRzFHVXNvbjRydXpIa29HbXlWTXdiMSs0WlhyVHNmdmFRcitw?= =?utf-8?B?M3EzOHgwZTdHVDZ5MUppZEhyUElOZXlPdnlJVUR3aFlEb2lUMFZpRkkwVXpP?= =?utf-8?B?K1dXZmFZcDlKY3FsbGw1STZaYTRTaWVjRHBWNm1rS00xZlUyZGZPVWFsYVZm?= =?utf-8?B?b0wvUHAzNG1TVXdaTDRwRVBURkpadVJPUXAxczlTNUNqcU9ocXNvUi9UQWhD?= =?utf-8?B?SGh6cU4rRUVPaFlUQU9ra1k3OER3aExCNGwwQWI5cDRyN0xDN1hsdUU4dVZM?= =?utf-8?B?RUFqNlpVdkErTmxNY1JCWE9idWcwODU4NnVUQ2dEZ3Q1KzBuY1dJUnp4Umd5?= =?utf-8?B?TWdRcjJtb0VHd05QRjVMNVZTa0lNZmhNaytSOVBjNVkwN2hEK2x3dXk2NEla?= =?utf-8?B?VU9uTDdYZUZLK0puK0tRenhSVld3YXR6OGRxdXFjK3BHa1FNUzlwQk5lMnVs?= =?utf-8?B?ZmtrSlJ0TDhXbXgrajNxRVEvRmVlWGRTOE9QcUlPdXNOd3JBY2FxTUdwOTRH?= =?utf-8?B?WTVaVmlsYlc2blRIMnhMWUJtdXd0cDNOR1RxSGM2OE42blhWcFgxN3ZZcGUz?= =?utf-8?B?OU03b012OW1ES1BMWmRXMm5QWjE2eFpUUDRIcTYxYW1ieWVVMXNYZUtFbDgv?= =?utf-8?B?azF1N0lybWFkbzZvS1A0QzBsQzgzZVlOcjJjREJscGJIVzBpUXV4SHJYaFRl?= =?utf-8?B?U09RSTFWcXZHTmJ1WGc2MzhJQ1RuTy9GdmFDZldvY1ZKN0k2Wmg1R09PVU5Q?= =?utf-8?B?a1FxUGRBMU14WHVWNXAwR3BSaFdjV3NRMVNMQUYycUlnRTQ5bUVocnpzQ1M2?= =?utf-8?B?V216L2FNdXNVZ1N6WEdjNFR6UkVDOEk0Z1NrUWx2K0ZnTFdjcFVibm9Xd3Ir?= =?utf-8?B?YlNNUWZFZS8yNFNGZ2dLRUhIR1VaUytyTUEvUGYycXNGV2pVRHp5QVpWQnV6?= =?utf-8?B?cXh4YUlBMm1Xa3g0YzR6KzVaOGdyS015V2xnaW5BNlRTc0N0SUVqMjNQenll?= =?utf-8?Q?WZho9ghzHYczQXTJ+9MzqSefj?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2990.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 881b3e61-81f1-4b10-e922-08da5b070421 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Jul 2022 02:11:31.7951 (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: CvWP/K4BpfUnGF6FUTcvILm1uH89feUT0cspIZuhYGUowmGf7iuavWzGniy+EmjfKEy6NVvs9FXHiBbLnUjdwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2717 X-OriginatorOrg: intel.com X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH v2 2/3] avfilter/vf_hwmap: get the AVHWDeviceType from outlink format 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 Thu, Jun 30, 2022 at 4:47 AM Tong Wu > wrote: When a derive_device_type is not specified, the hwmap filter should be able to retrieve AVHWDeviceType from outlink->format and create corresponding hwdevice context. Signed-off-by: Tong Wu > --- libavfilter/vf_hwmap.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_hwmap.c b/libavfilter/vf_hwmap.c index 2e03dfc1fe..136980c982 100644 --- a/libavfilter/vf_hwmap.c +++ b/libavfilter/vf_hwmap.c @@ -70,23 +70,32 @@ static int hwmap_config_output(AVFilterLink *outlink) device_is_derived = 0; if (inlink->hw_frames_ctx) { + enum AVHWDeviceType type; hwfc = (AVHWFramesContext*)inlink->hw_frames_ctx->data; if (ctx->derive_device_type) { - enum AVHWDeviceType type; - type = av_hwdevice_find_type_by_name(ctx->derive_device_type); if (type == AV_HWDEVICE_TYPE_NONE) { av_log(avctx, AV_LOG_ERROR, "Invalid device type.\n"); err = AVERROR(EINVAL); goto fail; } + } else { + type = av_hwdevice_get_type_by_pix_fmt(outlink->format); + if (type == AV_HWDEVICE_TYPE_NONE) { + av_log(avctx, AV_LOG_ERROR, "Could not get device type from " + "format %s.\n", av_get_pix_fmt_name(outlink->format)); + err = AVERROR(EINVAL); + goto fail; + } + } + if (!device || ctx->derive_device_type) { err = av_hwdevice_ctx_create_derived(&device, type, - hwfc->device_ref, 0); + hwfc->device_ref, 0); if (err < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to created derived " - "device context: %d.\n", err); + "device context: %d.\n", err); Looks like mixed re-indentation and functional changes in same commit. Yes this should not be re-indented, will update later. Thanks, Tong goto fail; } device_is_derived = 1; -- 2.35.1.windows.2 _______________________________________________ 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".