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 20ACA44CC4 for ; Sat, 14 Jan 2023 15:48:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CBD9D68B91B; Sat, 14 Jan 2023 17:48:18 +0200 (EET) Received: from 1.mo560.mail-out.ovh.net (1.mo560.mail-out.ovh.net [46.105.63.121]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE70A6898F6 for ; Sat, 14 Jan 2023 17:48:12 +0200 (EET) Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.4.60]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id BF21D22B5B for ; Sat, 14 Jan 2023 15:48:11 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-vcj6j (unknown [10.110.115.159]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7E1D91FED9 for ; Sat, 14 Jan 2023 15:48:11 +0000 (UTC) Received: from mediaarea.net ([37.59.142.99]) by ghost-submission-6684bf9d7b-vcj6j with ESMTPSA id SKaxGLvOwmM6zh8AanWh3Q (envelope-from ) for ; Sat, 14 Jan 2023 15:48:11 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G003909b1fe1-7f1e-415d-9b28-e7f20c46874f, 531310C571D3E7C8BE5E63E303B7EE8DB87128E6) smtp.auth=jerome@mediaarea.net X-OVh-ClientIp: 84.143.156.21 Content-Type: multipart/mixed; boundary="------------zc0tC3Uqlzu7MhiiZnEMIWfn" Message-ID: <0af7e930-9ec7-dc81-95bc-939eb21e2da0@mediaarea.net> Date: Sat, 14 Jan 2023 16:48:10 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Content-Language: en-US From: Jerome Martinez To: FFmpeg development discussions and patches X-Ovh-Tracer-Id: 14896500194274412793 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedruddttddgkedtucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurheptgfkffggfgfhuffvsehmtderredtfeejnecuhfhrohhmpeflvghrohhmvgcuofgrrhhtihhnvgiiuceojhgvrhhomhgvsehmvgguihgrrghrvggrrdhnvghtqeenucggtffrrghtthgvrhhnpeduueffudefudejueeggfdthedtteefiedvudeluedtgeeftdefuefgleegheehveenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddrleelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeojhgvrhhomhgvsehmvgguihgrrghrvggrrdhnvghtqedpnhgspghrtghpthhtohepuddprhgtphhtthhopehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth Subject: [FFmpeg-devel] avformat/mxfenc: fix stored/sampled/displayed width/height 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. --------------zc0tC3Uqlzu7MhiiZnEMIWfn Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Before the patch: - stored values were rounded to upper 16 multiple also for formats not using macroblocks (should be st->codecpar->width and st->codecpar->height when not MPEG formats; note that I found no other muxer doing the rounding for AVC, only for MPEG-2 Video, but I find no reason in specs for doing the difference so I kept the rounding for AVC) - sampled and displayed widths were stored width (should be st->codecpar->width like it is already done for height, with the DV50/100 exception) Could be tested with e.g. - fixed stored width (1912 instead of 1920) and height (1080 instead of 1088) not multiple of 16 : ffmpeg -f lavfi -i testsrc=duration=1:size=1912x1080 -c:v jpeg2000 test_prores.mxf - fixed sampled/displayed width (1912 instead of 1920): ffmpeg -f lavfi -i testsrc=duration=1:size=1912x1080 -c:v mpeg2video test_mpeg2video.mxf --------------zc0tC3Uqlzu7MhiiZnEMIWfn Content-Type: text/plain; charset=UTF-8; name="0001-avformat-mxfenc-fix-stored-sampled-displayed-width-h.patch" Content-Disposition: attachment; filename*0="0001-avformat-mxfenc-fix-stored-sampled-displayed-width-h.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBjZGEzNTMwNTk4ODYxODJhYWIyZTI1ODAyM2M0ZDAyN2M0NDgzNDRiIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKZXJvbWUgTWFydGluZXogPGplcm9tZUBtZWRpYWFy ZWEubmV0PgpEYXRlOiBTYXQsIDE0IEphbiAyMDIzIDEzOjMyOjM2ICswMTAwClN1YmplY3Q6 IFtQQVRDSF0gYXZmb3JtYXQvbXhmZW5jOiBmaXggc3RvcmVkL3NhbXBsZWQvZGlzcGxheWVk IHdpZHRoL2hlaWdodAoKU3RvcmVkIHZhbHVlcyBhcmUgcm91bmRlZCB0byB1cHBlciAxNiBt dWx0aXBsZSBvbmx5IGZvciBNUEVHIHJlbGF0ZWQgZm9ybWF0cwpTYW1wbGVkIGFuZCBkaXNw bGF5ZWQgd2lkdGhzIGFyZSBjb2RlY3BhciBvbmVzICh3aXRoIERWIGV4Y2VwdGlvbikKLS0t CiBsaWJhdmZvcm1hdC9teGZlbmMuYyB8IDI4ICsrKysrKysrKysrKysrKysrKysrKystLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL2xpYmF2Zm9ybWF0L214ZmVuYy5jIGIvbGliYXZmb3JtYXQvbXhmZW5j LmMKaW5kZXggNThjNTUxYzgzYy4uMGI3ZTgzYmE0ZCAxMDA2NDQKLS0tIGEvbGliYXZmb3Jt YXQvbXhmZW5jLmMKKysrIGIvbGliYXZmb3JtYXQvbXhmZW5jLmMKQEAgLTExMDksOCArMTEw OSw5IEBAIHN0YXRpYyBpbnQ2NF90IG14Zl93cml0ZV9jZGNpX2NvbW1vbihBVkZvcm1hdENv bnRleHQgKnMsIEFWU3RyZWFtICpzdCwgY29uc3QgVUlECiB7CiAgICAgTVhGU3RyZWFtQ29u dGV4dCAqc2MgPSBzdC0+cHJpdl9kYXRhOwogICAgIEFWSU9Db250ZXh0ICpwYiA9IHMtPnBi OwotICAgIGludCBzdG9yZWRfd2lkdGggPSAwOwotICAgIGludCBzdG9yZWRfaGVpZ2h0ID0g KHN0LT5jb2RlY3Bhci0+aGVpZ2h0KzE1KS8xNioxNjsKKyAgICBpbnQgc3RvcmVkX3dpZHRo ID0gc3QtPmNvZGVjcGFyLT53aWR0aDsKKyAgICBpbnQgc3RvcmVkX2hlaWdodCA9IHN0LT5j b2RlY3Bhci0+aGVpZ2h0OworICAgIGludCBkaXNwbGF5X3dpZHRoOwogICAgIGludCBkaXNw bGF5X2hlaWdodDsKICAgICBpbnQgZjEsIGYyOwogICAgIGNvbnN0IE1YRkNvZGVjVUwgKmNv bG9yX3ByaW1hcmllc191bDsKQEAgLTExMjksMTIgKzExMzAsMjUgQEAgc3RhdGljIGludDY0 X3QgbXhmX3dyaXRlX2NkY2lfY29tbW9uKEFWRm9ybWF0Q29udGV4dCAqcywgQVZTdHJlYW0g KnN0LCBjb25zdCBVSUQKICAgICAgICAgZWxzZSBpZiAoc3QtPmNvZGVjcGFyLT5oZWlnaHQg PT0gNzIwKQogICAgICAgICAgICAgc3RvcmVkX3dpZHRoID0gMTI4MDsKICAgICB9Ci0gICAg aWYgKCFzdG9yZWRfd2lkdGgpCi0gICAgICAgIHN0b3JlZF93aWR0aCA9IChzdC0+Y29kZWNw YXItPndpZHRoKzE1KS8xNioxNjsKKyAgICBkaXNwbGF5X3dpZHRoID0gc3RvcmVkX3dpZHRo OwogCisgICAgc3dpdGNoIChzdC0+Y29kZWNwYXItPmNvZGVjX2lkKSB7CisgICAgY2FzZSBB Vl9DT0RFQ19JRF9NUEVHMlZJREVPOgorICAgIGNhc2UgQVZfQ09ERUNfSURfRFZWSURFTzoK KyAgICBjYXNlIEFWX0NPREVDX0lEX0gyNjQ6CisgICAgICAgIC8vQmFzZWQgb24gMTZ4MTYg bWFjcm9ibG9ja3MKKyAgICAgICAgc3RvcmVkX3dpZHRoID0gKHN0b3JlZF93aWR0aCsxNSkv MTYqMTY7CisgICAgICAgIHN0b3JlZF9oZWlnaHQgPSAoc3RvcmVkX2hlaWdodCsxNSkvMTYq MTY7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIGJyZWFrOworICAg IH0KKworICAgIC8vU3RvcmVkIHdpZHRoCiAgICAgbXhmX3dyaXRlX2xvY2FsX3RhZyhzLCA0 LCAweDMyMDMpOwogICAgIGF2aW9fd2IzMihwYiwgc3RvcmVkX3dpZHRoKTsKIAorICAgIC8v U3RvcmVkIGhlaWdodAogICAgIG14Zl93cml0ZV9sb2NhbF90YWcocywgNCwgMHgzMjAyKTsK ICAgICBhdmlvX3diMzIocGIsIHN0b3JlZF9oZWlnaHQ+PnNjLT5pbnRlcmxhY2VkKTsKIApA QCAtMTE1NCw3ICsxMTY4LDcgQEAgc3RhdGljIGludDY0X3QgbXhmX3dyaXRlX2NkY2lfY29t bW9uKEFWRm9ybWF0Q29udGV4dCAqcywgQVZTdHJlYW0gKnN0LCBjb25zdCBVSUQKIAogICAg IC8vU2FtcGxlZCB3aWR0aAogICAgIG14Zl93cml0ZV9sb2NhbF90YWcocywgNCwgMHgzMjA1 KTsKLSAgICBhdmlvX3diMzIocGIsIHN0b3JlZF93aWR0aCk7CisgICAgYXZpb193YjMyKHBi LCBkaXNwbGF5X3dpZHRoKTsKIAogICAgIC8vU2FtcGxlcyBoZWlnaHQKICAgICBteGZfd3Jp dGVfbG9jYWxfdGFnKHMsIDQsIDB4MzIwNCk7CkBAIC0xMTY4LDggKzExODIsOSBAQCBzdGF0 aWMgaW50NjRfdCBteGZfd3JpdGVfY2RjaV9jb21tb24oQVZGb3JtYXRDb250ZXh0ICpzLCBB VlN0cmVhbSAqc3QsIGNvbnN0IFVJRAogICAgIG14Zl93cml0ZV9sb2NhbF90YWcocywgNCwg MHgzMjA3KTsKICAgICBhdmlvX3diMzIocGIsIDApOwogCisgICAgLy9EaXNwbGF5IHdpZHRo CiAgICAgbXhmX3dyaXRlX2xvY2FsX3RhZyhzLCA0LCAweDMyMDkpOwotICAgIGF2aW9fd2Iz MihwYiwgc3RvcmVkX3dpZHRoKTsKKyAgICBhdmlvX3diMzIocGIsIGRpc3BsYXlfd2lkdGgp OwogCiAgICAgaWYgKHN0LT5jb2RlY3Bhci0+aGVpZ2h0ID09IDYwOCkgLy8gUEFMICsgVkJJ CiAgICAgICAgIGRpc3BsYXlfaGVpZ2h0ID0gNTc2OwpAQCAtMTE3OCw2ICsxMTkzLDcgQEAg c3RhdGljIGludDY0X3QgbXhmX3dyaXRlX2NkY2lfY29tbW9uKEFWRm9ybWF0Q29udGV4dCAq cywgQVZTdHJlYW0gKnN0LCBjb25zdCBVSUQKICAgICBlbHNlCiAgICAgICAgIGRpc3BsYXlf aGVpZ2h0ID0gc3QtPmNvZGVjcGFyLT5oZWlnaHQ7CiAKKyAgICAvL0Rpc3BsYXkgaGVpZ2h0 CiAgICAgbXhmX3dyaXRlX2xvY2FsX3RhZyhzLCA0LCAweDMyMDgpOwogICAgIGF2aW9fd2Iz MihwYiwgZGlzcGxheV9oZWlnaHQ+PnNjLT5pbnRlcmxhY2VkKTsKIAotLSAKMi4xMy4zLndp bmRvd3MuMQoK --------------zc0tC3Uqlzu7MhiiZnEMIWfn 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". --------------zc0tC3Uqlzu7MhiiZnEMIWfn--