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 03A1145CAD for ; Sun, 2 Apr 2023 22:07:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E74F68BEC9; Mon, 3 Apr 2023 01:07:13 +0300 (EEST) Received: from 2.mo582.mail-out.ovh.net (2.mo582.mail-out.ovh.net [46.105.76.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79E12687F0C for ; Mon, 3 Apr 2023 01:07:07 +0300 (EEST) Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.16.84]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id C576625855 for ; Sun, 2 Apr 2023 22:07:06 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-lcdz8 (unknown [10.110.171.20]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 769F21FD62 for ; Sun, 2 Apr 2023 22:07:06 +0000 (UTC) Received: from mediaarea.net ([37.59.142.107]) by ghost-submission-6684bf9d7b-lcdz8 with ESMTPSA id 27lQGIr8KWS8YwkAUrUvvg (envelope-from ) for ; Sun, 02 Apr 2023 22:07:06 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S001d28ca1e3-4ab3-4cf8-8b20-461fca577e34, BA55BC24A0C6F228B44DA89201C9764C1B233084) smtp.auth=zen-lists@mediaarea.net X-OVh-ClientIp: 84.143.156.215 Content-Type: multipart/mixed; boundary="------------rJ1RBhweELgmmGG0ewx5s7Hq" Message-ID: <7291a984-856c-3cd4-483f-f55f13af6be2@mediaarea.net> Date: Mon, 3 Apr 2023 00:07:06 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <068476d4-1430-27bb-83c4-3a160d022596@mediaarea.net> <09775b73ab48e425f3b557aaa8d5847643ebe9b7.camel@haerdin.se> <0b6c3856-082c-cb33-e07c-3adf0502b93c@mediaarea.net> <20230401143739.GD1164690@pb2> <85c1e58e-cc90-5814-cba5-d91201dec993@mediaarea.net> <20230401154301.GF1164690@pb2> <71eaedd7-d771-50a7-ed13-3733b8c2187f@mediaarea.net> <20230402200740.GK1164690@pb2> From: Jerome Martinez In-Reply-To: <20230402200740.GK1164690@pb2> X-Ovh-Tracer-Id: 18197357245096757497 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeiiedgtdeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpegtkfffgggfuffvfhfhjgesmhdtreertdefjeenucfhrhhomheplfgvrhhomhgvucforghrthhinhgviicuoehjvghrohhmvgesmhgvughirggrrhgvrgdrnhgvtheqnecuggftrfgrthhtvghrnhepgeelgfelieevgfdvgfevkeeivddvkeejteeugffgvdehheejheekueegvdejhfdunecukfhppeduvdejrddtrddtrddupdekgedrudegfedrudehiedrvdduhedpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehjvghrohhmvgesmhgvughirggrrhgvrgdrnhgvtheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepfhhfmhhpvghgqdguvghvvghlsehffhhmphgvghdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht Subject: Re: [FFmpeg-devel] avformat/mxfenc: SMPTE RDD 48:2018 Amd 1:2022 (FFV1 in MXF) support 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. --------------rJ1RBhweELgmmGG0ewx5s7Hq Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 02/04/2023 22:07, Michael Niedermayer wrote: > On Sat, Apr 01, 2023 at 07:11:45PM +0200, Jerome Martinez wrote: > [...] >> mxfenc.c | 10 ++++++---- >> 1 file changed, 6 insertions(+), 4 deletions(-) >> 2b3a2cc619fcaf2dd1da7aa4b566b390eced62a3 0001-avformat-mxfenc-replace-ffv1-version-related-assert-.patch >> From 65f6fba9434fa9ab4b5d2b91c3f930c1e3cb4bef Mon Sep 17 00:00:00 2001 >> From: Jerome Martinez >> Date: Sat, 1 Apr 2023 19:04:25 +0200 >> Subject: [PATCH] avformat/mxfenc: replace ffv1 version related assert by error >> message >> >> --- >> libavformat/mxfenc.c | 10 ++++++---- >> 1 file changed, 6 insertions(+), 4 deletions(-) >> >> diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c >> index 9eba208ffb..0a1ae5353c 100644 >> --- a/libavformat/mxfenc.c >> +++ b/libavformat/mxfenc.c >> @@ -2489,8 +2489,8 @@ static int mxf_parse_ffv1_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt) >> ff_init_range_decoder(&c, st->codecpar->extradata, st->codecpar->extradata_size); >> ff_build_rac_states(&c, 0.05 * (1LL << 32), 256 - 8); >> v = get_ffv1_unsigned_symbol(&c, state); >> - av_assert0(v >= 2); >> - if (v > 4) { >> + if (v < 2) { >> + av_log(s, AV_LOG_ERROR, "Invalid version in ffv1 global header\n"); >> return 0; >> } > should this not also fail with v > 4 as before ? I preferred during the change to copy the code in ffv1dec.c for more coherency, and ffv1dec.c considers version 5 in ver01 header as invalid and version 5 with extra metadata as legit. Actually, a bigger issue is that ffv1dec.c accepts version 5 as if it can decode it, e.g. with hacked ffv1 stream having version 5: $ ./ffmpeg -hide_banner -loglevel error -i level5_like_level1.mkv -f null /dev/null 2> >(grep -i  "version") [ffv1 @ 0x7fffc04c81c0] invalid version 5 in ver01 header $ mediainfo --Details=1 level5_like_level3.mkv | grep "version" 1B1        version:                         5 (0x00000005) - Error=FFV1-HEADER-version-LATERVERSION:1 $ ./ffmpeg -hide_banner -loglevel error -i level5_like_level3.mkv -f null /dev/null && echo $? 0 It works only because my hacked file is a version 4 in reality but it should be rejected for when we have a version 5 not compatible with version 4. I suggest to keep the previous patch as is for coherency with ffv1dec.c then add the new attached patch that add a check on ffv1 version > 4 for both ffv1dec.c and mxfenc.c; for ffv1dec.c I also check micro_version for version 4 because FFV1 spec hints that micro_version before the one flagged as stable may be incompatible with previous micro_versions. With the additional patch: $ ./ffmpeg -hide_banner -loglevel error -i level5_like_level3.mkv -f null /dev/null [ffv1 @ 0x7fffc290e640] unsupported version 5 Error while opening decoder for input stream #0:0 : Not yet implemented in FFmpeg, patches welcome $ ./ffmpeg -hide_banner -loglevel error -i level4.3.mkv -f null /dev/null [ffv1 @ 0x7fffc5b27640] unsupported version 4 micro_version 3 Error while opening decoder for input stream #0:0 : Not yet implemented in FFmpeg, patches welcome $ ./ffmpeg -hide_banner -loglevel error -i level5_like_level3.mkv -r 25 -c:v copy -f mxf /dev/null [ffv1 @ 0x7fffe422bf00] unsupported version 5 [mxf @ 0x7fffda8b4080] unsupported ffv1 version 5 [out#0/mxf @ 0x7fffd34470c0] Error muxing a packet Jérôme --------------rJ1RBhweELgmmGG0ewx5s7Hq Content-Type: text/plain; charset=UTF-8; name="0001-avcodec-ffv1dec-reject-unsupported-ffv1-versions.patch" Content-Disposition: attachment; filename*0="0001-avcodec-ffv1dec-reject-unsupported-ffv1-versions.patch" Content-Transfer-Encoding: base64 RnJvbSA0NDM0ZWJkZGI1MzUyNGY1MjM0NmI0ZmJiMTEyNjQ4OWQ4ODY0ODEwIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKZXJvbWUgTWFydGluZXogPGplcm9tZUBtZWRpYWFy ZWEubmV0PgpEYXRlOiBNb24sIDMgQXByIDIwMjMgMDA6MDQ6NTMgKzAyMDAKU3ViamVjdDog W1BBVENIXSBhdmNvZGVjL2ZmdjFkZWM6IHJlamVjdCB1bnN1cHBvcnRlZCBmZnYxIHZlcnNp b25zCgpBbmQgYWRkIHNpbWlsYXIgY2hlY2sgaW4gbGliYXZmb3JtYXQvbXhmZW5jCi0tLQog bGliYXZjb2RlYy9mZnYxZGVjLmMgfCAxMCArKysrKysrKysrCiBsaWJhdmZvcm1hdC9teGZl bmMuYyB8ICA0ICsrKysKIDIgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKQoKZGlm ZiAtLWdpdCBhL2xpYmF2Y29kZWMvZmZ2MWRlYy5jIGIvbGliYXZjb2RlYy9mZnYxZGVjLmMK aW5kZXggMTgwZDI0ZTY5NS4uN2FhZWU3ZWM1ZSAxMDA2NDQKLS0tIGEvbGliYXZjb2RlYy9m ZnYxZGVjLmMKKysrIGIvbGliYXZjb2RlYy9mZnYxZGVjLmMKQEAgLTQzOSwxMSArNDM5LDIx IEBAIHN0YXRpYyBpbnQgcmVhZF9leHRyYV9oZWFkZXIoRkZWMUNvbnRleHQgKmYpCiAgICAg ICAgIGF2X2xvZyhmLT5hdmN0eCwgQVZfTE9HX0VSUk9SLCAiSW52YWxpZCB2ZXJzaW9uIGlu IGdsb2JhbCBoZWFkZXJcbiIpOwogICAgICAgICByZXR1cm4gQVZFUlJPUl9JTlZBTElEREFU QTsKICAgICB9CisgICAgaWYgKGYtPnZlcnNpb24gPiA0KSB7CisgICAgICAgIGF2X2xvZyhm LT5hdmN0eCwgQVZfTE9HX0VSUk9SLCAidW5zdXBwb3J0ZWQgdmVyc2lvbiAlZFxuIiwKKyAg ICAgICAgICAgIGYtPnZlcnNpb24pOworICAgICAgICByZXR1cm4gQVZFUlJPUl9QQVRDSFdF TENPTUU7CisgICAgfQogICAgIGlmIChmLT52ZXJzaW9uID4gMikgewogICAgICAgICBjLT5i eXRlc3RyZWFtX2VuZCAtPSA0OwogICAgICAgICBmLT5taWNyb192ZXJzaW9uID0gZ2V0X3N5 bWJvbChjLCBzdGF0ZSwgMCk7CiAgICAgICAgIGlmIChmLT5taWNyb192ZXJzaW9uIDwgMCkK ICAgICAgICAgICAgIHJldHVybiBBVkVSUk9SX0lOVkFMSUREQVRBOworICAgICAgICBpZiAo Zi0+dmVyc2lvbiA9PSA0ICYmIGYtPm1pY3JvX3ZlcnNpb24gPiAyKSB7CisgICAgICAgICAg ICBhdl9sb2coZi0+YXZjdHgsIEFWX0xPR19FUlJPUiwgInVuc3VwcG9ydGVkIHZlcnNpb24g NCBtaWNyb192ZXJzaW9uICVkXG4iLAorICAgICAgICAgICAgICAgIGYtPm1pY3JvX3ZlcnNp b24pOworICAgICAgICAgICAgcmV0dXJuIEFWRVJST1JfUEFUQ0hXRUxDT01FOworICAgICAg ICB9CiAgICAgfQogICAgIGYtPmFjID0gZ2V0X3N5bWJvbChjLCBzdGF0ZSwgMCk7CiAKZGlm ZiAtLWdpdCBhL2xpYmF2Zm9ybWF0L214ZmVuYy5jIGIvbGliYXZmb3JtYXQvbXhmZW5jLmMK aW5kZXggMGExYWU1MzUzYy4uZGY1YmI1NWFkOCAxMDA2NDQKLS0tIGEvbGliYXZmb3JtYXQv bXhmZW5jLmMKKysrIGIvbGliYXZmb3JtYXQvbXhmZW5jLmMKQEAgLTI0OTMsNiArMjQ5Mywx MCBAQCBzdGF0aWMgaW50IG14Zl9wYXJzZV9mZnYxX2ZyYW1lKEFWRm9ybWF0Q29udGV4dCAq cywgQVZTdHJlYW0gKnN0LCBBVlBhY2tldCAqcGt0KQogICAgICAgICAgICAgYXZfbG9nKHMs IEFWX0xPR19FUlJPUiwgIkludmFsaWQgdmVyc2lvbiBpbiBmZnYxIGdsb2JhbCBoZWFkZXJc biIpOwogICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIH0KKyAgICAgICAgaWYgKHYg PiA0KSB7CisgICAgICAgICAgICBhdl9sb2cocywgQVZfTE9HX0VSUk9SLCAidW5zdXBwb3J0 ZWQgZmZ2MSB2ZXJzaW9uICVkXG4iLCB2KTsKKyAgICAgICAgICAgIHJldHVybiAwOworICAg ICAgICB9CiAgICAgICAgIHNjLT5taWNyb192ZXJzaW9uID0gZ2V0X2ZmdjFfdW5zaWduZWRf c3ltYm9sKCZjLCBzdGF0ZSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgdWludDhfdCBrZXlz dGF0ZSA9IDEyODsKLS0gCjIuMTMuMy53aW5kb3dzLjEKCg== --------------rJ1RBhweELgmmGG0ewx5s7Hq 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". --------------rJ1RBhweELgmmGG0ewx5s7Hq--