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 BEAB94B2C2 for ; Mon, 3 Jun 2024 09:23:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 27C9068D721; Mon, 3 Jun 2024 12:23:50 +0300 (EEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF2AD68D6A9 for ; Mon, 3 Jun 2024 12:23: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=1717406628; x=1748942628; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=aRv6qgimH9AG7MNrANoHmbgXIEvYZkKEn/u4tocNPcU=; b=Ay17P0I+1vscQvqajZ84EN0YNRqPgSx33bkuMM3SFXZTO58TfRhP+I+I 69abFqcD8cr8rPnAO1tR8visylDsIOia+4xOxqcvUSwAbRiSCrh1EwCm6 IdJ7s4TxTg/Dc4KQsVBg6tX9lTJvA6CDz9YJPKGipQNy6msT0WQ0lH7bL k6vAQM4AU1EYIr2EktBvESTWVsPKgjAzXEEGkBYTdNc9eHRi5Pcjl8ifH UboFts3o4xlupNNiiDt5gG54WINv0px75yeF6kYsQC/B3iHvRHsKmb2KC ljrwcSaYya6BIo+b+NUVZABuIcIrTKGdEUrw4QJoEVhdjMf4hnuMVG3UE A==; X-CSE-ConnectionGUID: 8IU09Yl7QGmJNAio0hbAeg== X-CSE-MsgGUID: MFrlJGgxTfecOGlNT1Rsjw== X-IronPort-AV: E=McAfee;i="6600,9927,11091"; a="13756416" X-IronPort-AV: E=Sophos;i="6.08,211,1712646000"; d="scan'208";a="13756416" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2024 02:23:41 -0700 X-CSE-ConnectionGUID: c4oT6opNRVaqidhfatX1Mw== X-CSE-MsgGUID: AZFtuJjGSt238egrl/t8Pw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,211,1712646000"; d="scan'208";a="36899294" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orviesa009.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 03 Jun 2024 02:23:41 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 3 Jun 2024 02:23:40 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) 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.2507.39; Mon, 3 Jun 2024 02:23:40 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39 via Frontend Transport; Mon, 3 Jun 2024 02:23:40 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.168) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Mon, 3 Jun 2024 02:23:40 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EjWIRpuaFCd4Je1+Cf1I/DXoYNcct9AfEIyvDHP0dr3093q3ijFlC5MXVL1aYYip8+nm6VDz17J9kIykEnrE/gKVb4U4u3h033x72TVljDvwohW3pz1Zz193Ac9YFxStBbrUK2qIFumxQS5djrZjDMKURhR2VtkV/H2BbyVscqBKdE4oXNFFeApXUwayptl7Bndcqw16CAunWBzhihybEYu0uVOKSkPfjH0L3iMYuScx2ZaACOCzXbs3YQz9cA1nyqLeJmozQLwwhYIddiMxwR6K0jH2EPj8f9emNeXLjzm7KuBdSyDtsANkgBu7dAcyJrKarXRufjeFUqrXW3IAXQ== 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=aRv6qgimH9AG7MNrANoHmbgXIEvYZkKEn/u4tocNPcU=; b=VsZ0nl0SyfecETJ/9lTNpWVaoqiSJMw5+xxR0i3HXfN/QkUMqSYmHl2PvDz+7bCucUzJCrkla27AvUwbENDF5BU9kSTK0jLKxiNPtmNGfbR5XPmxzvgnlc0sn/BUhlS4OxHvNtavogXn2UiAXZQsXnxLMcra3bs/hQaKb+yQHSOxIiI8UghCl8gTyyMMh8VmrC8z8K4G+Kh4J7MvivlcL4W2WH2tlOJfWtsDfYLj6IPaPqGq4QwfTvCTlTyh0hFooHiAaUy8ghlx0asl4Kjt7oPf9NwCxzGUveHMV9N+aJ2erxABpw5wD3TjgqbLsgiks155jxy45IRtkz8/7ZBdRQ== 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 CH3PR11MB8659.namprd11.prod.outlook.com (2603:10b6:610:1cf::5) by SA0PR11MB4639.namprd11.prod.outlook.com (2603:10b6:806:70::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.24; Mon, 3 Jun 2024 09:23:38 +0000 Received: from CH3PR11MB8659.namprd11.prod.outlook.com ([fe80::7037:678a:eb45:ac6c]) by CH3PR11MB8659.namprd11.prod.outlook.com ([fe80::7037:678a:eb45:ac6c%3]) with mapi id 15.20.7633.021; Mon, 3 Jun 2024 09:23:37 +0000 From: "Wu, Tong1" To: Lynne , FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH v12 15/15] avcodec/hw_base_encode: add avctx pointer for FFHWBaseEncodeContext Thread-Index: AQHasRk+OBYx+ig4bECsScYb4/KGVbGtP+sQgAAU1ICACHfzAA== Date: Mon, 3 Jun 2024 09:23:37 +0000 Message-ID: References: <20240528154807.1151-1-tong1.wu@intel.com> <20240528154807.1151-15-tong1.wu@intel.com> <3c6857f5-5c29-440c-a13d-8130296f14be@lynne.ee> <04370e78-0311-4c42-a065-890889b7d6c5@lynne.ee> In-Reply-To: <04370e78-0311-4c42-a065-890889b7d6c5@lynne.ee> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CH3PR11MB8659:EE_|SA0PR11MB4639:EE_ x-ms-office365-filtering-correlation-id: 42201811-fdee-4b6a-c3e4-08dc83aed969 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230031|366007|1800799015|376005|38070700009; x-microsoft-antispam-message-info: =?utf-8?B?U3FQVUpNTFZ2aVlEeXpOclpUS2JYYWZnZEpGT3cxUDVtME1VZVJmYjZURnFE?= =?utf-8?B?dnp3NzNhZ29BLzBOZTE2bEk2VEx0VW5Kamd1NHZYa0Z2ZE8yUjc2MzF5Tk5T?= =?utf-8?B?ZkZISjI2RFNHSjRXWmJzR3IyNktuYXlqUXdINzFQdVpwUFRicmIvbDZnaElU?= =?utf-8?B?L1cvYWxROGxhRDlrUjhsUiswQVF6WGZKbjBqM2FLUWo1S29PbFhITjFmMzZJ?= =?utf-8?B?ZzA4SmFCeWEwaEt0dXFabTNQczdZWVhQdVdHSUZDRGp4Qy81ZDA0cGpQb0Y3?= =?utf-8?B?c0RTZGJ3MWR0b1gvR2Y1YTJDNDlzY00rV1B2WmxJa3liTHNUaFFCcEJyaGMw?= =?utf-8?B?WVI2N1hvL3d1TjFoQmlvLzFEcmYzcEdwYUtIaUdmNjNWa1MzS1NZRDN0MWNJ?= =?utf-8?B?TlRlQW1ZUzlyYVVRbFVUUm1aYWFGeUZTT3BweWtkb1Y2NGlMVWVYa2h0SnFq?= =?utf-8?B?MXBuMDhLOWl3OURKQS9ZUm5PYm9pM2c5ZXQ3K01pOXYxOW16V0ROcWNjWi8v?= =?utf-8?B?eWFUQ3p0ZjdOa1Z5aXFIZE03R0dsRlZKOFpSUGRUNHJ1WVE1ZjlBYXRaSUcr?= =?utf-8?B?VHFIbmZWVXVoNVBIdWkxVDBIMCtPbXN4OHNGOGVmbmJVT1ZwMHYxNUdZb3pG?= =?utf-8?B?ZFROUlRlUS8xVUxsTytIM2ZEN2NpbEp5MmlQR1Q3RlVWQW1MY3dkT3cxVThy?= =?utf-8?B?bmM1dFpWWEFrbHFVR0pCOG93TnRhbEFoTnJqbkxpMVB6OUZheDNaQzV5aTEr?= =?utf-8?B?RlJBeHZrZVpsOW1sWDRMRGE1RUZlS0M1VEQydU41TEh6eWRUbEpFbVVRV1F1?= =?utf-8?B?dk9MOXBxNmNSVEZ5SWM0OVdTK0h4cEoyUjhmUFJMVnd4NTU4N3RvNXFOODJR?= =?utf-8?B?dWoxSmthdW9Vdmhvb0ZsQWY1b1ZiN0l2dU80MnIydGk4ZUhvTTZZclNlRzJ1?= =?utf-8?B?SDB4aUdOK3RQU0czYUw4dlhZV0pNY0YxYlBOZ2dzNC9hQVVibEpxL1dNZDhG?= =?utf-8?B?MFZOanF2bzR5V0RpREI1T1RSSHlPU1JBMU0yQjB1dDZZbjQ4Q2dBQW5vdzFD?= =?utf-8?B?TC8rc0cwWDd6eDZROExvUkgydHFrUFdMRzlOZUZQUUlmWVA0eVBtd2lEMFdu?= =?utf-8?B?YlBvbmV1SERFUWtQWUdMSTlXSFlBN2ZuYVpnUE40QTRMbEhyNlR2Yk5tYWJt?= =?utf-8?B?dUVieGRLdG1TR21GbE0vNTdmSXA0bEM5dDIxb3pJb0hpRW55QndrQ0FsQnMz?= =?utf-8?B?OWg1LzhxZFdTa1F2VkNZbk5aaVBtNzJsKzFvQ3hYTlR2MHNLR2RLc1lIeFZF?= =?utf-8?B?QWhqVWFLRVIvcUFRQWhqRENkWStFb051d295WDdzdXplaUIxdHVZa0ZjMm9B?= =?utf-8?B?VjBqZEJPTlNsNnIrajhYQXlzRnBrQ2UzYlFEYUYrdlpueFFrMmk1WjF5ZWpV?= =?utf-8?B?Z2JOSzBGZzk3MCtaOC9RYm9HanFTclZReFIzeEtSMGpodXlMS1BuVGRsN29z?= =?utf-8?B?dUIwY2VnSUo0SnJTV0lBWElwSmJ4b0xPeXUwN1duNFJwbGQ2d3QzMUxvd0Ny?= =?utf-8?B?NTBkTXRlUEg4QmprVTBmbXl5d2JBVEhHSTVwYlEzc2l2alhHb0xNWW5wZlh0?= =?utf-8?B?VWc0YitJZjl2VHZKbkUrT2lsM0dRbS8vRWdCeXNZdURYay9hbVpHbzVnNWdQ?= =?utf-8?B?Mkx0VnNQc1V0cldCaitCT1piaURzREMzRGlkcFZGc25QRFJVWkhESm1lci9l?= =?utf-8?B?ZGZ6ZHV4V0RlMWswZm5IN21XQjRlSEJWMUUzR1ZqNmRuUVNPYnJVS3M0aWZB?= =?utf-8?B?bjFzOXZkMmhCOU1IZmdTQT09?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CH3PR11MB8659.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366007)(1800799015)(376005)(38070700009); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?THJORXZ4QkpmRUNQWkVXdnpWb3IrYkV5dU85NUYrYWRvZmVXVHNuaUthT3Yy?= =?utf-8?B?M2FBNEpxWEQzY053dllqYUpMR1pyMWk2d282NzNNaERVZmovU0hkMnNNSGdp?= =?utf-8?B?aVpHemMya2pGUzhoK1RCTll4d3JxL1BkY0xaeDBDYUszU1JxZFNZaE1UQ2FC?= =?utf-8?B?YzYzUExyckNuQm1Dd252Z2N3emorV3BMRlBTMHgwYklpazBJeTlqcWRSMDBR?= =?utf-8?B?ZWt2VzRGUmtwZ1FlWWFKVkE0bXRxMGZMR0ZmZVNQOFF5b0ZoWHEwajV0dHlm?= =?utf-8?B?dTI4dHo1REk1K1dvOWFjYjErazhDb3d1SUpRZzRxZ3VDbTdFQlFrQ2tqVU1j?= =?utf-8?B?bWtyUndEMTZZVllDajhoMnE1RnlybkFkRkFLdDNJVEhsWk9ucU5qWlp5ZkVn?= =?utf-8?B?TUJ1bjcycnRIMnZQRXowREh0eVV0Z3RxNTcyK21Tb0szS0pTK0VodUxhc3JT?= =?utf-8?B?R2c5T25sN0xmRVZUSC9obkNjeGc4WUdzc1BZNXdyQzRKUHJXdDhtYkluWTJE?= =?utf-8?B?RHN1SmQwbjhZaWRiVEVnU096OSsrcE9NemJoc3AwSkNPcjliUjRBbXYyaHdU?= =?utf-8?B?cnlKMXlTQzViZS9tN3BWano5QXN4ZlpheEE2SkFOMFQ3dkVMOGdKd0toK0h2?= =?utf-8?B?aUZzQlFJVlVxejBaZ3pYS0VJNk5pYVdiYkhRcnBBWkQ4OXJWYWRQTGxNQXZ5?= =?utf-8?B?RWlnZFFkVmN2NGxIQTRhaDlxRFlZR2xwWmZrZzY4MjNIK1l5dE4rcko0QVNl?= =?utf-8?B?ay94V2VvK0pPaDByb0hqZjZnaWNkV0FTeGp4eTk1ZnJQR3VFOVFoNzFtUW9o?= =?utf-8?B?R3JiMXZpMTFNSTBFY1FZbmsrN20wbDJWNTFWTnE1Y25TZkd0Q3VwVFI2WmxX?= =?utf-8?B?SXNoMld4Wk0wSjRlSnluTzRxT21nbk1LME5oZ1U0K05la1FFSGhpSjc4K3lQ?= =?utf-8?B?L2thNzhtVnNLQXhxbkFOOWlScTVOaTZvUG42dUF5dytDNmxEdDgxVjFBYmov?= =?utf-8?B?cDBRQ3hpK0lJM1hNU2U1NVkzMHBJeURBMXRTaW5QTk1QMHQyZVRFQ0pMQXJV?= =?utf-8?B?ZFVPNHlkQUhGNzNjUVFjT3E0ZmNucHgyQkhqMlA5dDU2cTZmaFNQTGh5WE1N?= =?utf-8?B?dHVRN2wyQ1ZkUTRSRWxUVUZvaXRBQm9KU3RsQmFUVXk2YVJUc2FiT29nR1JE?= =?utf-8?B?cloyVlZBVlUwUTM1ZVczelRhYVMyMWNSZC9QeHlhaTVRdTBjTXFubG10NlVj?= =?utf-8?B?N243R0I5U1FkL0xHbU1wUEZnbE5jZW03VWh6NUk4SHpPcFZhblR4Zmd5QmJT?= =?utf-8?B?TEd2VkZLbzRvQ1ZHZ2RPcFRDTVlaSThlU0pQak5pa2pPV0Z1RmZQOHVvaWYz?= =?utf-8?B?MThhQnh4b0RBZytJNWNSTDdKVkVWNzgzQ1dqWXllSkRaYnVwSjlkMC95bmZv?= =?utf-8?B?eWl4eTc0NXRENTVwWXlMb3NNSnVNOFV1THkxbUtYZmpQRGtQQzF1WVlESy8w?= =?utf-8?B?bzdQVzErK29UaTZ2VFcxbm9qUTFoSWNiekRoNzNVSWNTSWlBWjRwREo0RWlx?= =?utf-8?B?S1ZXa1VmWDdycTFSWVhnOVROUHJ2ZzY0MGtpRXVXckEwMEJFVGhnRG9MREhN?= =?utf-8?B?bWl4d3Z0cnBIRVhxR0grUk1aR1E4ampkOSt6aVRlZXZOZ3NCNTNmZVY1Wmx2?= =?utf-8?B?NDZtWDBuWWh4WVRxR0FZYkdFVnE5cTd1RzhNU2hvNDMxR3o1aEsyL2NjcUNl?= =?utf-8?B?c2R6b3hodnYwTmptcTc4b3JaZlNQcWxpV3p0cStuMHBvSCs3cFd2NGsyRmt3?= =?utf-8?B?T1hrUEFVMyt5K3ptTEtuSEFGK0YrbmxwSkV4eTVWaTNDZHdob3lZbThXNXdi?= =?utf-8?B?Q080Nld4U1hNc0NVZGZTVlBLMjVRWktVb3J6TGlYR29BNkJCRFJmMitZS3lo?= =?utf-8?B?Z05jK2VROXZkNlkvdjRQV0gxSzM1RUUxYW90S0NZWnp2NWcxODc5K0JyeU1i?= =?utf-8?B?WDdlcVE2V3ZDSjdDdUpCc2pmMFJpZnhTTnYzMGxjMWs0alR3d1pnamRMdlNZ?= =?utf-8?B?enVBQUxmV3JCQWxjQzBkYklUQzFSb0xUMGJpRVhQbUl3R0RWandjTkwzMU1q?= =?utf-8?Q?S71w=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CH3PR11MB8659.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42201811-fdee-4b6a-c3e4-08dc83aed969 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Jun 2024 09:23:37.4293 (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: +2qGtjrgQb7HCr5YicITgC5hejt9IASgnKg+rMGI2WmKQ/gjsgwutxiF48wVbHVKuFU3MIuaoUyh3QE4+PO+yQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4639 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v12 15/15] avcodec/hw_base_encode: add avctx pointer for FFHWBaseEncodeContext 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: >From: Lynne >Sent: Wednesday, May 29, 2024 8:02 AM >To: Wu, Tong1 ; FFmpeg development discussions and >patches >Subject: Re: [FFmpeg-devel] [PATCH v12 15/15] avcodec/hw_base_encode: add >avctx pointer for FFHWBaseEncodeContext > >On 29/05/2024 00:53, Wu, Tong1 wrote: >>> From: ffmpeg-devel On Behalf Of >Lynne >>> via ffmpeg-devel >>> Sent: Wednesday, May 29, 2024 1:08 AM >>> To: ffmpeg-devel@ffmpeg.org >>> Cc: Lynne >>> Subject: Re: [FFmpeg-devel] [PATCH v12 15/15] avcodec/hw_base_encode: >add >>> avctx pointer for FFHWBaseEncodeContext >>> >>> On 28/05/2024 17:48, tong1.wu-at-intel.com@ffmpeg.org wrote: >>>> From: Tong Wu >>>> >>>> An avctx pointer is added to FFHWBaseEncodeContext. This is to make >>>> FFHWBaseEncodeContext a standalone component for ff_hw_base_* >>> functions. >>>> This patch also removes some unnecessary AVCodecContext arguments. >>>> >>>> Signed-off-by: Tong Wu >>>> --- >>>> libavcodec/d3d12va_encode.c | 6 +++--- >>>> libavcodec/hw_base_encode.c | 31 +++++++++++++------------------ >>>> libavcodec/hw_base_encode.h | 8 +++++--- >>>> libavcodec/vaapi_encode.c | 6 +++--- >>>> 4 files changed, 24 insertions(+), 27 deletions(-) >>>> >>>> diff --git a/libavcodec/d3d12va_encode.c b/libavcodec/d3d12va_encode.c >>>> index 0fbf8eb07c..6d3a53c6ca 100644 >>>> --- a/libavcodec/d3d12va_encode.c >>>> +++ b/libavcodec/d3d12va_encode.c >>>> @@ -1351,7 +1351,7 @@ static int >>> d3d12va_encode_create_recon_frames(AVCodecContext *avctx) >>>> enum AVPixelFormat recon_format; >>>> int err; >>>> >>>> - err = ff_hw_base_get_recon_format(avctx, NULL, &recon_format); >>>> + err = ff_hw_base_get_recon_format(base_ctx, NULL, &recon_format); >>>> if (err < 0) >>>> return err; >>>> >>>> @@ -1398,7 +1398,7 @@ int ff_d3d12va_encode_init(AVCodecContext >>> *avctx) >>>> int err; >>>> HRESULT hr; >>>> >>>> - err = ff_hw_base_encode_init(avctx); >>>> + err = ff_hw_base_encode_init(avctx, base_ctx); >>>> if (err < 0) >>>> goto fail; >>>> >>>> @@ -1552,7 +1552,7 @@ int ff_d3d12va_encode_close(AVCodecContext >>> *avctx) >>>> D3D12_OBJECT_RELEASE(ctx->video_device3); >>>> D3D12_OBJECT_RELEASE(ctx->device3); >>>> >>>> - ff_hw_base_encode_close(avctx); >>>> + ff_hw_base_encode_close(base_ctx); >>>> >>>> return 0; >>>> } >>>> diff --git a/libavcodec/hw_base_encode.c b/libavcodec/hw_base_encode.c >>>> index 92f69bb78c..88efdf672c 100644 >>>> --- a/libavcodec/hw_base_encode.c >>>> +++ b/libavcodec/hw_base_encode.c >>>> @@ -94,14 +94,13 @@ static void >>> hw_base_encode_remove_refs(FFHWBaseEncodePicture *pic, int level) >>>> pic->ref_removed[level] = 1; >>>> } >>>> >>>> -static void hw_base_encode_set_b_pictures(AVCodecContext *avctx, >>>> +static void hw_base_encode_set_b_pictures(FFHWBaseEncodeContext >*ctx, >>>> FFHWBaseEncodePicture *start, >>>> FFHWBaseEncodePicture *end, >>>> FFHWBaseEncodePicture *prev, >>>> int current_depth, >>>> FFHWBaseEncodePicture **last) >>>> { >>>> - FFHWBaseEncodeContext *ctx = avctx->priv_data; >>>> FFHWBaseEncodePicture *pic, *next, *ref; >>>> int i, len; >>>> >>>> @@ -148,20 +147,19 @@ static void >>> hw_base_encode_set_b_pictures(AVCodecContext *avctx, >>>> hw_base_encode_add_ref(pic, ref, 0, 1, 0); >>>> >>>> if (i > 1) >>>> - hw_base_encode_set_b_pictures(avctx, start, pic, pic, >>>> + hw_base_encode_set_b_pictures(ctx, start, pic, pic, >>>> current_depth + 1, &next); >>>> else >>>> next = pic; >>>> >>>> - hw_base_encode_set_b_pictures(avctx, pic, end, next, >>>> + hw_base_encode_set_b_pictures(ctx, pic, end, next, >>>> current_depth + 1, last); >>>> } >>>> } >>>> >>>> -static void hw_base_encode_add_next_prev(AVCodecContext *avctx, >>>> +static void hw_base_encode_add_next_prev(FFHWBaseEncodeContext >>> *ctx, >>>> FFHWBaseEncodePicture *pic) >>>> { >>>> - FFHWBaseEncodeContext *ctx = avctx->priv_data; >>>> int i; >>>> >>>> if (!pic) >>>> @@ -333,12 +331,12 @@ static int >>> hw_base_encode_pick_next(AVCodecContext *avctx, >>>> } >>>> >>>> if (b_counter > 0) { >>>> - hw_base_encode_set_b_pictures(avctx, start, pic, pic, 1, >>>> + hw_base_encode_set_b_pictures(ctx, start, pic, pic, 1, >>>> &prev); >>>> } else { >>>> prev = pic; >>>> } >>>> - hw_base_encode_add_next_prev(avctx, prev); >>>> + hw_base_encode_add_next_prev(ctx, prev); >>>> >>>> return 0; >>>> } >>>> @@ -687,9 +685,9 @@ int >ff_hw_base_init_gop_structure(AVCodecContext >>> *avctx, uint32_t ref_l0, uint32 >>>> return 0; >>>> } >>>> >>>> -int ff_hw_base_get_recon_format(AVCodecContext *avctx, const void >>> *hwconfig, enum AVPixelFormat *fmt) >>>> +int ff_hw_base_get_recon_format(FFHWBaseEncodeContext *ctx, const >>> void *hwconfig, >>>> + enum AVPixelFormat *fmt) >>>> { >>>> - FFHWBaseEncodeContext *ctx = avctx->priv_data; >>>> AVHWFramesConstraints *constraints = NULL; >>>> enum AVPixelFormat recon_format; >>>> int err, i; >>>> @@ -722,14 +720,14 @@ int >>> ff_hw_base_get_recon_format(AVCodecContext *avctx, const void >*hwconfig, >>> enu >>>> // No idea what to use; copy input format. >>>> recon_format = ctx->input_frames->sw_format; >>>> } >>>> - av_log(avctx, AV_LOG_DEBUG, "Using %s as format of " >>>> + av_log(ctx->avctx, AV_LOG_DEBUG, "Using %s as format of " >>>> "reconstructed frames.\n", av_get_pix_fmt_name(recon_format)); >>>> >>>> if (ctx->surface_width < constraints->min_width || >>>> ctx->surface_height < constraints->min_height || >>>> ctx->surface_width > constraints->max_width || >>>> ctx->surface_height > constraints->max_height) { >>>> - av_log(avctx, AV_LOG_ERROR, "Hardware does not support encoding >at >>> " >>>> + av_log(ctx->avctx, AV_LOG_ERROR, "Hardware does not support >>> encoding at " >>>> "size %dx%d (constraints: width %d-%d height %d-%d).\n", >>>> ctx->surface_width, ctx->surface_height, >>>> constraints->min_width, constraints->max_width, >>>> @@ -756,10 +754,9 @@ int >>> ff_hw_base_encode_free(FFHWBaseEncodePicture *pic) >>>> return 0; >>>> } >>>> >>>> -int ff_hw_base_encode_init(AVCodecContext *avctx) >>>> +int ff_hw_base_encode_init(AVCodecContext *avctx, >>> FFHWBaseEncodeContext *ctx) >>>> { >>>> - FFHWBaseEncodeContext *ctx = avctx->priv_data; >>>> - >>>> + ctx->avctx = avctx; >>>> ctx->frame = av_frame_alloc(); >>>> if (!ctx->frame) >>>> return AVERROR(ENOMEM); >>>> @@ -789,10 +786,8 @@ int ff_hw_base_encode_init(AVCodecContext >>> *avctx) >>>> return 0; >>>> } >>>> >>>> -int ff_hw_base_encode_close(AVCodecContext *avctx) >>>> +int ff_hw_base_encode_close(FFHWBaseEncodeContext *ctx) >>>> { >>>> - FFHWBaseEncodeContext *ctx = avctx->priv_data; >>>> - >>>> av_fifo_freep2(&ctx->encode_fifo); >>>> >>>> av_frame_free(&ctx->frame); >>>> diff --git a/libavcodec/hw_base_encode.h >b/libavcodec/hw_base_encode.h >>>> index 15ef3d7ac6..13c1fc0f69 100644 >>>> --- a/libavcodec/hw_base_encode.h >>>> +++ b/libavcodec/hw_base_encode.h >>>> @@ -116,6 +116,7 @@ typedef struct FFHWEncodePictureOperation { >>>> >>>> typedef struct FFHWBaseEncodeContext { >>>> const AVClass *class; >>>> + AVCodecContext *avctx; >>>> >>>> // Hardware-specific hooks. >>>> const struct FFHWEncodePictureOperation *op; >>>> @@ -222,13 +223,14 @@ int >>> ff_hw_base_encode_receive_packet(AVCodecContext *avctx, AVPacket >*pkt); >>>> int ff_hw_base_init_gop_structure(AVCodecContext *avctx, uint32_t >ref_l0, >>> uint32_t ref_l1, >>>> int flags, int prediction_pre_only); >>>> >>>> -int ff_hw_base_get_recon_format(AVCodecContext *avctx, const void >>> *hwconfig, enum AVPixelFormat *fmt); >>>> +int ff_hw_base_get_recon_format(FFHWBaseEncodeContext *ctx, const >>> void *hwconfig, >>>> + enum AVPixelFormat *fmt); >>>> >>>> int ff_hw_base_encode_free(FFHWBaseEncodePicture *pic); >>>> >>>> -int ff_hw_base_encode_init(AVCodecContext *avctx); >>>> +int ff_hw_base_encode_init(AVCodecContext *avctx, >>> FFHWBaseEncodeContext *ctx); >>>> >>>> -int ff_hw_base_encode_close(AVCodecContext *avctx); >>>> +int ff_hw_base_encode_close(FFHWBaseEncodeContext *ctx); >>>> >>>> #define HW_BASE_ENCODE_COMMON_OPTIONS \ >>>> { "idr_interval", \ >>>> diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c >>>> index b35a23e852..0693e77548 100644 >>>> --- a/libavcodec/vaapi_encode.c >>>> +++ b/libavcodec/vaapi_encode.c >>>> @@ -2059,7 +2059,7 @@ static av_cold int >>> vaapi_encode_create_recon_frames(AVCodecContext *avctx) >>>> } >>>> hwconfig->config_id = ctx->va_config; >>>> >>>> - err = ff_hw_base_get_recon_format(avctx, (const void*)hwconfig, >>> &recon_format); >>>> + err = ff_hw_base_get_recon_format(base_ctx, (const void*)hwconfig, >>> &recon_format); >>>> if (err < 0) >>>> goto fail; >>>> >>>> @@ -2106,7 +2106,7 @@ av_cold int >ff_vaapi_encode_init(AVCodecContext >>> *avctx) >>>> VAStatus vas; >>>> int err; >>>> >>>> - err = ff_hw_base_encode_init(avctx); >>>> + err = ff_hw_base_encode_init(avctx, base_ctx); >>>> if (err < 0) >>>> goto fail; >>>> >>>> @@ -2313,7 +2313,7 @@ av_cold int >>> ff_vaapi_encode_close(AVCodecContext *avctx) >>>> av_freep(&ctx->codec_sequence_params); >>>> av_freep(&ctx->codec_picture_params); >>>> >>>> - ff_hw_base_encode_close(avctx); >>>> + ff_hw_base_encode_close(base_ctx); >>>> >>>> return 0; >>>> } >>> >>> Err, you missed ff_hw_base_encode_set_output_property, >>> ff_hw_base_encode_receive_packet and ff_hw_base_init_gop_structure? >>> >>> Rest looks better. >> >> ff_hw_base_encode_receive_packet is directly bind to int >(*receive_packet)(struct AVCodecContext *avctx, struct AVPacket *avpkt); I >thought maybe this should not be changed? For the other two functions, >components in avctx are used. If they need to be changed, I could either take >both FFHWBaseEncodeContext and AVCodecContext as arguments or use ctx- >>avctx->* to get the components which one do you think better. Thank you. > >Take both FFHWBaseEncodeContext and AVCodecContext as arguments, and >use >it to get fields such as gop_size, max_b_frames and so on. > >*Do not use* avctx->priv_data anywhere in hw_base_encode. Any usage of >it has to be switched to a user-given FFHWBaseEncodeContext via a >function argument. > >ff_hw_base_encode_receive_packet needs to be switched to >(FFHWBaseEncodeContext, AVCodecContext...) as well, as it uses >avctx->priv_data. > >Hardware encoders should have small wrappers for receive_packet which >would call ff_hw_base_encode_receive_packet. It's not much, just 3 lines. > >Hardware encoders could still use FFHWBaseEncodeContext as their own >main encode context, but they would no longer be required to use it as >their main context. It'll make sense with some code: > >For example, d3d12va_encode's wrapper function would be: >static int receive_packet(avctx...) >{ > return ff_hw_base_encode_receive_packet(avctx->priv_data, avctx...) >} > >Vulkan's wrapper would, on the other hand look like: >static int receive_packet(avctx...) >{ > VulkanEncodeContext *vkenc = avctx->priv_data; > return ff_hw_base_encode_receive_packet(vkenc->hw_base, avctx...) >} > >You should also rename FFHWBaseEncodeContext.avctx to >FFHWBaseEncodeContext.log_ctx with a type of void *, and use it for >av_log where needed. It would be set to avctx in >ff_hw_base_encode_init(), but encoders could override it if they needed >to by modifying the context. >If frame threading is ever implemented, this change would make it >easier, as the context for each call would be exlicitly known. > Updated in v13. I've added wrappers in vaapi_encode.c and d3d12_encode.c to make it available for all the codecs(vaapi_encode_* and d3d12va_encode_hevc). Thanks. _______________________________________________ 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".