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 AE8C542B85 for ; Tue, 31 May 2022 09:59:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3EFE268B671; Tue, 31 May 2022 12:59:20 +0300 (EEST) Received: from mail.acc.umu.se (mail.acc.umu.se [130.239.18.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBAA768B659 for ; Tue, 31 May 2022 12:59:18 +0300 (EEST) Received: from localhost (localhost.localdomain [127.0.0.1]) by amavisd-new (Postfix) with ESMTP id 46BAC44B93 for ; Tue, 31 May 2022 11:59:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1653991158; bh=lfoBYYK/xdiYF7c94J+mGXpMajwWvm8sI/JHtLbzP9U=; h=Subject:From:To:Date:In-Reply-To:References:From; b=LuRd/jRHs5Q4P3wfCtDj+27V130VNI5m/631YlPZ1qG4GuWWBGrAU2HFqj+A7a/85 8kK5G16j0uW02dWi89p1qlVLVYdTiJOVJxN2X8TNZoAzSQ+AGkVLYxTpHUaDGhGyjy NBWDZ9lJOTCUEeJBw/Tztnfsp3m2W3eXq1seP5UbxsYTJwVXbdu9zaxhESre1zPHb/ TE20E1bQ69t1i8hnYj0P3wOvFK66nFuDyJ2HsGE+3G9p5jbcjylFZ3idKAnA8fmiE9 AhIGkS4lhSquR4kD0n1sqe67ng2Xg5kLgqzVmUjmNdBGJQ+xOf7eDHPxcrifIkU/yd 6ZXpex8IP1WOQ== Received: from [192.168.43.169] (host-95-195-143-122.mobileonline.telia.com [95.195.143.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: tjoppen) by mail.acc.umu.se (Postfix) with ESMTPSA id 0139C44B90 for ; Tue, 31 May 2022 11:59:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=acc.umu.se; s=mail1; t=1653991157; bh=lfoBYYK/xdiYF7c94J+mGXpMajwWvm8sI/JHtLbzP9U=; h=Subject:From:To:Date:In-Reply-To:References:From; b=tKITc6ZenVpgBCVDgWtSuaEH5TqX5UPklWVgVMwaNPg9DI/mam334dnLbw8xeaz+m LMjvXyqpjZ8rIww8frfQqiMfOJ5PVLWC3V6LGbCKL897uaP/2o2y5VYZy753OmXnOX npYzimT3KQCWhIps2d2iOdGPtN+Ij5rlL71LgXFw2AD1u4P3GVijBJcX0goMjTnDdG mcFlxJxQGgCzdMqta+E6UCsTxl5LTfV0eC8HjeHMPfDtdyvnIsazN7xnjRfyaQFrRS 64uwNe6Ito0V6pS83VuDB9B5krP+bNAdFuESXNGH++qi0jTRnwVQWN0O93KFqFcqiR e6lezgQ13hvsA== Message-ID: From: Tomas =?ISO-8859-1?Q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Tue, 31 May 2022 11:59:15 +0200 In-Reply-To: <152f94f0779c645542f5a678d9392ee53584d45a.camel@acc.umu.se> References: <152f94f0779c645542f5a678d9392ee53584d45a.camel@acc.umu.se> Content-Type: multipart/mixed; boundary="=-mVzC+oCLsGV8URM8a52+" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/8] libavcodec/jpeg2000_parser: Simplify, fix reset_context() 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: --=-mVzC+oCLsGV8URM8a52+ Content-Type: text/plain Content-Transfer-Encoding: 7bit --=-mVzC+oCLsGV8URM8a52+ Content-Disposition: attachment; filename*0=0002-libavcodec-jpeg2000_parser-Simplify-fix-reset_contex.pat; filename*1=ch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0002-libavcodec-jpeg2000_parser-Simplify-fix-reset_contex.patch"; charset="UTF-8" RnJvbSA0YmY0NTkzYzBkNGNiYzM2ZDhmY2FhYmU5ZTM2YjM5MTM0NDAzYzM0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/VG9tYXM9MjBIPUMzPUE0cmRpbj89IDxnaXRA aGFlcmRpbi5zZT4KRGF0ZTogRnJpLCAyMCBNYXkgMjAyMiAxMTo0NDowNiArMDIwMApTdWJqZWN0 OiBbUEFUQ0ggMi84XSBsaWJhdmNvZGVjL2pwZWcyMDAwX3BhcnNlcjogU2ltcGxpZnksIGZpeCBy ZXNldF9jb250ZXh0KCkKCi0tLQogbGliYXZjb2RlYy9qcGVnMjAwMF9wYXJzZXIuYyB8IDIzICsr KysrKysrKystLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwg MTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbGliYXZjb2RlYy9qcGVnMjAwMF9wYXJzZXIu YyBiL2xpYmF2Y29kZWMvanBlZzIwMDBfcGFyc2VyLmMKaW5kZXggOWZhYzk1OGRmYS4uYTdmNzI3 MTBlNCAxMDA2NDQKLS0tIGEvbGliYXZjb2RlYy9qcGVnMjAwMF9wYXJzZXIuYworKysgYi9saWJh dmNvZGVjL2pwZWcyMDAwX3BhcnNlci5jCkBAIC01MSw3ICs1MSw3IEBAIHN0YXRpYyBpbmxpbmUg dm9pZCByZXNldF9jb250ZXh0KEpQRUcyMDAwUGFyc2VyQ29udGV4dCAqbSkKICAgICBQYXJzZUNv bnRleHQgKnBjID0gJm0tPnBjOwogCiAgICAgcGMtPmZyYW1lX3N0YXJ0X2ZvdW5kPSAwOwotICAg IHBjLT5zdGF0ZSA9IDA7CisgICAgcGMtPnN0YXRlNjQgPSAwOwogICAgIG0tPmJ5dGVzX3JlYWQg PSAwOwogICAgIG0tPmZ0ID0gMDsKICAgICBtLT5za2lwcGVkX2NvZGVzdHJlYW0gPSAwOwpAQCAt ODIsMTYgKzgyLDE0IEBAIHN0YXRpYyBpbnQgZmluZF9mcmFtZV9lbmQoSlBFRzIwMDBQYXJzZXJD b250ZXh0ICptLCBjb25zdCB1aW50OF90ICpidWYsIGludCBidWZfCiB7CiAgICAgUGFyc2VDb250 ZXh0ICpwYz0gJm0tPnBjOwogICAgIGludCBpOwotICAgIHVpbnQzMl90IHN0YXRlLCBuZXh0X3N0 YXRlOwotICAgIHVpbnQ2NF90IHN0YXRlNjQ7Ci0gICAgc3RhdGU9IHBjLT5zdGF0ZTsKLSAgICBz dGF0ZTY0ID0gcGMtPnN0YXRlNjQ7CisgICAgdWludDMyX3QgbmV4dF9zdGF0ZTsKKyAgICB1aW50 NjRfdCBzdGF0ZTY0ID0gcGMtPnN0YXRlNjQ7CisKICAgICBpZiAoYnVmX3NpemUgPT0gMCkgewog ICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKICAgICBmb3IgKGkgPSAwOyBpIDwgYnVmX3NpemU7 IGkrKykgewotICAgICAgICBzdGF0ZSA9IHN0YXRlIDw8IDggfCBidWZbaV07CiAgICAgICAgIHN0 YXRlNjQgPSBzdGF0ZTY0IDw8IDggfCBidWZbaV07CiAgICAgICAgIG0tPmJ5dGVzX3JlYWQrKzsK ICAgICAgICAgaWYgKG0tPnNraXBfYnl0ZXMpIHsKQEAgLTEzMiw5ICsxMzAsOSBAQCBzdGF0aWMg aW50IGZpbmRfZnJhbWVfZW5kKEpQRUcyMDAwUGFyc2VyQ29udGV4dCAqbSwgY29uc3QgdWludDhf dCAqYnVmLCBpbnQgYnVmXwogICAgICAgICAgICAgfQogICAgICAgICAgICAgbS0+ZmhlYWRlcl9y ZWFkLS07CiAgICAgICAgIH0KLSAgICAgICAgaWYgKHN0YXRlID09IDB4MDAwMDAwMEMgJiYgbS0+ Ynl0ZXNfcmVhZCA+PSAzKSB7IC8vIEluZGljYXRlcyBzdGFydCBvZiBKUDIgZmlsZS4gQ2hlY2sg c2lnbmF0dXJlIG5leHQuCisgICAgICAgIGlmICgoc3RhdGU2NCAmIDB4RkZGRkZGRkYpID09IDB4 MDAwMDAwMEMgJiYgbS0+Ynl0ZXNfcmVhZCA+PSAzKSB7IC8vIEluZGljYXRlcyBzdGFydCBvZiBK UDIgZmlsZS4gQ2hlY2sgc2lnbmF0dXJlIG5leHQuCiAgICAgICAgICAgICBtLT5maGVhZGVyX3Jl YWQgPSA4OwotICAgICAgICB9IGVsc2UgaWYgKChzdGF0ZSAmIDB4RkZGRikgPT0gMHhGRjRGKSB7 CisgICAgICAgIH0gZWxzZSBpZiAoKHN0YXRlNjQgJiAweEZGRkYpID09IDB4RkY0RikgewogICAg ICAgICAgICAgbS0+aW5fY29kZXN0cmVhbSA9IDE7CiAgICAgICAgICAgICBpZiAoIXBjLT5mcmFt ZV9zdGFydF9mb3VuZCkgewogICAgICAgICAgICAgICAgIHBjLT5mcmFtZV9zdGFydF9mb3VuZCA9 IDE7CkBAIC0xNDMsNyArMTQxLDcgQEAgc3RhdGljIGludCBmaW5kX2ZyYW1lX2VuZChKUEVHMjAw MFBhcnNlckNvbnRleHQgKm0sIGNvbnN0IHVpbnQ4X3QgKmJ1ZiwgaW50IGJ1Zl8KICAgICAgICAg ICAgICAgICByZXNldF9jb250ZXh0KG0pOwogICAgICAgICAgICAgICAgIHJldHVybiBpIC0gMTsK ICAgICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIGlmICgoc3RhdGUgJiAweEZGRkYpID09IDB4 RkZEOSkgeworICAgICAgICB9IGVsc2UgaWYgKChzdGF0ZTY0ICYgMHhGRkZGKSA9PSAweEZGRDkp IHsKICAgICAgICAgICAgIGlmIChwYy0+ZnJhbWVfc3RhcnRfZm91bmQgJiYgbS0+ZnQgPT0ganAy X2ZpbGUpIHsKICAgICAgICAgICAgICAgICBtLT5za2lwcGVkX2NvZGVzdHJlYW0gPSAxOwogICAg ICAgICAgICAgfSBlbHNlIGlmIChwYy0+ZnJhbWVfc3RhcnRfZm91bmQgJiYgbS0+ZnQgPT0gajJr X2NzdHJlYW0pIHsKQEAgLTE1MSwxMSArMTQ5LDExIEBAIHN0YXRpYyBpbnQgZmluZF9mcmFtZV9l bmQoSlBFRzIwMDBQYXJzZXJDb250ZXh0ICptLCBjb25zdCB1aW50OF90ICpidWYsIGludCBidWZf CiAgICAgICAgICAgICAgICAgcmV0dXJuIGkgKyAxOyAvLyBFbmQgb2YgZnJhbWUgZGV0ZWN0ZWQs IHJldHVybiBmcmFtZSBzaXplLgogICAgICAgICAgICAgfQogICAgICAgICAgICAgbS0+aW5fY29k ZXN0cmVhbSA9IDA7Ci0gICAgICAgIH0gZWxzZSBpZiAobS0+aW5fY29kZXN0cmVhbSAmJiAoc3Rh dGUgJiAweEZGRkYpID09IDB4RkY5MCkgeyAvLyBBcmUgd2UgaW4gdGlsZSBwYXJ0IGhlYWRlcj8K KyAgICAgICAgfSBlbHNlIGlmIChtLT5pbl9jb2Rlc3RyZWFtICYmIChzdGF0ZTY0ICYgMHhGRkZG KSA9PSAweEZGOTApIHsgLy8gQXJlIHdlIGluIHRpbGUgcGFydCBoZWFkZXI/CiAgICAgICAgICAg ICBtLT5yZWFkX3RwID0gODsKLSAgICAgICAgfSBlbHNlIGlmIChwYy0+ZnJhbWVfc3RhcnRfZm91 bmQgJiYgaW5mb19tYXJrZXIoKHN0YXRlICYgMHhGRkZGMDAwMCk+PjE2KSAmJiBtLT5pbl9jb2Rl c3RyZWFtICYmIChzdGF0ZSAmIDB4RkZGRikpIHsKKyAgICAgICAgfSBlbHNlIGlmIChwYy0+ZnJh bWVfc3RhcnRfZm91bmQgJiYgaW5mb19tYXJrZXIoKHN0YXRlNjQgJiAweEZGRkYwMDAwKT4+MTYp ICYmIG0tPmluX2NvZGVzdHJlYW0gJiYgKHN0YXRlNjQgJiAweEZGRkYpKSB7CiAgICAgICAgICAg ICAvLyBDYWxjdWxhdGUgbnVtYmVyIG9mIGJ5dGVzIHRvIHNraXAgdG8gZ2V0IHRvIGVuZCBvZiB0 aGUgbmV4dCBtYXJrZXIuCi0gICAgICAgICAgICBtLT5za2lwX2J5dGVzID0gKHN0YXRlICYgMHhG RkZGKS0xOworICAgICAgICAgICAgbS0+c2tpcF9ieXRlcyA9IChzdGF0ZTY0ICYgMHhGRkZGKS0x OwogCiAgICAgICAgICAgICAvLyBJZiB0aGUgbmV4dCBtYXJrZXIgaXMgYW4gaW5mbyBtYXJrZXIs IHNraXAgdG8gdGhlIGVuZCBvZiBvZiB0aGUgbWFya2VyIGxlbmd0aC4KICAgICAgICAgICAgIGlm IChpICsgbS0+c2tpcF9ieXRlcyArIDEgPCBidWZfc2l6ZSkgewpAQCAtMTY4LDcgKzE2Niw2IEBA IHN0YXRpYyBpbnQgZmluZF9mcmFtZV9lbmQoSlBFRzIwMDBQYXJzZXJDb250ZXh0ICptLCBjb25z dCB1aW50OF90ICpidWYsIGludCBidWZfCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBwYy0+c3Rh dGUgPSBzdGF0ZTsKICAgICBwYy0+c3RhdGU2NCA9IHN0YXRlNjQ7CiAgICAgcmV0dXJuIEVORF9O T1RfRk9VTkQ7CiB9Ci0tIAoyLjMwLjIKCg== --=-mVzC+oCLsGV8URM8a52+ 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". --=-mVzC+oCLsGV8URM8a52+--