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 5935A435BC for ; Mon, 18 Jul 2022 13:46:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5329D68B823; Mon, 18 Jul 2022 16:46:03 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (unknown [40.92.90.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A2F36802C4 for ; Mon, 18 Jul 2022 16:45:57 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FpS5vC5TvG4FXa1VDmWVQswjZblyf4KRJiulYIvhgqYXCnxNtQU9DUsi1+gYpZqYtlMHja+BwN2/FhobTa6OjCfe2qOzybnbkx+5ifdvdupQNDrrOL2r6uinD6q+GtwFz121VvQ9Ve1xFt4JfIvZ/TvD39F2BuRJFpYEQWHr/1v6ryA6d1nJyWKbk/A7csCEXJMkGOkJ0EzCGYAyzrpvCm+vIKattRtiHzBQQ/PXY2GoG+fACPc8FRqQIsRNdkpb3+GV79vMucaAKTCvsp7cEGvgdGpqF78xvhCgvM/pMQ7XUbQcz+zg2OTmjz3+5hbdE0Xjg7mAXiTNJ60YlcQtlg== 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=AIvnsJ2biC7Lh9U/IfTkfSgl8PWJZc3ahxGaTsRDc/o=; b=YsmeOa9O7FJEuj1iCGgjYzBxZnCAs3PYHwvvtWUvVh+Y7DmyMjudrYR68lvPGtilASfH0Wb4QyI8M5ypDyAPA5gQSb4GaBSRjLUnDtADKVrP4dA+bLl/d+32aZ+tz4P8gFMbHcdOnOdRQ7EqCdTpWLecZAflLCeJ+L0ARqu8MHhmixAP1/7lyeHHdZBUQxn5Z4r1SKyNHL+ZcKgHp34VzeN9yokHN/CS9yD50AdQalrRJtfn5jRTln+DAhJrYsukGCNrTNe0YeOIQuRrvrEernknGA/bx5ERddb9I46MhcAfQAai7HUETgwXiZLLP919EEy6F86JUN88QFRIodmskQ== 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=AIvnsJ2biC7Lh9U/IfTkfSgl8PWJZc3ahxGaTsRDc/o=; b=KYAnlFwgyzHCNutoJK0Vg5YPS/GDuQ4HlpGM1J5duOX7UsBUd8TuoRNMGzz6eI39xxwokhD/YOuowXOb+Z6xUhQXER5yxuDtq9OjW1VCoAcdoxBJISCZOrhpsg4AuXA1qr/DkGLfqcnE+MkHEkcUDTqUB57d8TMGEZiJ4tcfyyahg/WLQlOhBrG69877PLBjlBtx0G7ZaTSU+roEUejZwzJlmG41fgQENWaznKLwfAUxcykPcx+NcoZQb8K/tUyCRDjarcottFY73LelNo4INrD931t460uDRvWc1HuJ+yzlkbovGtQaxpoJ5dGtc5WcYOcQlyfKGL6CvzLGl80QNw== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VI1PR01MB7071.eurprd01.prod.exchangelabs.com (2603:10a6:800:191::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12; Mon, 18 Jul 2022 13:45:56 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5438.023; Mon, 18 Jul 2022 13:45:55 +0000 Message-ID: Date: Mon, 18 Jul 2022 15:45:53 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220717133143.881124-1-zane@zanevaniperen.com> From: Andreas Rheinhardt In-Reply-To: <20220717133143.881124-1-zane@zanevaniperen.com> X-TMN: [IwdfBwcB9lMaD4wnRxF1pVZwg4PVAf0b] X-ClientProxiedBy: ZR0P278CA0146.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::7) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <8100277e-6240-2f5b-1b7c-92e4f42e5d75@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1b1a9212-a34c-4c84-f930-08da68c3d6a0 X-MS-TrafficTypeDiagnostic: VI1PR01MB7071:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RT0Hvy60ACqk0NLs75QkdIRX5toZB8P/a5ycvD6SulyAwRSwI8BNWvqegCWHEjhJbRSrNWoxVs9WQ1Qp+b9NrIt5HMaxw9vT3LzTiNmqs8bS7xCXm6KnSqikJTrmhmWHHAkYfLXTj22PjFCDOzLpiwkyZ403aLm2ZQ0+1ILXF179YpP3UKo5tUk2S7VYbrQ1x5ciol5O1aQs+eNLmU9gGSTDKiEecMkUgy0xJP91ZszxaHTUMaKGPVIGrMiJ35cpTbgNm5bLs/o0hvVJXHxy7PendGBZ53tUbcRrc1zgTKsYal1l5Qd8Kq3R81BGTV8WODSSvaOD7AJggdkXDFcZHBYReqLdBZ9M0PV0sNlcIeUqu12JnW/6wZds3/4oH2frEXaTsGC61OjOf/4b0sNO/cjGqfmU/t0Tp1SRHZtYOIwbghgZ6bZVKhmzoyXHJd73sgEsbHWOPCUkYjbKxguy9iheow6w+dcSpvlXbV+9MOFhursFWPPmouB9i8CgAdJuOpK5THKRWFDm+1DOSCiCKciHaBpbPNTaI4z+o5BsORUPJATctvYNnxEh6Tjtjxqf/pEFoHxYA6XZApHdUMcJpGgFcftyZPpmx6f+Ln1MZqJa1HNmzwi6ZHfkt7yCLTrHqKi0v2A3jKnfxAr5EWYsn80zBjSI8jeA+f5zeJ21D5vqdS+iKPrblJib93E17KtUoD7CpTzp+1/vBbgknvtrLw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?elJ3Z1BkZjQzdHZ4amxOWFFDRVVWK0xCd2EwNHoyZ2s4Q2pZclNtbkFva1Fz?= =?utf-8?B?aUMxREJOVUVXcVB6YlBjcGdZUDhUNHJTZnVsVHp4RFQ3V0hwL3NibjZ0bHBS?= =?utf-8?B?OHBVRC9WdGRYcFhDVFpSOWt5Vys0SFZTWlpIM1l3Tkt4TTZEamoweDJNRzhi?= =?utf-8?B?NndGYTVSTTluWTFuZDZ5aDdIbG9vYXgwVTNpN0NQenl0S1JaSzkzMWd3bU5W?= =?utf-8?B?WUcrY1BJY2pBTGJENkE0M3V5SUFyemZUTUljSlAreHhROGg3aHJaUkZqSGRr?= =?utf-8?B?WVVLMEVWYWhpRndnMTVMaUtXWFhxNnVMWWIyWFRjTFF2enNZV3NlQzIvazVB?= =?utf-8?B?SFd1UFBRTGtJTE01ZUVJRkVKRUVEYUxZV0JHMW02VFB4QmhldmVWcFl1SHBW?= =?utf-8?B?Q0VpL2tET1gwT0E3aTNVWWp6N0JOa1hWcGR6T093cnluSWZuQ3piT0cydEZr?= =?utf-8?B?YXlSWWk3eVdncy9sQ1k1dzkwOU1MajZHdHlqYU9iVDlZN0NWSWFUSmxVbit6?= =?utf-8?B?MmFOMXowOVg3Si9lMkxXOEkyMWJiL2dnZThyRTU5cWtPYkJHaENBalpRdVpZ?= =?utf-8?B?M3haU2ppNDBIMTJuK1JmdFR1Nlc2dWRTWTBiSlBaM3RXMXk5cmN2c2FPTWd2?= =?utf-8?B?Yk9obUdsdVRxTW1lM3lZQ3BodnM0ZkVXWmNNQ3dQTFQwQW14U3RSRW5rRkY3?= =?utf-8?B?ZFR5QXYzK1h6dkd3cVl0NXFBREFXd2NpUVJnbDBEMy9yY08zVE9aODFzR2JD?= =?utf-8?B?OEdNWXoycktMOFF4OHZYNHZyVVpkSTVWa1lCKytIU0QxbXNXSUppbzhhMEFM?= =?utf-8?B?NjlCZWV0TElGaFlJMWp0RjRpWHI4SHdLZ1VBVnZCK1NDOWhaWVBOREpFYlVl?= =?utf-8?B?N0ZUeXkxWFpwNjFwT0RGZ1ZkT2dKdDhvREZ5Q1c4dmNPcHBWY1NjREwwUEZq?= =?utf-8?B?bHE4a3owalluRVNXb0FlVTRlam5HQWxEdDdKa1Z1ZlMxSzdBSXlEWG9MdStW?= =?utf-8?B?M2VVeXVhMnlWRmIzbDlVNXRDUXNoZG82M2p6MndrZ2ZaMkV6Y3NNcjh6YkpO?= =?utf-8?B?ODNYYlVDSmcwMzR2a3VZRjRCbDdIcjRlUXZoejMyRDZxQ1ZRT1hsVTFCUy9k?= =?utf-8?B?NlQ5MkxDTWZyQkdNWGFzUWorRkk2WThXSGhobnY3VlBOa3JWQUJKaHh4YjlR?= =?utf-8?B?ZlRheUpISVJCUFordG90K1JZYXpRSldKVWt2UllmL0orRVpUWWFHZDE2SXVG?= =?utf-8?B?Tks0VXBPUmx0L2o0NXRSNTZCeEVIZG0xZ3RkSk5SaStPYlR2WEEwTjhoYmZn?= =?utf-8?B?ZkhpWEtvRSt5SGV4WFdyOHBKMmgzbVdWekg1MENIV2Z2VllHWmluV0RsZkdZ?= =?utf-8?B?MW9KRjhJamxHdEEydEZ6WGVSeURQSmN6T0d1RGNtMjczcjhJR0daVFVYUFJK?= =?utf-8?B?RnlNVnk4VEU2NWdNcFVwelRydEdVOGtGRWRmN3lmb2hrUmJUNGNnVlpzUFJP?= =?utf-8?B?YUhBZUFBS3N5V3laYzNGSGVLMmpRWTErTWsyQkRmNUVFVUxmQWIwYWVJNHlv?= =?utf-8?B?eHpSZzJpdDA0MU96bHV0K2FTT0dIZUMzdGJUWnhnaDRSV3lONCsrQTFTQkZ2?= =?utf-8?B?YmRhcVRDVmdxdnR0Ykx5NFZyU3Y0Kzdvc0ZtTFp5OGdOcGgyWVVQb2lBaUt2?= =?utf-8?B?TEZJcmtNL3Q4VEMvcXJyZDFwbEJ6RXErSVR3VXEwMWFyVkFtRWtjeERvSTc4?= =?utf-8?Q?+3o5QreCeJ3b/RKfyw=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b1a9212-a34c-4c84-f930-08da68c3d6a0 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jul 2022 13:45:55.9037 (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: VI1PR01MB7071 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avformat/argo_cvg: name unk{1, 2} fields correctly 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: Zane van Iperen: > Signed-off-by: Zane van Iperen > --- > libavformat/argo_cvg.c | 33 +++++++++++++++++---------------- > 1 file changed, 17 insertions(+), 16 deletions(-) > > diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c > index f32487023a..2ee4a64449 100644 > --- a/libavformat/argo_cvg.c > +++ b/libavformat/argo_cvg.c > @@ -40,9 +40,9 @@ > #define ARGO_CVG_SAMPLES_PER_BLOCK 28 > > typedef struct ArgoCVGHeader { > - uint32_t size; /*< File size -8 (this + trailing checksum) */ > - uint32_t unk1; /*< Unknown. Always seems to be 0 or 1. */ > - uint32_t unk2; /*< Unknown. Always seems to be 0 or 1. */ > + uint32_t size; /*< File size -8 (this + trailing checksum) */ > + uint32_t loop; /*< Loop flag. */ > + uint32_t reverb; /*< Reverb flag. */ > } ArgoCVGHeader; > > typedef struct ArgoCVGOverride { > @@ -91,17 +91,17 @@ static int argo_cvg_probe(const AVProbeData *p) > if (p->buf_size < ARGO_CVG_HEADER_SIZE) > return 0; > > - cvg.size = AV_RL32(p->buf + 0); > - cvg.unk1 = AV_RL32(p->buf + 4); > - cvg.unk2 = AV_RL32(p->buf + 8); > + cvg.size = AV_RL32(p->buf + 0); > + cvg.loop = AV_RL32(p->buf + 4); > + cvg.reverb = AV_RL32(p->buf + 8); > > if (cvg.size < 8) > return 0; > > - if (cvg.unk1 != 0 && cvg.unk1 != 1) > + if (cvg.loop != 0 && cvg.loop != 1) > return 0; > > - if (cvg.unk2 != 0 && cvg.unk2 != 1) > + if (cvg.reverb != 0 && cvg.reverb != 1) > return 0; > > return AVPROBE_SCORE_MAX / 4 + 1; > @@ -150,15 +150,16 @@ static int argo_cvg_read_header(AVFormatContext *s) > else if (ret != ARGO_CVG_HEADER_SIZE) > return AVERROR(EIO); > > - ctx->header.size = AV_RL32(buf + 0); > - ctx->header.unk1 = AV_RL32(buf + 4); > - ctx->header.unk2 = AV_RL32(buf + 8); > + ctx->header.size = AV_RL32(buf + 0); > + ctx->header.loop = AV_RL32(buf + 4); > + ctx->header.reverb = AV_RL32(buf + 8); > > if (ctx->header.size < 8) > return AVERROR_INVALIDDATA; > > av_log(s, AV_LOG_TRACE, "size = %u\n", ctx->header.size); > - av_log(s, AV_LOG_TRACE, "unk = %u, %u\n", ctx->header.unk1, ctx->header.unk2); > + av_log(s, AV_LOG_TRACE, "loop = %u\n", ctx->header.loop); > + av_log(s, AV_LOG_TRACE, "reverb = %u\n", ctx->header.reverb); %u is for unsigned, yet these variables are of type uint32_t. It is not guaranteed that these two types are the same (yet they typically are). That's why the PRI-macros exist. (Apart from that: Does this have to be three separate av_logs?) > > if ((ret = argo_cvg_read_checksum(s->pb, &ctx->header, &ctx->checksum)) < 0) > return ret; > @@ -172,10 +173,10 @@ static int argo_cvg_read_header(AVFormatContext *s) > > for (size_t i = 0; i < FF_ARRAY_ELEMS(overrides); i++) { > const ArgoCVGOverride *ovr = overrides + i; > - if (ovr->header.size != ctx->header.size || > - ovr->header.unk1 != ctx->header.unk1 || > - ovr->header.unk2 != ctx->header.unk2 || > - ovr->checksum != ctx->checksum || > + if (ovr->header.size != ctx->header.size || > + ovr->header.loop != ctx->header.loop || > + ovr->header.reverb != ctx->header.reverb || > + ovr->checksum != ctx->checksum || > av_strcasecmp(filename, ovr->name) != 0) > continue; > _______________________________________________ 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".