From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id ED1554F2EB for ; Mon, 16 Jun 2025 09:15:08 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 2F00168DB4A; Mon, 16 Jun 2025 12:15:05 +0300 (EEST) Received: from smtp-bc0b.mail.infomaniak.ch (smtp-bc0b.mail.infomaniak.ch [45.157.188.11]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id CCD6E68D78F for ; Mon, 16 Jun 2025 12:14:58 +0300 (EEST) Received: from smtp-4-0000.mail.infomaniak.ch (smtp-4-0000.mail.infomaniak.ch [10.7.10.107]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4bLPTt3Gf6zwCd for ; Mon, 16 Jun 2025 11:14:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=regaud-chapuy.fr; s=20201206; t=1750065298; bh=c1Fkz36SyZjWhoFjN8fRlys4vayKKDnjmJGQmQR2iU8=; h=Date:Subject:References:To:From:In-Reply-To:From; b=MhY2sU6GZmYR79rU9WGS9QcyIcHoB/9qmBnVl0+lQFz26ewrFRwEdkPuOoaVJ0BU5 Sqq2ePkuKLk26fLhQQ1H9qYfsDjxXkBuMf6gLo56rEM0YnGj/YW3czmcn8Ah9hlMIs Ujp87hgkcNf1n4qFC/EWVeq6LHzbdUqMJwbeWPRU= Received: from unknown by smtp-4-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4bLPTs6jjrzZLN for ; Mon, 16 Jun 2025 11:14:57 +0200 (CEST) Content-Type: multipart/mixed; boundary="------------qKPx4uvFFdFbdO3W0WzXOruD" Message-ID: <639a031a-06c7-4855-8d97-de61626ba194@regaud-chapuy.fr> Date: Mon, 16 Jun 2025 11:14:57 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: fr, en-US References: <2dc54cad-932f-4c30-9f9d-0a943e0a7be3@regaud-chapuy.fr> To: ffmpeg-devel@ffmpeg.org From: Timothee In-Reply-To: <2dc54cad-932f-4c30-9f9d-0a943e0a7be3@regaud-chapuy.fr> X-Forwarded-Message-Id: <2dc54cad-932f-4c30-9f9d-0a943e0a7be3@regaud-chapuy.fr> X-Infomaniak-Routing: alpha Subject: [FFmpeg-devel] Fwd: [PATCH v2] avcodec/h264: fixed qp table attach for h264 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. --------------qKPx4uvFFdFbdO3W0WzXOruD Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hello, Thank you for the feedback on my first patch. The corruption was likely caused by my email client's text formatting. The patch is attach to prevent any formatting error. I have check the patch file applies cleanly using `git am` and verified that all FATE tests still pass. Please let me know if this version is correct. Any advice is welcome. Thanks, Timothée On 13/06/2025 à 22:52, Michael Niedermayer wrote : > On Fri, Jun 13, 2025 at 02:37:53PM +0200, Timothee wrote: >> Hello, >> >> Here is a patch where I fixed the attach of per-macroblock qp tables for >> H.264. It was implemented for MPEG2 so I have only extended it. >> >> I tested the functionality with the codecview filter using the following >> command: `./ffmpeg -export_side_data 4 -i input.mp4 -vf codecview=qp=1 >> output.mp4` >> >> FATE passes. >> >> Thanks, >> Timothée >> >> Signed-off-by: Timothee >> --- >> libavcodec/h264_slice.c | 16 ++++++++++++---- >> libavfilter/qp_table.c | 3 ++- >> libavfilter/qp_table.h | 1 + >> 3 files changed, 15 insertions(+), 5 deletions(-) >> >> diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c >> index 7e53e38cca..f217c58837 100644 >> --- a/libavcodec/h264_slice.c >> +++ b/libavcodec/h264_slice.c >> @@ -2615,8 +2615,10 @@ static int decode_slice(struct AVCodecContext >> *avctx, >> void *arg) >> ret = ff_h264_decode_mb_cabac(h, sl); >> - if (ret >= 0) >> + if (ret >= 0) { > Applying: avcodec/h264: fixed qp table attach for h264 > error: corrupt patch at line 20 > error: could not build fake ancestor > > [...] > > _______________________________________________ > 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". --------------qKPx4uvFFdFbdO3W0WzXOruD Content-Type: text/x-patch; charset=UTF-8; name="0001-avcodec-h264-fixed-qp-table-attach-for-h264.patch" Content-Disposition: attachment; filename="0001-avcodec-h264-fixed-qp-table-attach-for-h264.patch" Content-Transfer-Encoding: base64 RnJvbSA0MjJlOGRiZGMzZDc5YjI0YzZjY2IxMWI3ZjM4NGZjMDg0MDZlZTc0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBUaW1vdGhlZSA8dGltb3RoZWUuaW5mb3JtYXRpcXVl QHJlZ2F1ZC1jaGFwdXkuZnI+CkRhdGU6IEZyaSwgMTMgSnVuIDIwMjUgMTQ6MjE6MjggKzAy MDAKU3ViamVjdDogW1BBVENIXSBhdmNvZGVjL2gyNjQ6IGZpeGVkIHFwIHRhYmxlIGF0dGFj aCBmb3IgaDI2NAoKU2lnbmVkLW9mZi1ieTogVGltb3RoZWUgPHRpbW90aGVlLmluZm9ybWF0 aXF1ZUByZWdhdWQtY2hhcHV5LmZyPgotLS0KIGxpYmF2Y29kZWMvaDI2NF9zbGljZS5jIHwg MTYgKysrKysrKysrKysrLS0tLQogbGliYXZmaWx0ZXIvcXBfdGFibGUuYyAgfCAgMyArKy0K IGxpYmF2ZmlsdGVyL3FwX3RhYmxlLmggIHwgIDEgKwogMyBmaWxlcyBjaGFuZ2VkLCAxNSBp bnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYmF2Y29kZWMv aDI2NF9zbGljZS5jIGIvbGliYXZjb2RlYy9oMjY0X3NsaWNlLmMKaW5kZXggN2U1M2UzOGNj YS4uZjIxN2M1ODgzNyAxMDA2NDQKLS0tIGEvbGliYXZjb2RlYy9oMjY0X3NsaWNlLmMKKysr IGIvbGliYXZjb2RlYy9oMjY0X3NsaWNlLmMKQEAgLTI2MTUsOCArMjYxNSwxMCBAQCBzdGF0 aWMgaW50IGRlY29kZV9zbGljZShzdHJ1Y3QgQVZDb2RlY0NvbnRleHQgKmF2Y3R4LCB2b2lk ICphcmcpCiAKICAgICAgICAgICAgIHJldCA9IGZmX2gyNjRfZGVjb2RlX21iX2NhYmFjKGgs IHNsKTsKIAotICAgICAgICAgICAgaWYgKHJldCA+PSAwKQorICAgICAgICAgICAgaWYgKHJl dCA+PSAwKSB7CiAgICAgICAgICAgICAgICAgZmZfaDI2NF9obF9kZWNvZGVfbWIoaCwgc2wp OworICAgICAgICAgICAgICAgIGgtPmN1cl9waWMucXNjYWxlX3RhYmxlW3NsLT5tYl94eV0g PSBzbC0+cXNjYWxlOworICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAvLyBGSVhNRSBv cHRpbWFsPyBvciBsZXQgbWJfZGVjb2RlIGRlY29kZSAxNngzMiA/CiAgICAgICAgICAgICBp ZiAocmV0ID49IDAgJiYgRlJBTUVfTUJBRkYoaCkpIHsKQEAgLTI2MjQsOCArMjYyNiwxMCBA QCBzdGF0aWMgaW50IGRlY29kZV9zbGljZShzdHJ1Y3QgQVZDb2RlY0NvbnRleHQgKmF2Y3R4 LCB2b2lkICphcmcpCiAKICAgICAgICAgICAgICAgICByZXQgPSBmZl9oMjY0X2RlY29kZV9t Yl9jYWJhYyhoLCBzbCk7CiAKLSAgICAgICAgICAgICAgICBpZiAocmV0ID49IDApCisgICAg ICAgICAgICAgICAgaWYgKHJldCA+PSAwKSB7CiAgICAgICAgICAgICAgICAgICAgIGZmX2gy NjRfaGxfZGVjb2RlX21iKGgsIHNsKTsKKyAgICAgICAgICAgICAgICAgICAgaC0+Y3VyX3Bp Yy5xc2NhbGVfdGFibGVbc2wtPm1iX3h5XSA9IHNsLT5xc2NhbGU7CisgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgICAgIHNsLT5tYl95LS07CiAgICAgICAgICAgICB9CiAgICAg ICAgICAgICBlb3MgPSBnZXRfY2FiYWNfdGVybWluYXRlKCZzbC0+Y2FiYWMpOwpAQCAtMjY4 NiwxNiArMjY5MCwyMCBAQCBzdGF0aWMgaW50IGRlY29kZV9zbGljZShzdHJ1Y3QgQVZDb2Rl Y0NvbnRleHQgKmF2Y3R4LCB2b2lkICphcmcpCiAKICAgICAgICAgICAgIHJldCA9IGZmX2gy NjRfZGVjb2RlX21iX2NhdmxjKGgsIHNsKTsKIAotICAgICAgICAgICAgaWYgKHJldCA+PSAw KQorICAgICAgICAgICAgaWYgKHJldCA+PSAwKSB7CiAgICAgICAgICAgICAgICAgZmZfaDI2 NF9obF9kZWNvZGVfbWIoaCwgc2wpOworICAgICAgICAgICAgICAgIGgtPmN1cl9waWMucXNj YWxlX3RhYmxlW3NsLT5tYl94eV0gPSBzbC0+cXNjYWxlOworICAgICAgICAgICAgfQogCiAg ICAgICAgICAgICAvLyBGSVhNRSBvcHRpbWFsPyBvciBsZXQgbWJfZGVjb2RlIGRlY29kZSAx NngzMiA/CiAgICAgICAgICAgICBpZiAocmV0ID49IDAgJiYgRlJBTUVfTUJBRkYoaCkpIHsK ICAgICAgICAgICAgICAgICBzbC0+bWJfeSsrOwogICAgICAgICAgICAgICAgIHJldCA9IGZm X2gyNjRfZGVjb2RlX21iX2NhdmxjKGgsIHNsKTsKIAotICAgICAgICAgICAgICAgIGlmIChy ZXQgPj0gMCkKKyAgICAgICAgICAgICAgICBpZiAocmV0ID49IDApIHsKICAgICAgICAgICAg ICAgICAgICAgZmZfaDI2NF9obF9kZWNvZGVfbWIoaCwgc2wpOworICAgICAgICAgICAgICAg ICAgICBoLT5jdXJfcGljLnFzY2FsZV90YWJsZVtzbC0+bWJfeHldID0gc2wtPnFzY2FsZTsK KyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgc2wtPm1iX3ktLTsKICAgICAg ICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvbGliYXZmaWx0ZXIvcXBfdGFibGUuYyBiL2xpYmF2 ZmlsdGVyL3FwX3RhYmxlLmMKaW5kZXggODEzN2RjMDE5Zi4uYTk5Yjk5ZTc3YSAxMDA2NDQK LS0tIGEvbGliYXZmaWx0ZXIvcXBfdGFibGUuYworKysgYi9saWJhdmZpbHRlci9xcF90YWJs ZS5jCkBAIC00MCw3ICs0MCw4IEBAIGludCBmZl9xcF90YWJsZV9leHRyYWN0KEFWRnJhbWUg KmZyYW1lLCBpbnQ4X3QgKip0YWJsZSwgaW50ICp0YWJsZV93LCBpbnQgKnRhYmxlCiAgICAg aWYgKCFzZCkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgcGFyID0gKEFWVmlkZW9FbmNQYXJh bXMqKXNkLT5kYXRhOwotICAgIGlmIChwYXItPnR5cGUgIT0gQVZfVklERU9fRU5DX1BBUkFN U19NUEVHMiB8fAorICAgIGlmICgocGFyLT50eXBlICE9IEFWX1ZJREVPX0VOQ19QQVJBTVNf TVBFRzIKKyAgICAgICAmJiBwYXItPnR5cGUgIT0gQVZfVklERU9fRU5DX1BBUkFNU19IMjY0 KSB8fAogICAgICAgICAocGFyLT5uYl9ibG9ja3MgIT0gMCAmJiBwYXItPm5iX2Jsb2NrcyAh PSBuYl9tYikpCiAgICAgICAgIHJldHVybiBBVkVSUk9SKEVOT1NZUyk7CiAKZGlmZiAtLWdp dCBhL2xpYmF2ZmlsdGVyL3FwX3RhYmxlLmggYi9saWJhdmZpbHRlci9xcF90YWJsZS5oCmlu ZGV4IDQ0MDdiYWNiMGUuLmMxYTgwZDE4MzAgMTAwNjQ0Ci0tLSBhL2xpYmF2ZmlsdGVyL3Fw X3RhYmxlLmgKKysrIGIvbGliYXZmaWx0ZXIvcXBfdGFibGUuaApAQCAtNDAsNiArNDAsNyBA QCBzdGF0aWMgaW5saW5lIGludCBmZl9ub3JtX3FzY2FsZShpbnQgcXNjYWxlLCBlbnVtIEFW VmlkZW9FbmNQYXJhbXNUeXBlIHR5cGUpCiB7CiAgICAgc3dpdGNoICh0eXBlKSB7CiAgICAg Y2FzZSBBVl9WSURFT19FTkNfUEFSQU1TX01QRUcyOiByZXR1cm4gcXNjYWxlID4+IDE7Cisg ICAgY2FzZSBBVl9WSURFT19FTkNfUEFSQU1TX0gyNjQ6ICByZXR1cm4gcXNjYWxlOwogICAg IH0KICAgICByZXR1cm4gcXNjYWxlOwogfQotLSAKMi4zOS41Cgo= --------------qKPx4uvFFdFbdO3W0WzXOruD 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". --------------qKPx4uvFFdFbdO3W0WzXOruD--