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 303854AB6A for ; Thu, 13 Jun 2024 05:56:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB6E868D913; Thu, 13 Jun 2024 08:56:11 +0300 (EEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C105968D592 for ; Thu, 13 Jun 2024 08:56:03 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718258170; x=1749794170; h=from:to:subject:date:message-id:references:in-reply-to: content-id:content-transfer-encoding:mime-version; bh=k3Pf4ay7SsaZQI7gUb7VrhI/DVN2J8LdKiOkpYTPe8o=; b=XGrZ7XSaGvhbyDT5GeYcsfl8wsVN8C8valhIbCJ8S50br4GkTW40vnUW kyAEFOGR3pnxRdWnRYHlvZbCnyZnYz5bnej5MMlIp+E/CxGigDCQovZOj m47MbT5krQ09j15WNzmQ28o/BQXFK2+zbR/c+XVj42/lRZqENd6ncvhN5 kOyzOvR77Den+NBGqc3kPYHI7/AbWfueLRrp+HpbbSHfekjXOXHw5Jcp6 OQ6AUoaPaXqw8UGn+KaFe05Xt16GbuSUw3S+YJRY06xhDLQGb5fDZgQoi FDbTmV+TgDTy7BhGTnb36uuL5i64fx5xbGK2+ZFw+8yTkidQoSXOM7BYs Q==; X-CSE-ConnectionGUID: mHVlHPxJRSqCW3Xw+U/veQ== X-CSE-MsgGUID: YYwac8rsTda+gBr9N3nROA== X-IronPort-AV: E=McAfee;i="6700,10204,11101"; a="25635153" X-IronPort-AV: E=Sophos;i="6.08,234,1712646000"; d="scan'208";a="25635153" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2024 22:56:00 -0700 X-CSE-ConnectionGUID: Mu6WoMY4QxyELCOhp9o1Kg== X-CSE-MsgGUID: AnI/uWI+RX287i9wChyj4A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,234,1712646000"; d="scan'208";a="39948631" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orviesa010.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 12 Jun 2024 22:56:00 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 12 Jun 2024 22:55:59 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) 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.2507.39; Wed, 12 Jun 2024 22:55:59 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39 via Frontend Transport; Wed, 12 Jun 2024 22:55:59 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.40) 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.2507.39; Wed, 12 Jun 2024 22:55:58 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TAsQ1tw5e4FzMVw8gf4b0ZmVzMclMrXUPi4/onYl7NDgEAPn0RyNaLmB6tO9dWYYBvELGAYZkFWdTd8EgiqfZoGtMQchEBfS0wGcKY/pKl4WSUcL4OASia78uevJJVW12YPK5BNC9Kcz5aRQdZ9edK+ER1VZe4CDyF6Nf12YP6wMiscTqr+pqxOlFpXnV6v8eRMYUAW6gkpIjkF3RtXZsbM628szNVgovk2n/yk8BC+/uYrLE4QgjtERluYQUVA3iHfa8hqK1BCq2rsbNYhUgDovUmM3zP+NzQ6ABX7ysnTQq0/ToVyS6KK24R/5S2ufcbC1dL5mYeKb5ZusJ8SjDg== 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=k3Pf4ay7SsaZQI7gUb7VrhI/DVN2J8LdKiOkpYTPe8o=; b=QoRvmgRw1uZmysSD6QNVGI/xFwzFPGqrhHmg+bv9W2BO7xOzw0CImGAPDfJgxsM1ROIZiA4fDpPivfm5lm3tGUKte1IoFCJ7oPfqe2sQQy0DhRPUG4+f9I3FTN1r03A2SlXTeUEPoO8uc3Ml9w4YAt3+XlKnNHa0IdKg5fCeRn72T9Gk7EdNyUnHhzIJ3jxSBCh4IZ3Ca2NJCaXsHgTEcXhBrPSLaobZ995gAYVWfPozaweuLJuRYLQ9YSXTL3f+o4jcsqOPxTSxjQonCiMxJS4o2P/5MdN6Wr2baoMUSs1aJw+dflFHxzZ/EWn/x07hkZlY+2MbAulR2z0o0IHiKA== 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 PH0PR11MB5030.namprd11.prod.outlook.com (2603:10b6:510:41::5) by BN9PR11MB5242.namprd11.prod.outlook.com (2603:10b6:408:133::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.20; Thu, 13 Jun 2024 05:55:57 +0000 Received: from PH0PR11MB5030.namprd11.prod.outlook.com ([fe80::a4fd:ad50:41fb:fe31]) by PH0PR11MB5030.namprd11.prod.outlook.com ([fe80::a4fd:ad50:41fb:fe31%4]) with mapi id 15.20.7677.024; Thu, 13 Jun 2024 05:55:56 +0000 From: "Wang, Fei W" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH 37/39] lavc/hevcdec: move some frame-end code to hevc_frame_end() Thread-Index: AQHauNweJjcX9PKBrEOe1fsKgEDiELHFOyAA Date: Thu, 13 Jun 2024 05:55:56 +0000 Message-ID: References: <20240607130135.9088-1-anton@khirnov.net> <20240607130135.9088-37-anton@khirnov.net> In-Reply-To: <20240607130135.9088-37-anton@khirnov.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Evolution 3.36.5-0ubuntu1 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: PH0PR11MB5030:EE_|BN9PR11MB5242:EE_ x-ms-office365-filtering-correlation-id: 7fe9dcec-2899-4084-b3cf-08dc8b6d7e2a x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230034|376008|1800799018|366010|38070700012; x-microsoft-antispam-message-info: =?utf-8?B?dXNRV1pjUWRCaDNnMzdCaFM2ZTd0WThCelB4eXdSeHRDSHJtbzE1YmZvSHNx?= =?utf-8?B?Q05EZEtjNUVvU3lYS0dGVFBQQ3ZpbDhIL1Q5QmU1Q01ocXN6aHhIL0dMRVU0?= =?utf-8?B?SDNZb05VS1dWTTk0NXAvMmRRVFFGeHRyUnZjT2lBdkI3Sjl5NEpHUmtKZC9S?= =?utf-8?B?QzdDOFJkSnFCUFNGL0tMWFNrajJ2Q0FCOHFYZlN4Y3R6TDlCMnYwaEl6VURq?= =?utf-8?B?ME15b3BMU05Za1hSbTBmc2lJSTR1cXJMTjJESzlDK1FDTm5ucDB0NDlnUUIv?= =?utf-8?B?Umw2TldQQUJ2WXcwRnFLNEJWMyszeHJWZXdLT3dVN3JTTnRoeEhLQmtmbmNs?= =?utf-8?B?Z3hTdHJXZkowZzI4Um1CM1J2NzM2cEhKeFdMRUZiR2dqS3lQOEFwMWJRcTl1?= =?utf-8?B?K0RLeDNZc3RWYTdjVVpFN05lZElYd0ZERk9haWRybTdOcHd6aEhhV2l4V2tv?= =?utf-8?B?dGhtNFk4K0oybUVPSldkNjNIblRESVhDeTZsb2NpMkVQN2VBN0E5ZXh6NWRn?= =?utf-8?B?UXZSVEVmQkNBTnVLY0RKbHdMNjJUK1FlUElCcUg2RTFsL0t3YWIzRGlaOUpJ?= =?utf-8?B?RytiUVR3T3JDeXFGWE11R0Zza2ozSlN6TS9mWEYzSlZwOHkzcjZNN3Q3Ujdu?= =?utf-8?B?ZjdKbjczWWh1L0hPaWFrOHFFYmRUQldhZi9TQ281ZStremJGVGVHL0VYdEN2?= =?utf-8?B?SkM4S0xuaCtNZnVTME1aNkxuMDdhNE1CcWpwUTFCWXR4czRLMG9jRzFHMXl5?= =?utf-8?B?bGlFdTdIWGlCTEY2WllsS0NpaVcyQTRmUUxkaDdJUTNPMm9MZGUvc2xybW5O?= =?utf-8?B?YlpLOVZqNDNwV2tlRzJVZTR3dXp3SXZBL1hIOE5IcnJQNTNhU0VMZGIrRmd6?= =?utf-8?B?WjUvZDJvRTY5Ulp5L2VCOEJvYWFPR3FuYS9BOXJLWndnRVRaeCt3UmJQb1Iy?= =?utf-8?B?SFVnNUVWVndRTXhDeUZWSWsxL2k0bE9qRHNHaGZLNHN2NVZnTEdFRTBYZUYy?= =?utf-8?B?MW0zeEp3aWdBbkVHbVc3QisyZHkzVVRoVjdsSTlpd2xaam5xcFBEeUxyN3Fa?= =?utf-8?B?UnBVZVJ1SlVsdGJ4UVZlbjRqTms1OEltb3lRejFhNy9EZ1dvYnBOa0VlYVpS?= =?utf-8?B?OHV1VWozZHpPdDM2dXBLWnMzTE5henU4N2IyZ0pNckxJSmthVXdRZEIvQnVw?= =?utf-8?B?N3BWU0l5bENLeW40UE5PMWlsNWlmUWdYV3NYaXVnZGR0TjFjcjNjYlY3Sm9Z?= =?utf-8?B?S3V3ZHdNMWdxaEI3NGxKWms1bU1NNUUzWEZMd2RSeHFSUDZoNi96RTJ0TTNE?= =?utf-8?B?b29EVHBnVklEdGdqSmVRbGtmbVZadjhNK2Q3MmdwL0JZZ2EvSjBxM3J5YjlT?= =?utf-8?B?SUs4c2d6VlMwSXZVYVNXTkdNelBjSGVJYjlGYkNqZlBmTHdyNTlDeEVYTm1H?= =?utf-8?B?d0hVVVhVVmRNK1JSbWZ4ZWdRendRMnozc2Rib1FyUHdjUUV1REFzQjAzYjRv?= =?utf-8?B?OWlWWDNTR2FVZi9USEoxUDh0U09BMUNHN1JKeURKZWpZL0lwZVdlUXNITGFp?= =?utf-8?B?b2FzNnVCMTBCQ3ZTaHhQZ0ZNWTR1aVM4UFFnbW5VSWRYSFpiMlZ5NTlMdzBU?= =?utf-8?B?SzBOclEzQ0E3UEVXbHFDSDM1cnpKTytMN3ZlT3hyZEpTS0dpOGI4bFl1aEw3?= =?utf-8?B?WEZuUzcxdHgvMVRqbnJuRERkQ3doVCs5cHdYTDlGc1VXK1pNRmh6WVJVNEE1?= =?utf-8?B?WUtJRnhVTXNhYmRzQXYwdXFzQm1QaVhITUNVZWl5S2J4VC9OSVZiT0ZqRzBR?= =?utf-8?Q?K7S7K1Oz2a0KWyuTjYG1KSp3zmndgLoYbjkZQ=3D?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR11MB5030.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230034)(376008)(1800799018)(366010)(38070700012); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?L214blZRUVV4Y0RRMjRaSUtXL0ZXTTF0SGx5clAxdldNQUdBcXZzTUhzQlV4?= =?utf-8?B?ajI3S24zbWF5aDVEbjM3MC9YdXc5dFVJOHBsYjR6SFU0NHhqTGp3SFZrSS93?= =?utf-8?B?ejZjNS9LZy9DUXdoU09McFdEa2daVnQ4YTV5Uyt0NHhxQThQUXlhS3krQVlB?= =?utf-8?B?bDBna3FoV1dReHRtcFhOTHBpM2lXMG9IUm5aYk1NQ2FhSDhPZlZjcHhWZjRk?= =?utf-8?B?T29xTjhyOGwwVVROTTdGQXZETVpnUGpFMzk0TjFUaDJmOUpXZVpWRHRvekJY?= =?utf-8?B?YVFBd1FCVUJWSGNFU1Qvc1k3NHBURFJESUxnamhRdkpLVlB0cWcrbzM3aisv?= =?utf-8?B?MFgwWnR4UWg4cGlJMzRhOE92UkUzTkpPM2JFU1ROUmFmNjhFUzFwTlpGdEtC?= =?utf-8?B?eDZxTjAySVkxVGdzUVNtVlRZUTloanNaSitnYmsvVEpvaVU3R1prWWJjdi9Q?= =?utf-8?B?aElLcXo5Q2U2YVBncjczNmliSmx5MjN0ajA3TWxIZ1NRTklWbUFyeVFmckJR?= =?utf-8?B?L25IelV0RVZoNkVHYit4dCtuUUYycmZ3ZkVVd2dYZHpuY3ZaT2VnOHhJSjZW?= =?utf-8?B?M3ZucStmMHpCNmhWZUs1NG4zZW5HYTloOWdhWC8vNDJlNkpRTXNKUHliS1BL?= =?utf-8?B?SVBucldpYld5dytmbENOam9TeVVuUHcyYlVRTnJPbmZIcTJBTmhYbXR4b0dY?= =?utf-8?B?WEJaZVNFTGQ3U2d1Wm12Y2hlOC9CdjJReEppeXhQSWdhOVFjZzlaNXoyMTNs?= =?utf-8?B?eWhNZENnUW5YMndabnhnV2YxWHBJQUl1SHhYc0Q2aE1IemVVTkp4R1NmZ0Er?= =?utf-8?B?TzFrR1N0Ym9HTUZGaEFkckdhYzVQMWVwaUxKWFVmZENIaVQrR01SSE9ZN1VB?= =?utf-8?B?VTBXd2ovU3phU2lEMDllMmRDYnhhMDlCSDVKdzBjZzg4M1h5QlQxN2xPa2RV?= =?utf-8?B?ZEFTVVBNenFYUTFSOFZNSTZ4VW03aVg4UzF4RG1wc0R6ZGJ0QjNIWkQ0eU5V?= =?utf-8?B?WW9xOHFYbmFZSGdENHIramNFcVJtcnBYb2EzMUFybDJXZXpXbTFoRmlkdnp3?= =?utf-8?B?eWNHVjk4dDdVbDdnNnZ2dTRKTUY5VmZ0NjN3c0I5eGJHZ0paak01TGhaOXlx?= =?utf-8?B?dU1GUlpOd3hZTWlTVzhTaytoRTJRbVNsRG5POW04aDY1bWpFcmJQRjlpLy9P?= =?utf-8?B?cytpMTNpNEVVSW81RkJZek1RNkZyVjJXNU5FaWI0YXBXeGVTL0VrVGw5akRp?= =?utf-8?B?bDBwZ3pFUHNxQ0hPZ3dzZzFVMXpjYjdhTjlTbmNBb2taeUg1b29Cc2MwRmxw?= =?utf-8?B?b3QySXhwNkFROXA5U2dQZkZDcmdUWGJ0aGFybHNHczBkcm93QWN6SFM2TkJa?= =?utf-8?B?SXBNOUl3YWhzbHZLSTJSNjU2czRVRWx1Nkx4cEN3SG9hQ3krVU9xaHpkNnBr?= =?utf-8?B?cnQ4NTFJbS95aGpwOFZmMWN1dURsNEdES003MTRlZVliM0ZtVjFpdksyZFd0?= =?utf-8?B?d0lud3dhdXozTUQwVURYUVg0WVZZcVVaekczNHh2R3h6QUtlb3RvS0dndmlD?= =?utf-8?B?LzV1UVh5TXl1K0ZTZXNGUVFNa1E1VFM3ZWlhYldUcWZQOVA4MkFpUDFIemhv?= =?utf-8?B?S1g5L1dvRWsrYlpZTmsvZTJWNUwyc3JPdjhvZVhCbkZ3c0pTYmtpWGM2QXlm?= =?utf-8?B?dy94dytlYjUxK1F6MTBlRUtUeHdqYjNUQUxsdE5HWDdhZXlsQ3phendvMDlR?= =?utf-8?B?bml3UXJGdktZZDNEaWVqK2NLWXRueHdkUmVjSUN6OGhsSWVKdmlxRnRyRmdZ?= =?utf-8?B?eDhDUmxvOUUxQm1wV1AyQVFDTGlwZlI3ZU93Nm5CcDRkWkppN3huY3dCQ3Zh?= =?utf-8?B?NWp0am9ieThjTWJCNklENzY2M3hLbDhIREJLUGhJUUtqNmErcGVOS2NDdjhx?= =?utf-8?B?VjZzQU1MSVo3MFRlSCtkQVJ0US9JRjQxM2U3MnRtYlliamNPbGVrWENSZUVV?= =?utf-8?B?L3VOWDhUMlNZSVpsN2NjZnhESFBvUUlKdFNIZzVmMmczdTFiZ240TXN5eUho?= =?utf-8?B?M1Z6K3dQKzBTVTZkZjNlV1VlZ25tU0QyREZTOVgwSnpmbHFCQnhTNEp1RXNq?= =?utf-8?B?MUhuRk0rSkMyZ2cyOVdnZlNDdXVxSksvOEYwc3NmeitlTW9Ka2hTeXBvd0Jz?= =?utf-8?B?TUE9PQ==?= Content-ID: <5CA35EDF5E1B7E428E7E8BBFDF456382@namprd11.prod.outlook.com> MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5030.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fe9dcec-2899-4084-b3cf-08dc8b6d7e2a X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Jun 2024 05:55:56.3303 (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: 7EuTcdJbuXpolrbVvjYwLYULn+tqDrIpYjYBjsWDLfEdN9splODybV2iNqRZ9xduBmF5wMK2ss1W5hh/7ULTZg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR11MB5242 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH 37/39] lavc/hevcdec: move some frame-end code to hevc_frame_end() 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, 2024-06-07 at 15:01 +0200, Anton Khirnov wrote: > Specifically, calling hwaccel end_frame, verifying frame checksum, > and printing the frame-was-decoded message. > --- > libavcodec/hevc/hevcdec.c | 187 +++++++++++++++++++----------------- > -- > libavcodec/hevc/hevcdec.h | 1 - > 2 files changed, 91 insertions(+), 97 deletions(-) > > diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c > index 7263b80a24..a8c2172674 100644 > --- a/libavcodec/hevc/hevcdec.c > +++ b/libavcodec/hevc/hevcdec.c > @@ -2942,7 +2942,6 @@ static int hevc_frame_start(HEVCContext *s) > ff_hevc_clear_refs(s); > } > > - s->is_decoded = 0; > s->slice_idx = 0; > s->first_nal_type = s->nal_unit_type; > s->poc = s->sh.poc; > @@ -3038,6 +3037,75 @@ fail: > return ret; > } > > +static int verify_md5(HEVCContext *s, AVFrame *frame) > +{ > + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame- > >format); > + char msg_buf[4 * (50 + 2 * 2 * 16 /* MD5-size */)]; > + int pixel_shift; > + int err = 0; > + int i, j; > + > + if (!desc) > + return AVERROR(EINVAL); > + > + pixel_shift = desc->comp[0].depth > 8; > + > + /* the checksums are LE, so we have to byteswap for >8bpp > formats > + * on BE arches */ > +#if HAVE_BIGENDIAN > + if (pixel_shift && !s->checksum_buf) { > + av_fast_malloc(&s->checksum_buf, &s->checksum_buf_size, > + FFMAX3(frame->linesize[0], frame- > >linesize[1], > + frame->linesize[2])); > + if (!s->checksum_buf) > + return AVERROR(ENOMEM); > + } > +#endif > + > + msg_buf[0] = '\0'; > + for (i = 0; frame->data[i]; i++) { > + int width = s->avctx->coded_width; > + int height = s->avctx->coded_height; > + int w = (i == 1 || i == 2) ? (width >> desc->log2_chroma_w) > : width; > + int h = (i == 1 || i == 2) ? (height >> desc->log2_chroma_h) > : height; > + uint8_t md5[16]; > + > + av_md5_init(s->md5_ctx); > + for (j = 0; j < h; j++) { > + const uint8_t *src = frame->data[i] + j * frame- > >linesize[i]; > +#if HAVE_BIGENDIAN > + if (pixel_shift) { > + s->bdsp.bswap16_buf((uint16_t *) s->checksum_buf, > + (const uint16_t *) src, w); > + src = s->checksum_buf; > + } > +#endif > + av_md5_update(s->md5_ctx, src, w << pixel_shift); > + } > + av_md5_final(s->md5_ctx, md5); > + > +#define MD5_PRI "%016" PRIx64 "%016" PRIx64 > +#define MD5_PRI_ARG(buf) AV_RB64(buf), AV_RB64((const uint8_t*)(buf) > + 8) > + > + if (!memcmp(md5, s->sei.picture_hash.md5[i], 16)) { > + av_strlcatf(msg_buf, sizeof(msg_buf), > + "plane %d - correct " MD5_PRI "; ", > + i, MD5_PRI_ARG(md5)); > + } else { > + av_strlcatf(msg_buf, sizeof(msg_buf), > + "mismatching checksum of plane %d - " MD5_PRI > " != " MD5_PRI "; ", > + i, MD5_PRI_ARG(md5), MD5_PRI_ARG(s- > >sei.picture_hash.md5[i])); > + err = AVERROR_INVALIDDATA; > + } > + } > + > + av_log(s->avctx, err < 0 ? AV_LOG_ERROR : AV_LOG_DEBUG, > + "Verifying checksum for frame with POC %d: %s\n", > + s->poc, msg_buf); > + > + return err; > + } > + > static int hevc_frame_end(HEVCContext *s) > { > HEVCFrame *out = s->cur_frame; > @@ -3062,6 +3130,28 @@ static int hevc_frame_end(HEVCContext *s) > av_assert1(ret >= 0); > } > > + if (s->avctx->hwaccel) { > + ret = FF_HW_SIMPLE_CALL(s->avctx, end_frame); Hwaccel will not decode slice data to get ctb count, frame_end will be always missed for hwaccel. Maybe better to keep hwaccel frame_end in its original location. Thanks Fei > + if (ret < 0) { > + av_log(s->avctx, AV_LOG_ERROR, > + "hardware accelerator failed to decode > picture\n"); > + ff_hevc_unref_frame(s->cur_frame, ~0); > + return ret; > + } > + } else { > + if (s->avctx->err_recognition & AV_EF_CRCCHECK && > + s->sei.picture_hash.is_md5) { > + ret = verify_md5(s, s->cur_frame->f); > + if (ret < 0 && s->avctx->err_recognition & > AV_EF_EXPLODE) { > + ff_hevc_unref_frame(s->cur_frame, ~0); > + return ret; > + } > + } > + } > + s->sei.picture_hash.is_md5 = 0; > + > + av_log(s->avctx, AV_LOG_DEBUG, "Decoded frame with POC %d.\n", > s->poc); > + > return 0; > } > > @@ -3109,7 +3199,6 @@ static int decode_slice(HEVCContext *s, const > H2645NAL *nal, GetBitContext *gb) > ret = hevc_frame_end(s); > if (ret < 0) > return ret; > - s->is_decoded = 1; > } > > return 0; > @@ -3290,75 +3379,6 @@ fail: > return ret; > } > > -static int verify_md5(HEVCContext *s, AVFrame *frame) > -{ > - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame- > >format); > - char msg_buf[4 * (50 + 2 * 2 * 16 /* MD5-size */)]; > - int pixel_shift; > - int err = 0; > - int i, j; > - > - if (!desc) > - return AVERROR(EINVAL); > - > - pixel_shift = desc->comp[0].depth > 8; > - > - /* the checksums are LE, so we have to byteswap for >8bpp > formats > - * on BE arches */ > -#if HAVE_BIGENDIAN > - if (pixel_shift && !s->checksum_buf) { > - av_fast_malloc(&s->checksum_buf, &s->checksum_buf_size, > - FFMAX3(frame->linesize[0], frame- > >linesize[1], > - frame->linesize[2])); > - if (!s->checksum_buf) > - return AVERROR(ENOMEM); > - } > -#endif > - > - msg_buf[0] = '\0'; > - for (i = 0; frame->data[i]; i++) { > - int width = s->avctx->coded_width; > - int height = s->avctx->coded_height; > - int w = (i == 1 || i == 2) ? (width >> desc->log2_chroma_w) > : width; > - int h = (i == 1 || i == 2) ? (height >> desc->log2_chroma_h) > : height; > - uint8_t md5[16]; > - > - av_md5_init(s->md5_ctx); > - for (j = 0; j < h; j++) { > - const uint8_t *src = frame->data[i] + j * frame- > >linesize[i]; > -#if HAVE_BIGENDIAN > - if (pixel_shift) { > - s->bdsp.bswap16_buf((uint16_t *) s->checksum_buf, > - (const uint16_t *) src, w); > - src = s->checksum_buf; > - } > -#endif > - av_md5_update(s->md5_ctx, src, w << pixel_shift); > - } > - av_md5_final(s->md5_ctx, md5); > - > -#define MD5_PRI "%016" PRIx64 "%016" PRIx64 > -#define MD5_PRI_ARG(buf) AV_RB64(buf), AV_RB64((const uint8_t*)(buf) > + 8) > - > - if (!memcmp(md5, s->sei.picture_hash.md5[i], 16)) { > - av_strlcatf(msg_buf, sizeof(msg_buf), > - "plane %d - correct " MD5_PRI "; ", > - i, MD5_PRI_ARG(md5)); > - } else { > - av_strlcatf(msg_buf, sizeof(msg_buf), > - "mismatching checksum of plane %d - " MD5_PRI > " != " MD5_PRI "; ", > - i, MD5_PRI_ARG(md5), MD5_PRI_ARG(s- > >sei.picture_hash.md5[i])); > - err = AVERROR_INVALIDDATA; > - } > - } > - > - av_log(s->avctx, err < 0 ? AV_LOG_ERROR : AV_LOG_DEBUG, > - "Verifying checksum for frame with POC %d: %s\n", > - s->poc, msg_buf); > - > - return err; > -} > - > static int hevc_decode_extradata(HEVCContext *s, uint8_t *buf, int > length, int first) > { > int ret, i; > @@ -3424,31 +3444,6 @@ static int hevc_decode_frame(AVCodecContext > *avctx, AVFrame *rframe, > if (ret < 0) > return ret; > > - if (avctx->hwaccel) { > - if (s->cur_frame && (ret = FF_HW_SIMPLE_CALL(avctx, > end_frame)) < 0) { > - av_log(avctx, AV_LOG_ERROR, > - "hardware accelerator failed to decode > picture\n"); > - ff_hevc_unref_frame(s->cur_frame, ~0); > - return ret; > - } > - } else { > - /* verify the SEI checksum */ > - if (avctx->err_recognition & AV_EF_CRCCHECK && s->cur_frame > && s->is_decoded && > - s->sei.picture_hash.is_md5) { > - ret = verify_md5(s, s->cur_frame->f); > - if (ret < 0 && avctx->err_recognition & AV_EF_EXPLODE) { > - ff_hevc_unref_frame(s->cur_frame, ~0); > - return ret; > - } > - } > - } > - s->sei.picture_hash.is_md5 = 0; > - > - if (s->is_decoded) { > - av_log(avctx, AV_LOG_DEBUG, "Decoded frame with POC %d.\n", > s->poc); > - s->is_decoded = 0; > - } > - > if (s->output_frame->buf[0]) { > av_frame_move_ref(rframe, s->output_frame); > *got_output = 1; > diff --git a/libavcodec/hevc/hevcdec.h b/libavcodec/hevc/hevcdec.h > index f0443b3ab9..da4d83e661 100644 > --- a/libavcodec/hevc/hevcdec.h > +++ b/libavcodec/hevc/hevcdec.h > @@ -488,7 +488,6 @@ typedef struct HEVCContext { > int bs_width; > int bs_height; > > - int is_decoded; > // NoRaslOutputFlag associated with the last IRAP frame > int no_rasl_output_flag; > _______________________________________________ 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".