From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 4C9D04DE29
for <ffmpegdev@gitmailbox.com>; Fri, 25 Apr 2025 22:01:19 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B678687DEE;
Sat, 26 Apr 2025 01:01:15 +0300 (EEST)
Received: from EUR05-DB8-obe.outbound.protection.outlook.com
(mail-db8eur05olkn2060.outbound.protection.outlook.com [40.92.89.60])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5347D687D46
for <ffmpeg-devel@ffmpeg.org>; Sat, 26 Apr 2025 01:01:09 +0300 (EEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=cCav97K/j0bItZcHalH3daapIFBCDCQhg5yklbHqcpCOaxKVzkzz0RODdd2s9OkJs03kChabKvJqXdzH/Xit6MzUICtV7lyxTCqit3DCa2ZAU2p0W/io/f0jeTnwqC5G4SLQFl/DWzQfsF7dHbE67d543tTSfdGxpBZmDhjLjMsPbB9UCePzP7Po3mC7BhiFUWxkrivDl3c/yKIz/53z7a/VefxyqG6eFAKvzFZIiX+duZiMekYq4q1967diE7L5r1K8V9rgWKBT83T8bBzp1gyUS2z9NJgRZzBxE7pYjasO16Tig2uHxp7SK+JtpidQlBCs0iUf1qOTbY2VyafkQg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector10001;
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=cGvItfCUwRIPEgYT+ljgzIFtx6/WO1YSr4X5iWkjY+g=;
b=nmo9gT1tIsemcFyLudnbBQxIKNFnWX/Bwuisv3pIM8qBxQrzsV0gWxxpMZf98enG7DdzHwHNaBbcNZlBItnHCInUODQYri/eAvtqYy9EesvjFMTxXiQGThJ9rD57BSjacpZPrh132JRF34Z93j1TU5SPT2+wljZGJwzEDGBdAxtJNeo1c7dphoQRlj0/PO9gMp0f8z/LdzXHhBpLYJOCfOL4ISZxh/M90bXKRq88Xd/6UXGdaFy43E4bl6Va7Aq15hcEpULghJibSKHoCVI5p3REs3CIXMRrR7W8X8E9ohii0FGFknzSBNd9UFUoBzD1SK7YIINt3eJn6D/09+ouvw==
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=outlook.com;
s=selector1;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=cGvItfCUwRIPEgYT+ljgzIFtx6/WO1YSr4X5iWkjY+g=;
b=GAmFmXn5VF6o2t37GmZJFfXJ1EBuAEvli9/q57EEN4XRecHJXlU4ZUx6qB3Y1GvHbSi32Vgc9cmlV259LA/kmHgTlX7WwtYCinKXHg3D2KTscSaK0EeaN9SMuur/Y+igbmJ/8ChE20N5xiS132Or7N7L/mhIrStbe7FB9EYZl8u1oaxCJTAul3VLPQKLEZL2LBAivJj5CPLYsddaU19/f/k6nckWkrAtAW4SrbomUnkNr/o9i0/CgQNnlPsrKjb74P5pL8swtS6CCB7xqjwNOlZza4uR3nHePqt/uMvSxfJNxqF14xKQcT3t9SXwnHCcXHXoPZOtn6mMNZkbts3Ujw==
Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17)
by PR3P250MB0151.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:176::17) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.27; Fri, 25 Apr
2025 22:01:07 +0000
Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
([fe80::d6a1:e3af:a5f1:b614%5]) with mapi id 15.20.8678.024; Fri, 25 Apr 2025
22:01:07 +0000
Message-ID: <GV1P250MB0737CFBC80EC0133D4B1CE718F842@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>
Date: Sat, 26 Apr 2025 00:01:05 +0200
User-Agent: Mozilla Thunderbird
To: ffmpeg-devel@ffmpeg.org
References: <20250401171616.1378-1-toqsxw@outlook.com>
<20250401171616.1378-9-toqsxw@outlook.com>
Content-Language: en-US
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
In-Reply-To: <20250401171616.1378-9-toqsxw@outlook.com>
X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM
(2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
(2603:10a6:150:8e::17)
X-Microsoft-Original-Message-ID: <982560e9-7a34-43c9-8bc7-ea32543e5a03@outlook.com>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0151:EE_
X-MS-Office365-Filtering-Correlation-Id: 7233a6c9-1575-4cfc-e5bf-08dd8444ae30
X-MS-Exchange-SLBlob-MailProps: a+H6FLLcF3pAAaZRMwzHQe6ean9cA8ZgYQUqtHoPdmi/kG6/TGoCBzjJHEoaueT52b9G0nH9liduIkl1KEf2AE7nyIsaXQHMBIfuBVJEq2z7cHD9i+JU2vT5/CophrGF1cxyKp8JXJ0BJWZNSc5Y0u15EuTfDJumpplbyXwtaLjqFhIP8/R0TTbAc3eeKAlsYx/Od3M1f2Db0LH4doFOiFLTl2qvM01Rvpn+djSsjTEN0kSboGkZh8hOxXxpCinFX9DoJxt8guio5on136i1YjFit/xE20d6kZTxUXzyhmOCfec7UlVmGi7UvhylduQDtuTVIoiGJNd8uQAZ/6dj9zoN00gE6jfP0R/hzM192fHdtS2XZJF5KxBhqrKXKcRAXEXulbx5GR6uPRLpeDnBfXfENLt5ySS5DUKTC+SEobfqoih7ZQWxHeRp0xTU1kPM9WN5MvlHoHmI6wIBe+pGs0++RhInU+cJAA/psGqcDaCer++fObecqW+BhjpyUMpCyQlGIew8EtAHurmm2TtW4yaYMRAzazonUhvB9Zhj3YiECY0Fm0+lsIbzRaIx0MdnhFtJotGnmLz8ZIcOyP6ZoVYj8kxHLVB/X1tl8yRNeBmP6b7JNIHDP4CYCWk6DwM5wM0+Db3tqmv85sfFerhCQ0gwVWZab7kbQLhM3O0QF9JsIfnqGSTC2xwjK0LEz04yl9OWcxFQhDOz6E/c1yGNOENbiF/1nyv5KGniyMKgq94J47L8om515+IZi9xzBuVVYhfd20tBxjPzmQrQdyzh6ix92ay5sf+W44KR6zwH6oPSKoznsvbM1xQlAqHzjV4B
X-Microsoft-Antispam: BCL:0;
ARA:14566002|15080799006|7092599003|461199028|19110799003|8060799006|6090799003|5072599009|440099028|3412199025|12091999003|41001999003;
X-Microsoft-Antispam-Message-Info: =?utf-8?B?REowTlRPUGRFZ1p2SU9telo0SzZpSVVFWXp4TVRPbHgxbk1HODBicmVaTWky?=
=?utf-8?B?NnlsTjNQVzFSSkJQSTk2ZndhOGFCNWc1NFpNTUhVNWZpblBvRlhCMklCQ1Rs?=
=?utf-8?B?ODlpQzA5TUlJTnFmdk5Vb0FCZzRNNE5oVDZCV3Y4NFRKRG1tK1dpZUt6Y1lv?=
=?utf-8?B?MXF3dGNZUmVCUlNReERFdzZnRk1IM01TOVFxekJxTTVtblMvd3M4ckU5ellD?=
=?utf-8?B?NFI4dEp4eUo0YS8way95QkhDUkNSRVdBeGUzRnAzU3FaVGZxeEFLYnltMS83?=
=?utf-8?B?VjNzQVdKd0JCcm9QcDdxNGw4ZGc5Z3hGa3pIUy9YRHlmcHFTdzhLc0Q4Nnlh?=
=?utf-8?B?YXMvZDdyMGpqRnNhU0lWOFVPUVd3d1FpbEV5T0E0dVZvVHFXVU9YdlFBeTFi?=
=?utf-8?B?dkhnY3pRbW0rN0I4VEo5OG10b0FPOGcrK0g3alpzVGYxTHBtcmcrQ1IreUxV?=
=?utf-8?B?K3c1YVFrNVhnSlR6ckJZbm95UVhwNE0yZm0yQTE3VTNndkppbjRVMVV2TGE0?=
=?utf-8?B?cnBoOGN4OGVidm9xbVJ0eUgycXNybmdlNHVUTlY5YzJNMy82eFZrVTR5NjlE?=
=?utf-8?B?YmRadTEwUXZiblpjZFBLWFdpSUtRNHpNZHFDaWwwUTMwekt0dFpwYXBQdk1V?=
=?utf-8?B?MVFZYTJlSmVXZWxZbEo5WElWaFZQbHFYYlhPR0lQOCt4dDZWWWNxRXdHSG9E?=
=?utf-8?B?eENnRWpacXJMcWVTRXloZG9vOVZabWh1c2lmSTdoeXZmRW05MEpLcFg0QkJO?=
=?utf-8?B?L05kR0NtdFEzVkpMNkRVMWswQ05DTHpuOXhRTDBGdUlEOXpqTkJhV0xyVXJU?=
=?utf-8?B?N2NyaWo1bTJGS2cxRitYUFJxOEFWSDV0djNKM2lRNVo3eHNpanUzbmdPWnZM?=
=?utf-8?B?TlU0S2R1UDk5ajJncW90V3I2MWNQc1JUOHpGME1ja09pc0t0dTl3bzZ3V2N1?=
=?utf-8?B?cGY2eDhWVXhxbTJ0QUtrcGxZbUQ3eVhta0x2dE5qdDkwV29KQTZuQXpRdHk1?=
=?utf-8?B?amcyUHlYRy9Ob01PS25xaFBia2l1STVvcFdGcEkwSEE3S0tudnhHR25jU3Jx?=
=?utf-8?B?R0U4SnRSM0ZYTnFheEdNZEtEeGZCWnEwYVJJQVRxeUFyNUloTUxOODBMVW1S?=
=?utf-8?B?OUtyNC9VVDdCTndXbUVhQS9VQlkwd2tLVXE2TC8wbHdlZE9BanljNGVGZllG?=
=?utf-8?B?aE9tdHZuY2dzZmxTaFZwWGtaV2o1MU1ZYm5meG5LdlhXVm9rVWdtT0xnaDE3?=
=?utf-8?B?UGtlVE1MM2FoQmJCSno5S1hXdGRRRDUwdWdSb2Y4dVMvWDV3aE9wVUUxckx0?=
=?utf-8?B?L3hLbHhFYXA4UGN1c2d4ZGhPcklIdXZ5QzM1L2ZRemxnb0Zla1pZYmZGbVBp?=
=?utf-8?B?VG90NlgwanhSRFJ2MkxvbDh4WXcrTFNUSi9qUVR5bmdWLy9XU2xJL3BkdE55?=
=?utf-8?B?SHNhNFBKRFdjbnZXSlc1NzdPdlliZGN6Z3gwaDFzYUFzYlJXVGYva0VqZEYw?=
=?utf-8?B?MG1IYnV5d2g2ZkNsZkU4NjZlc1RsMVNJZFJmeHduRUZndlV2dm9PZi9yU1BT?=
=?utf-8?Q?2ases2DyhYpselrTJhjiAvMPq/9M/0i3CPXJ4KlUKBHfcX?=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YU9paVI4QzlPTDZFK2lrSGJiUFBhMzdkbkhrUGp5cnRSOVdnSkZmSGY3WUg2?=
=?utf-8?B?ckdYNkYvWUFVaTlYclRwQkgxdCtTdk9uZTd2cDYvVmdsZDVoSWFQTytmRTda?=
=?utf-8?B?aE9ITDlKUmVQK2VSdUtFK3hwaThmZk91TTVQNU9sV3B3T2dENjRYOEZuci9k?=
=?utf-8?B?aVkybW85V290VTJ0dDZRdHMrS2FFbkhMM2N2dE4wUkhYb24wblpDR09vQWk0?=
=?utf-8?B?WnNjZ0RDRUVkT2JNSkYySitGaVI0dldLMWJTZ01LMVRrRXlwVm9zVHlWdkJ4?=
=?utf-8?B?VzYra1FVYWtOd0pEZjhsL1dnWEVqeVNqQUFtZXduazI2QS9mSW1qMzVDQ21I?=
=?utf-8?B?VEY3ZTYvWHQ3d21pUk1zRmJVSlZJam02VDNSM244SHVqN09sSTNHa1pMWCth?=
=?utf-8?B?UnZSNWFoS2dtSHZFMU53Z2QwZG03VHcrcDhjYmtOOGJDbDcwS0FYVnIwK3FX?=
=?utf-8?B?YWp3TzFKaEsvUnJOWXZaSExKMjNkTG1nUzlZTWlqNGVwVVNLZm0yQld3QWhq?=
=?utf-8?B?S1M5T25rNlRTZEdwaFZnU2dQSGVqWXVMSUlBRDNpYVh0dnFUUjRHNHdLK0RQ?=
=?utf-8?B?V2hHTU05UStORGpiZExyZWpWUldPQUhaTkFTMTc3Y2JjZk1oUDJIeitHczZL?=
=?utf-8?B?aG9ISDArVjdqN2J0dlNpUS80NWZEcFN2bzlwR1YyaU1ZRm1YTjlFKzgrWFda?=
=?utf-8?B?VmVuRkJNeHcxZHJxWk1teDF1WjNVQUhWTExEN3BHN2R2eFl1dUVnOHN0Nzln?=
=?utf-8?B?eG4xV245MUhvTmJWV0k0ZWI1VDAzeWlEWk5yd3pld2xWYjFjblFpTG5mMmRj?=
=?utf-8?B?Q3lvU3FNRk9NcC9pbHR1UmFMQmdLbjZ5Y3VVRjZPVVY4eTNUUUxsaXBmd2ov?=
=?utf-8?B?elI1bm5RRE5jMnl1dDF2YUdVUlVmcVpzdGlUekY0M1BVNFdLYUp6aFNSS29C?=
=?utf-8?B?SnphU0FOWTcrZTJpZGtobjFIaEZrTnd5emE0K3JXUHhidUthdGM5MEFiRFFY?=
=?utf-8?B?dnkzazcvU1IyQWkyNm8rNE9mbndDNTJCY1krRTUrN2t0MjB6MitZbkU2SzI0?=
=?utf-8?B?QTBnN09Ec1lGK1lMbFR0SkdLL290RHV3SThmNVFPczUyNjVGeWxxeHlSRkRG?=
=?utf-8?B?Sk14bDNVZ3JPcWZ4THVFOUkvZ21EVXIvOXE3S0wxQ1FjcVJNQzViUDBYWDR4?=
=?utf-8?B?blJ1ckhqOGZBT1JycUJKWGljN3NsaXhuTDMwZFVyRVJwMFo0NDhnZG1PSWs5?=
=?utf-8?B?Rk5RYXl3aUlsYm9uVExMVGwyRDYrMktHS2tvcXhLbUZsd2FXMW5Vc2RNa21u?=
=?utf-8?B?cHM2L2MrWFhlVlpIM3RWU2pjMzU3Q0tuUHBVM1drUlNFZXJRTjYwQ0lpRDVx?=
=?utf-8?B?cjNtRUVURTdrWWwreDlnTHVSR2s4a1ZkZXhDdGllcC9YUkhJV3hGcmdRUmM1?=
=?utf-8?B?dGxLMHY5M3JiVVRjRmlkemlBaGh4M3I0NytLL2kyRkRubEM3diszUlc4dkxG?=
=?utf-8?B?Q3UzVDVWMU1iMnIxRU1YY1l1YzBjYXNuZnJtMmFjaVVDWDdRazc0OEdJQmxt?=
=?utf-8?B?UHBPVlpQUWRuUVRpY3JNcTNrWlgvZ2xINnZvY01haG9vRjZhUW5YRndEaUJZ?=
=?utf-8?B?bFMwcWk3SXhwNFdMdW5JekhwTHViWDVySGhiWU5Wd1NvU2x2Ni9JWTZXUXUx?=
=?utf-8?B?UDZWdHdqNXE4dm4rOGhGemRMWUUwTnZ6S3QxZzdwQS92VStVQlM3a3VqUnRl?=
=?utf-8?B?MW83Znd6UXNoSEY5eTgvYk1zb3NnWWlzTkJBYmx4MmZKRWxEOE5QdEdMNTlV?=
=?utf-8?B?UjdTU00zU2dwVEZldEVmZz09?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7233a6c9-1575-4cfc-e5bf-08dd8444ae30
X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Apr 2025 22:01:07.5789 (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: PR3P250MB0151
Subject: Re: [FFmpeg-devel] [PATCH v1 09/19] avcodec/h274: add ff_h274_hash
functions
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/GV1P250MB0737CFBC80EC0133D4B1CE718F842@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
toqsxw@gmail.com:
> From: Wu Jianhua <toqsxw@outlook.com>
>
> Signed-off-by: Wu Jianhua <toqsxw@outlook.com>
> ---
> libavcodec/h274.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++
> libavcodec/h274.h | 7 ++
> 2 files changed, 170 insertions(+)
>
> diff --git a/libavcodec/h274.c b/libavcodec/h274.c
> index 5709200322..9edc705042 100644
> --- a/libavcodec/h274.c
> +++ b/libavcodec/h274.c
> @@ -26,7 +26,11 @@
> */
>
> #include "libavutil/avassert.h"
> +#include "libavutil/bswap.h"
> +#include "libavutil/crc.h"
> #include "libavutil/imgutils.h"
> +#include "libavutil/md5.h"
> +#include "libavutil/mem.h"
>
> #include "h274.h"
>
> @@ -790,3 +794,162 @@ static const int8_t R64T[64][64] = {
> 17, -16, 15, -14, 13, -12, 11, -10, 9, -8, 7, -6, 4, -3, 2, -1,
> }
> };
> +
> +static int verify_plane_md5(struct AVMD5 *ctx,
> + const uint8_t *src, const int w, const int h, const int stride,
> + const uint8_t *expected)
> +{
> +#define MD5_SIZE 16
> + uint8_t md5[MD5_SIZE];
> + av_md5_init(ctx);
> + for (int j = 0; j < h; j++) {
> + av_md5_update(ctx, src, w);
> + src += stride;
> + }
> + av_md5_final(ctx, md5);
> +
> + if (memcmp(md5, expected, MD5_SIZE))
> + return AVERROR_INVALIDDATA;
> +
> + return 0;
> +}
> +
> +static int verify_plane_crc(const uint8_t *src, const int w, const int h, const int stride,
> + const uint8_t *expected)
> +{
> + uint32_t crc = 0x0F1D; // CRC-16-CCITT-AUG
> + const AVCRC *ctx = av_crc_get_table(AV_CRC_16_CCITT);
> +
> + for (int j = 0; j < h; j++) {
> + crc = av_crc(ctx, crc, src, w);
> + src += stride;
> + }
> + crc = av_bswap16(crc);
> +
> + if (memcmp(&crc, expected, sizeof(uint16_t)))
This seems endian-dependent (as are the other checks). Why don't you
simply pass the proper CRC as uint16_t/uint32_t parameter?
> + return AVERROR_INVALIDDATA;
> +
> + return 0;
> +}
> +
> +#define CAL_CHECKSUM(pixel) (checksum + ((pixel) ^ xor_mask))
> +static int verify_plane_checksum(const uint8_t *src, const int w, const int h, const int stride, const int ps,
> + const uint8_t *expected)
> +{
> + uint32_t checksum = 0;
> +
> + for (int y = 0; y < h; y++) {
> + for (int x = 0; x < w; x++) {
> + const int xor_mask = (x & 0xFF) ^ (y & 0xFF) ^ (x >> 8) ^ (y >> 8);
> + checksum = CAL_CHECKSUM(src[x << ps]);
> + if (ps)
> + checksum = CAL_CHECKSUM(src[(x << ps) + 1]);
Why don't you use checksum += instead of using checksum in the
CAL_CHECKSUM macro in a hardcoded manner?
> + }
> + src += stride;
> + }
> +
> + if (checksum != *(uint32_t*)expected)
> + return AVERROR_INVALIDDATA;
> +
> + return 0;
> +}
> +
> +static const uint8_t *get_plane_hash(const H274SEIPictureHash *h, const int plane)
> +{
> + if (!h->hash_type)
> + return h->md5[plane];
> + if (h->hash_type == 1)
> + return (uint8_t*)&h->crc[plane];
> + return (uint8_t*)&h->checksum[plane];
> +}
This function seems completely useless; you should better pass the
proper expected value to the functions directly (by value for non-md5).
> +
> +enum {
> + HASH_MD5SUM,
> + HASH_CRC,
> + HASH_CHECKSUM,
> + HASH_LAST = HASH_CHECKSUM,
> +};
> +
> +struct H274HashContext {
> + int type;
> + struct AVMD5 *ctx;
> +};
> +
> +int ff_h274_hash_freep(H274HashContext **ctx)
> +{
> + if (ctx && *ctx) {
Don't check for ctx. Passing a NULL to a freep-function is insane.
> + H274HashContext *c = *ctx;
> + if (c->ctx)
> + av_free(c->ctx);
> + av_freep(ctx);
> + }
> + return 0;
Why is this function returning anything?
> +}
> +
> +int ff_h274_hash_init(H274HashContext **ctx, const int type)
> +{
> + H274HashContext *c;
> +
> + if (type > HASH_LAST || !ctx)
> + return AVERROR(EINVAL);
> +
> + c = *ctx;
> + if (c) {
> + if (c->type != type) {
> + if (c->type == HASH_MD5SUM)
> + av_freep(&c->ctx);
> + c->type = type;
> + }
> + } else {
> + *ctx = c = av_mallocz(sizeof(H274HashContext));
Why is this separately allocated?
> + if (!c)
> + return AVERROR(ENOMEM);
> + c->type = type;
> + }
> +
> + if (type == HASH_MD5SUM && !c->ctx) {
> + c->ctx = av_md5_alloc();
> + if (!c->ctx)
> + return AVERROR(ENOMEM);
> + }
> +
> + return 0;
> +}
> +
> +int ff_h274_hash_verify(H274HashContext *c, const H274SEIPictureHash *hash,
> + const AVFrame *frame, const int coded_width, const int coded_height)
> +{
> + const AVPixFmtDescriptor *desc;
> + int err = 0;
> +
> + if (!c || !hash || !frame)
> + return AVERROR(EINVAL);
> +
> + if (c->type != hash->hash_type)
> + return AVERROR(EINVAL);
> +
> + desc = av_pix_fmt_desc_get(frame->format);
> + if (!desc)
> + return AVERROR(EINVAL);
> +
> + for (int i = 0; i < desc->nb_components; i++) {
> + const int w = i ? (coded_width >> desc->log2_chroma_w) : coded_width;
> + const int h = i ? (coded_height >> desc->log2_chroma_h) : coded_height;
> + const int ps = desc->comp[i].step - 1;
> + const uint8_t *expected = get_plane_hash(hash, i);
> + const uint8_t *src = frame->data[i];
> + const int stride = frame->linesize[i];
> +
> + if (c->type == HASH_MD5SUM)
> + err = verify_plane_md5(c->ctx, src, w << ps, h, stride, expected);
> + else if (c->type == HASH_CRC)
> + err = verify_plane_crc(src, w << ps, h, stride, expected);
> + else if (c->type == HASH_CHECKSUM)
> + err = verify_plane_checksum(src, w, h, stride, ps, expected);
> + if (err < 0)
> + goto fail;
> + }
> +
> +fail:
> + return err;
> +}
> diff --git a/libavcodec/h274.h b/libavcodec/h274.h
> index e1803edaf3..e2bb1aec55 100644
> --- a/libavcodec/h274.h
> +++ b/libavcodec/h274.h
> @@ -64,6 +64,8 @@ int ff_h274_apply_film_grain(AVFrame *out, const AVFrame *in,
> H274FilmGrainDatabase *db,
> const AVFilmGrainParams *params);
>
> +typedef struct H274HashContext H274HashContext;
> +
> typedef struct H274SEIPictureHash {
> int present;
> union {
> @@ -74,4 +76,9 @@ typedef struct H274SEIPictureHash {
> uint8_t hash_type;
> } H274SEIPictureHash;
>
> +int ff_h274_hash_init(H274HashContext **c, int type);
> +int ff_h274_hash_verify(H274HashContext *c, const H274SEIPictureHash *hash,
> + const AVFrame *frame, int coded_width, int coded_height);
> +int ff_h274_hash_freep(H274HashContext **c);
> +
> #endif /* AVCODEC_H274_H */
_______________________________________________
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".