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 AFCEC4414F for ; Wed, 28 Sep 2022 14:14:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7055968BCE8; Wed, 28 Sep 2022 17:14:23 +0300 (EEST) Received: from mail.frobbit.se (mail.frobbit.se [85.30.129.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4B1F68BBAD for ; Wed, 28 Sep 2022 17:14:17 +0300 (EEST) Received: from debian.lan (unknown [IPv6:2a00:66c0:a::72c]) by mail.frobbit.se (Postfix) with ESMTPSA id 39F3E1FD9F for ; Wed, 28 Sep 2022 16:14:17 +0200 (CEST) Message-ID: From: Tomas =?ISO-8859-1?Q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Wed, 28 Sep 2022 16:14:16 +0200 In-Reply-To: References: <65e79fe701374868bb2f4b70ce8fd220938e2e86.camel@haerdin.se> Content-Type: multipart/mixed; boundary="=-PaqYkVAxOFl2tQWhnnQm" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 04/11] lavc/jpeg2000dec: Thread init_tile() 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: --=-PaqYkVAxOFl2tQWhnnQm Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit ons 2022-09-28 klockan 12:06 +0200 skrev Tomas Härdin: > This is the one that needs the new execute2() A data race snuck into this one, updated patch attached. /Tomas --=-PaqYkVAxOFl2tQWhnnQm Content-Disposition: attachment; filename="0004-lavc-jpeg2000dec-Thread-init_tile.patch" Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name="0004-lavc-jpeg2000dec-Thread-init_tile.patch"; charset="UTF-8" RnJvbSA2ZmMzOTIwNzMxOTUwYTE4MjBmODhlM2FlMGNmMTI1OGFlMTdiNzVkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/VG9tYXM9MjBIPUMzPUE0cmRpbj89IDxnaXRA aGFlcmRpbi5zZT4KRGF0ZTogTW9uLCAxMyBKdW4gMjAyMiAxNTowOToxNyArMDIwMApTdWJqZWN0 OiBbUEFUQ0ggMDQvMTFdIGxhdmMvanBlZzIwMDBkZWM6IFRocmVhZCBpbml0X3RpbGUoKQoKLS0t CiBsaWJhdmNvZGVjL2pwZWcyMDAwZGVjLmMgfCAzMyArKysrKysrKysrKysrKysrKystLS0tLS0t LS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL2pwZWcyMDAwZGVjLmMgYi9saWJhdmNvZGVjL2pw ZWcyMDAwZGVjLmMKaW5kZXggMjczMzQ2NTM4Zi4uYTY4MGVhYTFiZCAxMDA2NDQKLS0tIGEvbGli YXZjb2RlYy9qcGVnMjAwMGRlYy5jCisrKyBiL2xpYmF2Y29kZWMvanBlZzIwMDBkZWMuYwpAQCAt MTAxOSwyNiArMTAxOSwyOSBAQCBzdGF0aWMgaW50IGdldF9wcHQoSnBlZzIwMDBEZWNvZGVyQ29u dGV4dCAqcywgaW50IG4pCiAgICAgcmV0dXJuIDA7CiB9CiAKLXN0YXRpYyBpbnQgaW5pdF90aWxl KEpwZWcyMDAwRGVjb2RlckNvbnRleHQgKnMsIGludCB0aWxlbm8pCitzdGF0aWMgaW50IGluaXRf dGlsZShBVkNvZGVjQ29udGV4dCAqYXZjdHgsIHZvaWQgKnRkLAorICAgICAgICAgICAgICAgICAg ICAgaW50IGpvYm5yLCBpbnQgdGhyZWFkbnIpCiB7Ci0gICAgaW50IGNvbXBubzsKLSAgICBpbnQg dGlsZXggPSB0aWxlbm8gJSBzLT5udW1YdGlsZXM7Ci0gICAgaW50IHRpbGV5ID0gdGlsZW5vIC8g cy0+bnVtWHRpbGVzOwotICAgIEpwZWcyMDAwVGlsZSAqdGlsZSA9IHMtPnRpbGUgKyB0aWxlbm87 CisgICAgY29uc3QgSnBlZzIwMDBEZWNvZGVyQ29udGV4dCAqcyA9IGF2Y3R4LT5wcml2X2RhdGE7 CisgICAgaW50IHRpbGVubyAgICAgICAgICAgICAgICAgICAgICA9IGpvYm5yIC8gcy0+bmNvbXBv bmVudHM7CisgICAgaW50IHRpbGV4ICAgICAgICAgICAgICAgICAgICAgICA9IHRpbGVubyAlIHMt Pm51bVh0aWxlczsKKyAgICBpbnQgdGlsZXkgICAgICAgICAgICAgICAgICAgICAgID0gdGlsZW5v IC8gcy0+bnVtWHRpbGVzOworICAgIGludCBjb21wbm8gICAgICAgICAgICAgICAgICAgICAgPSBq b2JuciAlIHMtPm5jb21wb25lbnRzOworICAgIEpwZWcyMDAwVGlsZSAqdGlsZSAgICAgICAgICAg ICAgPSBzLT50aWxlICsgdGlsZW5vOworICAgIEpwZWcyMDAwQ29tcG9uZW50ICpjb21wICAgICAg ICAgPSB0aWxlLT5jb21wICsgY29tcG5vOworICAgIEpwZWcyMDAwQ29kaW5nU3R5bGUgKmNvZHN0 eSAgICAgPSB0aWxlLT5jb2RzdHkgKyBjb21wbm87CisgICAgSnBlZzIwMDBRdWFudFN0eWxlICAq cW50c3R5ICAgICA9IHRpbGUtPnFudHN0eSArIGNvbXBubzsKKyAgICBpbnQgcmV0OyAvLyBnbG9i YWwgYmFuZG5vCiAKICAgICBpZiAoIXRpbGUtPmNvbXApCiAgICAgICAgIHJldHVybiBBVkVSUk9S KEVOT01FTSk7CiAKKyAgICBpZiAoY29tcG5vID09IDApIHsKICAgICB0aWxlLT5jb29yZFswXVsw XSA9IGF2X2NsaXAodGlsZXggICAgICAgKiAoaW50NjRfdClzLT50aWxlX3dpZHRoICArIHMtPnRp bGVfb2Zmc2V0X3gsIHMtPmltYWdlX29mZnNldF94LCBzLT53aWR0aCk7CiAgICAgdGlsZS0+Y29v cmRbMF1bMV0gPSBhdl9jbGlwKCh0aWxleCArIDEpICogKGludDY0X3Qpcy0+dGlsZV93aWR0aCAg KyBzLT50aWxlX29mZnNldF94LCBzLT5pbWFnZV9vZmZzZXRfeCwgcy0+d2lkdGgpOwogICAgIHRp bGUtPmNvb3JkWzFdWzBdID0gYXZfY2xpcCh0aWxleSAgICAgICAqIChpbnQ2NF90KXMtPnRpbGVf aGVpZ2h0ICsgcy0+dGlsZV9vZmZzZXRfeSwgcy0+aW1hZ2Vfb2Zmc2V0X3ksIHMtPmhlaWdodCk7 CiAgICAgdGlsZS0+Y29vcmRbMV1bMV0gPSBhdl9jbGlwKCh0aWxleSArIDEpICogKGludDY0X3Qp cy0+dGlsZV9oZWlnaHQgKyBzLT50aWxlX29mZnNldF95LCBzLT5pbWFnZV9vZmZzZXRfeSwgcy0+ aGVpZ2h0KTsKLQotICAgIGZvciAoY29tcG5vID0gMDsgY29tcG5vIDwgcy0+bmNvbXBvbmVudHM7 IGNvbXBubysrKSB7Ci0gICAgICAgIEpwZWcyMDAwQ29tcG9uZW50ICpjb21wID0gdGlsZS0+Y29t cCArIGNvbXBubzsKLSAgICAgICAgSnBlZzIwMDBDb2RpbmdTdHlsZSAqY29kc3R5ID0gdGlsZS0+ Y29kc3R5ICsgY29tcG5vOwotICAgICAgICBKcGVnMjAwMFF1YW50U3R5bGUgICpxbnRzdHkgPSB0 aWxlLT5xbnRzdHkgKyBjb21wbm87Ci0gICAgICAgIGludCByZXQ7IC8vIGdsb2JhbCBiYW5kbm8K KyAgICB9CiAKICAgICAgICAgY29tcC0+Y29vcmRfb1swXVswXSA9IHRpbGUtPmNvb3JkWzBdWzBd OwogICAgICAgICBjb21wLT5jb29yZF9vWzBdWzFdID0gdGlsZS0+Y29vcmRbMF1bMV07CkBAIC0x MDYzLDcgKzEwNjYsNyBAQCBzdGF0aWMgaW50IGluaXRfdGlsZShKcGVnMjAwMERlY29kZXJDb250 ZXh0ICpzLCBpbnQgdGlsZW5vKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcy0+Y2Jwc1tjb21wbm9dLCBzLT5jZHhbY29tcG5vXSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHMtPmNkeVtjb21wbm9dLCBzLT5hdmN0eCwg cy0+c2xpY2VzKSkKICAgICAgICAgICAgIHJldHVybiByZXQ7Ci0gICAgfQorCiAgICAgcmV0dXJu IDA7CiB9CiAKQEAgLTIzNzEsOSArMjM3NCw2IEBAIHN0YXRpYyBpbnQganBlZzIwMDBfcmVhZF9i aXRzdHJlYW1fcGFja2V0cyhKcGVnMjAwMERlY29kZXJDb250ZXh0ICpzKQogICAgIGZvciAodGls ZW5vID0gMDsgdGlsZW5vIDwgcy0+bnVtWHRpbGVzICogcy0+bnVtWXRpbGVzOyB0aWxlbm8rKykg ewogICAgICAgICBKcGVnMjAwMFRpbGUgKnRpbGUgPSBzLT50aWxlICsgdGlsZW5vOwogCi0gICAg ICAgIGlmICgocmV0ID0gaW5pdF90aWxlKHMsIHRpbGVubykpIDwgMCkKLSAgICAgICAgICAgIHJl dHVybiByZXQ7Ci0KICAgICAgICAgaWYgKChyZXQgPSBqcGVnMjAwMF9kZWNvZGVfcGFja2V0cyhz LCB0aWxlKSkgPCAwKQogICAgICAgICAgICAgcmV0dXJuIHJldDsKICAgICB9CkBAIC0yNjY4LDYg KzI2NjgsOSBAQCBzdGF0aWMgaW50IGpwZWcyMDAwX2RlY29kZV9mcmFtZShBVkNvZGVjQ29udGV4 dCAqYXZjdHgsIEFWRnJhbWUgKnBpY3R1cmUsCiAgICAgcGljdHVyZS0+a2V5X2ZyYW1lID0gMTsK ICAgICBzLT5zbGljZXMgPSBhdmN0eC0+YWN0aXZlX3RocmVhZF90eXBlID09IEZGX1RIUkVBRF9T TElDRSA/IGF2Y3R4LT50aHJlYWRfY291bnQgOiAxOwogCisgICAgaWYgKChyZXQgPSBhdmN0eC0+ ZXhlY3V0ZTIoYXZjdHgsIGluaXRfdGlsZSwgTlVMTCwgTlVMTCwgcy0+bnVtWHRpbGVzICogcy0+ bnVtWXRpbGVzICogcy0+bmNvbXBvbmVudHMpKSA8IDApCisgICAgICAgIGdvdG8gZW5kOworCiAg ICAgaWYgKHJldCA9IGpwZWcyMDAwX3JlYWRfYml0c3RyZWFtX3BhY2tldHMocykpCiAgICAgICAg IGdvdG8gZW5kOwogCi0tIAoyLjMwLjIKCg== --=-PaqYkVAxOFl2tQWhnnQm 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". --=-PaqYkVAxOFl2tQWhnnQm--