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 ESMTPS id 0072C4AC7D for ; Wed, 29 Jan 2025 17:03:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2002A68BD48; Wed, 29 Jan 2025 19:03:05 +0200 (EET) Received: from 11.mo550.mail-out.ovh.net (11.mo550.mail-out.ovh.net [188.165.48.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB46B68BB0C for ; Wed, 29 Jan 2025 19:02:58 +0200 (EET) Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.139.228]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4YjpPZ0lt2z1Y0N for ; Wed, 29 Jan 2025 17:02:58 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-65cg2 (unknown [10.110.164.115]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id DC5AE1FDC1 for ; Wed, 29 Jan 2025 17:02:57 +0000 (UTC) Received: from mediaarea.net ([37.59.142.99]) by ghost-submission-5b5ff79f4f-65cg2 with ESMTPSA id J3mRLEFfmmcgmgEAzMbAzA (envelope-from ) for ; Wed, 29 Jan 2025 17:02:57 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G0034572230a-09a6-4b96-b6b0-2f3919dabd78, ABD67BE694703405BCDC9226CCEFA65C40FD0471) smtp.auth=zen-lists@mediaarea.net X-OVh-ClientIp: 84.143.149.17 Content-Type: multipart/mixed; boundary="------------Z210Xzv3gBSybBKiNRTrlqkE" Message-ID: <90daf990-cdc3-4cf5-94af-f1eec9a093c1@mediaarea.net> Date: Wed, 29 Jan 2025 18:02:57 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20250117204315.GO4991@pb2> <20250125004645.GF4991@pb2> Content-Language: fr, en-US From: Jerome Martinez In-Reply-To: <20250125004645.GF4991@pb2> X-Ovh-Tracer-Id: 6864048783179221241 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdefheehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpegtkfffgggfuffvfhfhjgesmhdtreertddvjeenucfhrhhomheplfgvrhhomhgvucforghrthhinhgviicuoehjvghrohhmvgesmhgvughirggrrhgvrgdrnhgvtheqnecuggftrfgrthhtvghrnhepgeevfffhgfefheekffetffeuveeihefhheejfedtgeelgfelteeijeehffffudeunecukfhppeduvdejrddtrddtrddupdekgedrudegfedrudegledrudejpdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepjhgvrhhomhgvsehmvgguihgrrghrvggrrdhnvghtpdhnsggprhgtphhtthhopedupdhrtghpthhtohepfhhfmhhpvghgqdguvghvvghlsehffhhmphgvghdrohhrghdpoffvtefjohhsthepmhhoheehtdgmpdhmohguvgepshhmthhpohhuth Subject: Re: [FFmpeg-devel] [PATCH] avformat: add DAT (Digital Audio Tape) demuxer 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is a multi-part message in MIME format. --------------Z210Xzv3gBSybBKiNRTrlqkE Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Le 25/01/2025 à 01:46, Michael Niedermayer a écrit : > [...] > this passes tests. > > but if you want, you could instead of testing "extra metadata (not needed for decoding)" > test more than 1 packet > > having a best case score of 1 seems to be something that will > likely fail sooner or later by not detecting a dat file Maybe misunderstanding, the cdxl parser provides score of 1, the DAT patches provide a score of the count of detected frames so better. But attached is a v2 of the 2nd patch, less compilation warnings, using less metadata not impacting the decoding and handling corner cases like bad metadata e.g. 16-bit 4-ch (impossible) and 32 kHz 12-bit 4-ch. 12-bit is not yet handled but the patch provides the detection of such file and a smooth rejection of the file. Jérôme --------------Z210Xzv3gBSybBKiNRTrlqkE Content-Type: text/plain; charset=UTF-8; name="0002-avformat-dat-improve-DAT-demuxer.patch" Content-Disposition: attachment; filename="0002-avformat-dat-improve-DAT-demuxer.patch" Content-Transfer-Encoding: base64 RnJvbSA5MDIxMTE5OGE5MzZjYTcwODdkYmYwNGU1ZDYzNmZkOTk5MmE4MzMyIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKZXJvbWUgTWFydGluZXogPGplcm9tZUBtZWRpYWFy ZWEubmV0PgpEYXRlOiBXZWQsIDIyIEphbiAyMDI1IDE2OjA4OjE4ICswMTAwClN1YmplY3Q6 IFtQQVRDSCAyLzRdIGF2Zm9ybWF0L2RhdDogaW1wcm92ZSBEQVQgZGVtdXhlcgoKTGVzcyBm YWxzZSBwb3NpdGl2ZSBkZXRlY3Rpb24KQmV0dGVyIGNvbXB1dGF0aW9uIG9mIGRhdGEgc2l6 ZSB3aXRoIDEyLWJpdAotLS0KIGxpYmF2Zm9ybWF0L2RhdC5jIHwgNDkgKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAz NiBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWJhdmZv cm1hdC9kYXQuYyBiL2xpYmF2Zm9ybWF0L2RhdC5jCmluZGV4IDM3NTQ4YThhNzMuLjA3MWFm OWExMmEgMTAwNjQ0Ci0tLSBhL2xpYmF2Zm9ybWF0L2RhdC5jCisrKyBiL2xpYmF2Zm9ybWF0 L2RhdC5jCkBAIC0yNiw4ICsyNiw5IEBACiAjZGVmaW5lIERBVF9QQUNLRVRfU0laRSA1ODIy CiAjZGVmaW5lIERBVF9PRkZTRVQgNTc2MAogCi1zdGF0aWMgY29uc3QgdWludDMyX3QgZW5j b2RlZF9yYXRlW10gPSB7IDQ4MDAwLCA0NDEwMCwgMzIwMDAsIDAgfTsKLXN0YXRpYyBjb25z dCB1aW50MTZfdCBlbmNvZGVkX3NpemVbXSA9IHsgNTc2MCwgNTI5MiwgMzg0MCwgMCB9Owor c3RhdGljIGNvbnN0IHVpbnQxNl90IGVuY29kZWRfc2FtcGxlc1tdID0geyAxNDQwLCAxMzIz LCA5NjAsIDAgfTsKK3N0YXRpYyBjb25zdCB1aW50OF90IGVuY29kZWRfc2FtcGxlc19tdWxb XSA9IHsgMSwgMiwgMCwgMCB9Oworc3RhdGljIGNvbnN0IHVpbnQ4X3QgZW5jb2RlZF9xdWFu dGl6YXRpb25bXSA9IHsgMTYsIDEyLCAwLCAwIH07CiBzdGF0aWMgY29uc3QgdWludDhfdCBl bmNvZGVkX2NoYW5zW10gPSB7IDIsIDQsIDAsIDAgfTsKIHN0YXRpYyBjb25zdCBlbnVtIEFW Q29kZWNJRCBlbmNvZGVkX2NvZGVjW10gPSB7CiAgICAgQVZfQ09ERUNfSURfUENNX1MxNkxF LApAQCAtNDEsMTIgKzQyLDI2IEBAIHN0YXRpYyBpbnQgdmFsaWRfZnJhbWUodWludDhfdCAq ZnJhbWUpCiAgICAgdWludDhfdCAqbWFpbmlkID0gc3ViaWQrNDsKICAgICBpbnQgY2hhbl9p bmRleCA9IChtYWluaWRbMF0gPj4gMCkgJiAweDM7CiAgICAgaW50IHJhdGVfaW5kZXggPSAo bWFpbmlkWzBdID4+IDIpICYgMHgzOworICAgIGludCBmbXRpZCAgICAgID0gKG1haW5pZFsw XSA+PiA2KSAmIDB4MzsKKyAgICBpbnQgdHJhY2twaXRjaCA9IChtYWluaWRbMV0gPj4gMikg JiAweDM7CiAgICAgaW50IGVuY19pbmRleCAgPSAobWFpbmlkWzFdID4+IDYpICYgMHgzOwog ICAgIGludCBkYXRhaWQgICAgID0gKHN1YmlkWzBdID4+IDApICYgMHhmOwotCi0gICAgaWYg KGRhdGFpZCAhPSAwIHx8IGVuY29kZWRfY29kZWNbZW5jX2luZGV4XSA9PSBBVl9DT0RFQ19J RF9OT05FIHx8CisgICAgaW50IG51bXBhY2tzICAgPSAoc3ViaWRbMV0gPj4gMCkgJiAweGY7 CisgICAgaW50IHBubzEgICAgICAgPSAoc3ViaWRbMV0gPj4gNCkgJiAweGY7CisgICAgaW50 IHBubzMgICAgICAgPSAoc3ViaWRbMl0gPj4gMCkgJiAweGY7CisgICAgaW50IHBubzIgICAg ICAgPSAoc3ViaWRbMl0gPj4gNCkgJiAweGY7CisgICAgaW50IHBubyA9IChwbm8xIDw8IDgp IHwgKHBubzIgPDwgNCkgfCBwbm8zOworICAgIGludCBlbmNvZGVkX3NpemUgPSBlbmNvZGVk X3NhbXBsZXNbcmF0ZV9pbmRleF0gKiBlbmNvZGVkX3NhbXBsZXNfbXVsW3RyYWNrcGl0Y2hd ICogZW5jb2RlZF9jaGFuc1tjaGFuX2luZGV4XSAqIGVuY29kZWRfcXVhbnRpemF0aW9uW2Vu Y19pbmRleF0gLyA4OworICAKKyAgICBpZiAoZGF0YWlkICE9IDAgfHwKKyAgICAgICAgbnVt cGFja3MgPiA3IHx8CisgICAgICAgIHBubyA9PSAwIHx8CiAgICAgICAgIGVuY29kZWRfY2hh bnNbY2hhbl9pbmRleF0gPT0gMCB8fAotICAgICAgICBlbmNvZGVkX3JhdGVbcmF0ZV9pbmRl eF0gPT0gMCkKKyAgICAgICAgZW5jb2RlZF9zYW1wbGVzW3JhdGVfaW5kZXhdID09IDAgfHwK KyAgICAgICAgZm10aWQgIT0gMCB8fAorICAgICAgICBlbmNvZGVkX3NhbXBsZXNfbXVsW3Ry YWNrcGl0Y2hdID09IDAgfHwKKyAgICAgICAgZW5jb2RlZF9xdWFudGl6YXRpb25bZW5jX2lu ZGV4XSA9PSAwIHx8CisgICAgICAgIGVuY29kZWRfc2l6ZSA+IERBVF9PRkZTRVQpCiAgICAg ICAgIHJldHVybiAwOwogCiAgICAgcmV0dXJuIDE7CkBAIC02Miw3ICs3Nyw3IEBAIHN0YXRp YyBpbnQgcmVhZF9wcm9iZShjb25zdCBBVlByb2JlRGF0YSAqcCkKIAogICAgICAgICBzY29y ZSArPSByZXQ7CiAgICAgICAgIGlmIChyZXQgPT0gMCkKLSAgICAgICAgICAgIGJyZWFrOwor ICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogCiAgICAgcmV0dXJuIEZGTUlOKHNjb3Jl LCBBVlBST0JFX1NDT1JFX01BWCk7CkBAIC04MiwyMSArOTcsMjkgQEAgc3RhdGljIGludCBw YXJzZV9mcmFtZSh1aW50OF90ICpmcmFtZSwgQVZDb2RlY1BhcmFtZXRlcnMgKnBhcikKICAg ICB1aW50OF90ICptYWluaWQgPSBzdWJpZCs0OwogICAgIGludCBjaGFuX2luZGV4ID0gKG1h aW5pZFswXSA+PiAwKSAmIDB4MzsKICAgICBpbnQgcmF0ZV9pbmRleCA9IChtYWluaWRbMF0g Pj4gMikgJiAweDM7CisgICAgaW50IGZtdGlkICAgICAgPSAobWFpbmlkWzBdID4+IDYpICYg MHgzOworICAgIGludCB0cmFja3BpdGNoID0gKG1haW5pZFsxXSA+PiAyKSAmIDB4MzsKICAg ICBpbnQgZW5jX2luZGV4ICA9IChtYWluaWRbMV0gPj4gNikgJiAweDM7CiAgICAgaW50IGRh dGFpZCAgICAgPSAoc3ViaWRbMF0gPj4gMCkgJiAweGY7CisgICAgaW50IGVuY29kZWRfc2l6 ZSA9IDA7CisgICAgaW50IGVuY29kZWRfc2l6ZSA9IGVuY29kZWRfc2FtcGxlc1tyYXRlX2lu ZGV4XSAqIGVuY29kZWRfc2FtcGxlc19tdWxbdHJhY2twaXRjaF0gKiBlbmNvZGVkX2NoYW5z W2NoYW5faW5kZXhdICogZW5jb2RlZF9xdWFudGl6YXRpb25bZW5jX2luZGV4XSAvIDg7CiAK ICAgICBwYXItPmNvZGVjX3R5cGUgPSBBVk1FRElBX1RZUEVfQVVESU87CiAgICAgcGFyLT5j b2RlY19pZCA9IGVuY29kZWRfY29kZWNbZW5jX2luZGV4XTsKICAgICBhdl9jaGFubmVsX2xh eW91dF9kZWZhdWx0KCZwYXItPmNoX2xheW91dCwgZW5jb2RlZF9jaGFuc1tjaGFuX2luZGV4 XSk7Ci0gICAgcGFyLT5zYW1wbGVfcmF0ZSA9IGVuY29kZWRfcmF0ZVtyYXRlX2luZGV4XTsK LSAgICBwYXItPmJpdF9yYXRlID0gKDhMTCAqIERBVF9QQUNLRVRfU0laRSAqIHBhci0+c2Ft cGxlX3JhdGUpIC8gRkZNQVgoMSwgYXZfZ2V0X2F1ZGlvX2ZyYW1lX2R1cmF0aW9uMihwYXIs IGVuY29kZWRfc2l6ZVtyYXRlX2luZGV4XSkpOwotCi0gICAgaWYgKGRhdGFpZCAhPSAwIHx8 IHBhci0+Y29kZWNfaWQgPT0gQVZfQ09ERUNfSURfTk9ORSB8fAotICAgICAgICBwYXItPmNo X2xheW91dC5uYl9jaGFubmVscyA8PSAwIHx8Ci0gICAgICAgIHBhci0+c2FtcGxlX3JhdGUg PD0gMCkKKyAgICBwYXItPnNhbXBsZV9yYXRlID0gZW5jb2RlZF9zYW1wbGVzW3JhdGVfaW5k ZXhdICogMTAwIC8gMzsKKyAgICBwYXItPmJpdF9yYXRlID0gKDhMTCAqIERBVF9QQUNLRVRf U0laRSAqIHBhci0+c2FtcGxlX3JhdGUpIC8gRkZNQVgoMSwgYXZfZ2V0X2F1ZGlvX2ZyYW1l X2R1cmF0aW9uMihwYXIsIGVuY29kZWRfc2l6ZSkpOworCisgICAgaWYgKGRhdGFpZCAhPSAw IHx8CisgICAgICAgIHBhci0+Y2hfbGF5b3V0Lm5iX2NoYW5uZWxzID09IDAgfHwKKyAgICAg ICAgcGFyLT5zYW1wbGVfcmF0ZSA9PSAwIHx8CisgICAgICAgIGZtdGlkICE9IDAgfHwKKyAg ICAgICAgZW5jb2RlZF9zYW1wbGVzX211bFt0cmFja3BpdGNoXSA9PSAwIHx8CisgICAgICAg IGVuY29kZWRfcXVhbnRpemF0aW9uW2VuY19pbmRleF0gPT0gMCB8fAorICAgICAgICBlbmNv ZGVkX3NpemUgPiBEQVRfT0ZGU0VUKQogICAgICAgICByZXR1cm4gQVZFUlJPUl9JTlZBTElE REFUQTsKIAotICAgIHJldHVybiBlbmNvZGVkX3NpemVbcmF0ZV9pbmRleF07CisgICAgcmV0 dXJuIGVuY29kZWRfc2l6ZTsKIH0KIAogc3RhdGljIGludCByZWFkX3BhY2tldChBVkZvcm1h dENvbnRleHQgKnMsIEFWUGFja2V0ICpwa3QpCi0tIAoyLjQ2LjAud2luZG93cy4xCgo= --------------Z210Xzv3gBSybBKiNRTrlqkE Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --------------Z210Xzv3gBSybBKiNRTrlqkE--