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 9F126490E7 for ; Fri, 2 Feb 2024 15:55:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5073B68D09E; Fri, 2 Feb 2024 17:55:21 +0200 (EET) Received: from 4.mo576.mail-out.ovh.net (4.mo576.mail-out.ovh.net [46.105.42.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B792C68CE08 for ; Fri, 2 Feb 2024 17:55:14 +0200 (EET) Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.148.116]) by mo576.mail-out.ovh.net (Postfix) with ESMTP id C4C7D35A46 for ; Fri, 2 Feb 2024 15:55:13 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-6c5fq (unknown [10.108.54.212]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id EB6571FE8E for ; Fri, 2 Feb 2024 15:55:12 +0000 (UTC) Received: from mediaarea.net ([37.59.142.108]) by ghost-submission-6684bf9d7b-6c5fq with ESMTPSA id mrvvNWAQvWWB/wAAg8iFlQ (envelope-from ) for ; Fri, 02 Feb 2024 15:55:12 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S0021103e1ea-58c1-4ce4-ba09-ea82d1e34433, 2C6CCB87BAC13C3A7C35C5FB0FAE638CB3D966E1) smtp.auth=jerome@mediaarea.net X-OVh-ClientIp: 84.143.146.241 Content-Type: multipart/mixed; boundary="------------Ah73XEwpQ4suYhTiyQcMz40q" Message-ID: Date: Fri, 2 Feb 2024 16:55:12 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US, fr, de-DE From: Jerome Martinez To: FFmpeg development discussions and patches X-Ovh-Tracer-Id: 1180224580676258041 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -110 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrfedugedgkeduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnegfrhhlucfvnfffucdlqddutddmnecujfgurheptgfkffggfgfhuffvsehmtderredtvdejnecuhfhrohhmpeflvghrohhmvgcuofgrrhhtihhnvgiiuceojhgvrhhomhgvsehmvgguihgrrghrvggrrdhnvghtqeenucggtffrrghtthgvrhhnpedvffehuedvjefhjeelffeihfetueeitefgleeghfdtfeffteejteeiieetvdeuteenucffohhmrghinhepughighhithhiiigrthhiohhnghhuihguvghlihhnvghsrdhgohhvnecukfhppeduvdejrddtrddtrddupdekgedrudegfedrudegiedrvdeguddpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehjvghrohhmvgesmhgvughirggrrhgvrgdrnhgvtheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepfhhfmhhpvghgqdguvghvvghlsehffhhmphgvghdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht Subject: [FFmpeg-devel] [PATCH] avcodec/jpeg2000dec: support of 2 fields in 1 AVPacket 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. --------------Ah73XEwpQ4suYhTiyQcMz40q Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Before this patch, the FFmpeg MXF parser correctly detects content with 2 fields in 1 AVPacket as e.g. interlaced 720x486 but the FFmpeg JPEG 2000 decoder reads the JPEG 2000 SIZ header without understanding that the indicated height is the height of 1 field only so overwrites the frame size info with e.g. 720x243, and also completely discards the second frame, which lead to the decoding of only half of the stored content as "progressive" 720x243 flagged interlaced. Example file: https://www.digitizationguidelines.gov/guidelines/MXF_sampleFiles/RDD48-sample12-gf-jpeg2000-ntsc-4.2.zip Before this patch: Stream #0:0: Video: jpeg2000, yuv422p10le(bottom coded first (swapped)), 720x243, lossless, SAR 9:20 DAR 4:3, 29.97 tbr, 29.97 tbn, 29.97 tbc After this patch: Stream #0:0: Video: jpeg2000, yuv422p10le(bottom coded first (swapped)), 720x486, lossless, SAR 9:10 DAR 4:3, 29.97 fps, 29.97 tbr, 29.97 tbn --------------Ah73XEwpQ4suYhTiyQcMz40q Content-Type: text/plain; charset=UTF-8; name="0001-avcodec-jpeg2000dec-support-of-2-fields-in-1-AVPacke.patch" Content-Disposition: attachment; filename*0="0001-avcodec-jpeg2000dec-support-of-2-fields-in-1-AVPacke.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA1MjQyOTcxZGE3ZDJjZjhkODcxMzE0NGU0YTdiY2M0YWEwNjQzN2M0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKZXJvbWUgTWFydGluZXogPGplcm9tZUBtZWRpYWFy ZWEubmV0PgpEYXRlOiBUaHUsIDEgRmViIDIwMjQgMTc6NTg6MDIgKzAxMDAKU3ViamVjdDog W1BBVENIXSBhdmNvZGVjL2pwZWcyMDAwZGVjOiBzdXBwb3J0IG9mIDIgZmllbGRzIGluIDEg QVZQYWNrZXQKCi0tLQogbGliYXZjb2RlYy9qcGVnMjAwMGRlYy5jIHwgODcgKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tCiBsaWJhdmNvZGVjL2pw ZWcyMDAwZGVjLmggfCAgNSArKysKIDIgZmlsZXMgY2hhbmdlZCwgODQgaW5zZXJ0aW9ucygr KSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL2pwZWcyMDAwZGVj LmMgYi9saWJhdmNvZGVjL2pwZWcyMDAwZGVjLmMKaW5kZXggNjkxY2ZiZDg5MS4uZDhiZmNh MzkwZSAxMDA2NDQKLS0tIGEvbGliYXZjb2RlYy9qcGVnMjAwMGRlYy5jCisrKyBiL2xpYmF2 Y29kZWMvanBlZzIwMDBkZWMuYwpAQCAtMTk0LDYgKzE5NCw4IEBAIHN0YXRpYyBpbnQgZ2V0 X3NpeihKcGVnMjAwMERlY29kZXJDb250ZXh0ICpzKQogICAgIGludCByZXQ7CiAgICAgaW50 IG9fZGlteCwgb19kaW15OyAvL29yaWdpbmFsIGltYWdlIGRpbWVuc2lvbnMuCiAgICAgaW50 IGRpbXgsIGRpbXk7CisgICAgaW50IHByZXZpb3VzX3dpZHRoID0gcy0+d2lkdGg7CisgICAg aW50IHByZXZpb3VzX2hlaWdodCA9IHMtPmhlaWdodDsKIAogICAgIGlmIChieXRlc3RyZWFt Ml9nZXRfYnl0ZXNfbGVmdCgmcy0+ZykgPCAzNikgewogICAgICAgICBhdl9sb2cocy0+YXZj dHgsIEFWX0xPR19FUlJPUiwgIkluc3VmZmljaWVudCBzcGFjZSBmb3IgU0laXG4iKTsKQEAg LTIxMSw3ICsyMTMsNyBAQCBzdGF0aWMgaW50IGdldF9zaXooSnBlZzIwMDBEZWNvZGVyQ29u dGV4dCAqcykKICAgICBzLT50aWxlX29mZnNldF95ICA9IGJ5dGVzdHJlYW0yX2dldF9iZTMy dSgmcy0+Zyk7IC8vIFlUMFNpegogICAgIG5jb21wb25lbnRzICAgICAgID0gYnl0ZXN0cmVh bTJfZ2V0X2JlMTZ1KCZzLT5nKTsgLy8gQ1NpegogCi0gICAgaWYgKGF2X2ltYWdlX2NoZWNr X3NpemUyKHMtPndpZHRoLCBzLT5oZWlnaHQsIHMtPmF2Y3R4LT5tYXhfcGl4ZWxzLCBBVl9Q SVhfRk1UX05PTkUsIDAsIHMtPmF2Y3R4KSkgeworICAgIGlmIChhdl9pbWFnZV9jaGVja19z aXplMihzLT53aWR0aCwgcy0+aGVpZ2h0IDw8IChzLT5oZWlnaHQgPj0gMCAmJiBzLT5oYXNf Ml9maWVsZHMpLCBzLT5hdmN0eC0+bWF4X3BpeGVscywgQVZfUElYX0ZNVF9OT05FLCAwLCBz LT5hdmN0eCkpIHsKICAgICAgICAgYXZwcml2X3JlcXVlc3Rfc2FtcGxlKHMtPmF2Y3R4LCAi TGFyZ2UgRGltZW5zaW9ucyIpOwogICAgICAgICByZXR1cm4gQVZFUlJPUl9QQVRDSFdFTENP TUU7CiAgICAgfQpAQCAtMzAxLDYgKzMwMywxOSBAQCBzdGF0aWMgaW50IGdldF9zaXooSnBl ZzIwMDBEZWNvZGVyQ29udGV4dCAqcykKICAgICAgICAgICAgIHJldHVybiBBVkVSUk9SKEVO T01FTSk7CiAgICAgfQogCisgICAgaWYgKHMtPmhhc18yX2ZpZWxkcykgeworICAgICAgICBz LT5oZWlnaHQgPDw9IDE7CisgICAgICAgIHMtPmltYWdlX29mZnNldF95IDw8PSAxOworICAg ICAgICBzLT50aWxlX29mZnNldF95IDw8PSAxOworICAgICAgICBpZiAocy0+aXNfc2Vjb25k X2ZpZWxkICYmIChzLT53aWR0aCAhPSBwcmV2aW91c193aWR0aCB8fCBzLT5oZWlnaHQgIT0g cHJldmlvdXNfaGVpZ2h0KSkgeworICAgICAgICAgICAgYXZwcml2X3JlcXVlc3Rfc2FtcGxl KHMtPmF2Y3R4LCAiUGl4ZWwgc2l6ZSBvZiB0aGUgMiBmaWVsZHMgb2YgdGhlIGZyYW1lIGFy ZSBub3Qgc2FtZSIpOworICAgICAgICAgICAgcmV0dXJuIEFWRVJST1JfUEFUQ0hXRUxDT01F OworICAgICAgICB9CisgICAgICAgIGlmIChzLT5pbWFnZV9vZmZzZXRfeSB8fCBzLT50aWxl X29mZnNldF95IHx8IChzLT50aWxlX2hlaWdodCA8PCAxKSAhPSBzLT5oZWlnaHQpIHsKKyAg ICAgICAgICAgIGF2X2xvZyhzLT5hdmN0eCwgQVZfTE9HX1dBUk5JTkcsICJEZWNvZGluZyBv ZiAyIGZpZWxkcyBoYXZpbmcgdGl0bGVzIGluIDEgQVZQYWNrZXQgd2FzIG5vdCB0ZXN0ZWRc biIpOworICAgICAgICB9CisgICAgfQorCiAgICAgLyogY29tcHV0ZSBpbWFnZSBzaXplIHdp dGggcmVkdWN0aW9uIGZhY3RvciAqLwogICAgIG9fZGlteCA9IGZmX2pwZWcyMDAwX2NlaWxk aXZwb3cyKHMtPndpZHRoICAtIHMtPmltYWdlX29mZnNldF94LAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzLT5yZWR1Y3Rpb25fZmFjdG9yKTsK QEAgLTIwMDEsNyArMjAxNiw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCB0aWxlX2NvZGVibG9j a3MoY29uc3QgSnBlZzIwMDBEZWNvZGVyQ29udGV4dCAqcywgSnBlZzIwMDBUaWxlCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICAgICAgICAg IHkgICAgPSB0aWxlLT5jb21wW2NvbXBub10uY29vcmRbMV1bMF0gLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAogICAgICAgICAgICAgICAgICAg IGZmX2pwZWcyMDAwX2NlaWxkaXYocy0+aW1hZ2Vfb2Zmc2V0X3ksIHMtPmNkeVtjb21wbm9d KTsgICAgICAgICAgICAgICAgICAgICAgICBcCi0gICAgICAgICAgICBsaW5lID0gKFBJWEVM ICopcGljdHVyZS0+ZGF0YVtwbGFuZV0gKyB5ICogKHBpY3R1cmUtPmxpbmVzaXplW3BsYW5l XSAvIHNpemVvZihQSVhFTCkpO1wKKyAgICAgICAgICAgIGxpbmUgPSAoUElYRUwgKilwaWN0 dXJlLT5kYXRhW3BsYW5lXSArICh5ICsgKHMtPmlzX3NlY29uZF9maWVsZCBeIHMtPmlzX2Jv dHRvbV9jb2RlZF9maXJzdCkpICogKHBpY3R1cmUtPmxpbmVzaXplW3BsYW5lXSAvIHNpemVv ZihQSVhFTCkpO1wKICAgICAgICAgICAgIGZvciAoOyB5IDwgaDsgeSsrKSB7ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgXAogICAgICAgICAgICAgICAgIFBJWEVMICpkc3Q7ICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKQEAgLTIwMjgs NyArMjA0Myw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCB0aWxlX2NvZGVibG9ja3MoY29uc3Qg SnBlZzIwMDBEZWNvZGVyQ29udGV4dCAqcywgSnBlZzIwMDBUaWxlCiAgICAgICAgICAgICAg ICAgICAgICAgICBkc3QgKz0gcGl4ZWxzaXplOyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICAgICAgICAgICAgICAgICAg fSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgXAogICAgICAgICAgICAgICAgIH0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcCi0gICAgICAgICAgICAgICAgbGluZSArPSBwaWN0dXJlLT5s aW5lc2l6ZVtwbGFuZV0gLyBzaXplb2YoUElYRUwpOyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFwKKyAgICAgICAgICAgICAgICBsaW5lICs9IChwaWN0dXJlLT5saW5lc2l6 ZVtwbGFuZV0gPDwgcy0+aGFzXzJfZmllbGRzKSAvIHNpemVvZihQSVhFTCk7ICAgICAgICAg ICAgXAogICAgICAgICAgICAgfSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAg ICAgICAgIH0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXApAQCAtMjQ0NSw4ICsyNDYw LDggQEAgc3RhdGljIGF2X2NvbGQgaW50IGpwZWcyMDAwX2RlY29kZV9pbml0KEFWQ29kZWND b250ZXh0ICphdmN0eCkKICAgICByZXR1cm4gMDsKIH0KIAotc3RhdGljIGludCBqcGVnMjAw MF9kZWNvZGVfZnJhbWUoQVZDb2RlY0NvbnRleHQgKmF2Y3R4LCBBVkZyYW1lICpwaWN0dXJl LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ICpnb3RfZnJhbWUsIEFW UGFja2V0ICphdnBrdCkKK3N0YXRpYyBpbnQganBlZzIwMDBfZGVjb2RlX2ZyYW1lX3BpY3R1 cmUoQVZDb2RlY0NvbnRleHQgKmF2Y3R4LCBBVkZyYW1lICpwaWN0dXJlLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgQVZQYWNrZXQgKmF2cGt0KQogewogICAgIEpwZWcy MDAwRGVjb2RlckNvbnRleHQgKnMgPSBhdmN0eC0+cHJpdl9kYXRhOwogICAgIGludCByZXQ7 CkBAIC0yNDk3LDcgKzI1MTIsNyBAQCBzdGF0aWMgaW50IGpwZWcyMDAwX2RlY29kZV9mcmFt ZShBVkNvZGVjQ29udGV4dCAqYXZjdHgsIEFWRnJhbWUgKnBpY3R1cmUsCiAgICAgfQogCiAg ICAgLyogZ2V0IHBpY3R1cmUgYnVmZmVyICovCi0gICAgaWYgKChyZXQgPSBmZl90aHJlYWRf Z2V0X2J1ZmZlcihhdmN0eCwgcGljdHVyZSwgMCkpIDwgMCkKKyAgICBpZiAoKCFzLT5oYXNf Ml9maWVsZHMgfHwgIXMtPmlzX3NlY29uZF9maWVsZCkgJiYgKHJldCA9IGZmX3RocmVhZF9n ZXRfYnVmZmVyKGF2Y3R4LCBwaWN0dXJlLCAwKSkgPCAwKQogICAgICAgICBnb3RvIGVuZDsK ICAgICBwaWN0dXJlLT5waWN0X3R5cGUgPSBBVl9QSUNUVVJFX1RZUEVfSTsKICAgICBwaWN0 dXJlLT5mbGFncyB8PSBBVl9GUkFNRV9GTEFHX0tFWTsKQEAgLTI1MjAsOCArMjUzNSw2IEBA IHN0YXRpYyBpbnQganBlZzIwMDBfZGVjb2RlX2ZyYW1lKEFWQ29kZWNDb250ZXh0ICphdmN0 eCwgQVZGcmFtZSAqcGljdHVyZSwKIAogICAgIGpwZWcyMDAwX2RlY19jbGVhbnVwKHMpOwog Ci0gICAgKmdvdF9mcmFtZSA9IDE7Ci0KICAgICBpZiAocy0+YXZjdHgtPnBpeF9mbXQgPT0g QVZfUElYX0ZNVF9QQUw4KQogICAgICAgICBtZW1jcHkocGljdHVyZS0+ZGF0YVsxXSwgcy0+ cGFsZXR0ZSwgMjU2ICogc2l6ZW9mKHVpbnQzMl90KSk7CiAKQEAgLTI1MzIsNiArMjU0NSw2 NCBAQCBlbmQ6CiAgICAgcmV0dXJuIHJldDsKIH0KIAorc3RhdGljIGludCBqcGVnMjAwMF9k ZWNvZGVfZnJhbWUoQVZDb2RlY0NvbnRleHQgKmF2Y3R4LCBBVkZyYW1lICpwaWN0dXJlLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ICpnb3RfZnJhbWUsIEFWUGFj a2V0ICphdnBrdCkKK3sKKyAgICBKcGVnMjAwMERlY29kZXJDb250ZXh0ICpzID0gYXZjdHgt PnByaXZfZGF0YTsKKyAgICBpbnQgcGljdHVyZV8xX3NpemUgPSBhdnBrdC0+c2l6ZSwgcGlj dHVyZV8yX3NpemUgPSAwOworICAgIGludCByZXQxID0gMCwgcmV0MiA9IDA7CisgICAgaW50 IG1heV9oYXZlXzJfZmllbGRzX2luXzFfcGFja2V0ID0gMDsKKworICAgIC8vIGZpbmQgaWYg dGhlcmUgYXJlIDIgSlBFRzIwMDAgcGljdHVyZXMgaW4gYSBzaW5nbGUgcGFja2V0CisgICAg cy0+aGFzXzJfZmllbGRzID0gMDsKKyAgICBzLT5pc19ib3R0b21fY29kZWRfZmlyc3QgPSAw OworICAgIHMtPmlzX3NlY29uZF9maWVsZCA9IDA7CisgICAgc3dpdGNoIChhdmN0eC0+Zmll bGRfb3JkZXIpIHsKKyAgICBjYXNlIEFWX0ZJRUxEX1RUOgorICAgIGNhc2UgQVZfRklFTERf VEI6CisgICAgICAgIG1heV9oYXZlXzJfZmllbGRzX2luXzFfcGFja2V0ID0gMTsKKyAgICAg ICAgYnJlYWs7CisgICAgY2FzZSBBVl9GSUVMRF9CQjoKKyAgICBjYXNlIEFWX0ZJRUxEX0JU OgorICAgICAgICBtYXlfaGF2ZV8yX2ZpZWxkc19pbl8xX3BhY2tldCA9IDI7CisgICAgICAg IGJyZWFrOworICAgIH0KKyAgICBpZiAobWF5X2hhdmVfMl9maWVsZHNfaW5fMV9wYWNrZXQp IHsKKyAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBhdnBrdC0+c2l6ZSAtIDQ7IGkrKykg eworICAgICAgICAgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIGNoYXIgRU9JX1NPSVs0XSA9 IHsgMHhGRiwgMHhEOSwgMHhGRiwgMHg0RiB9OworICAgICAgICAgICAgaWYgKCFtZW1jbXAo YXZwa3QtPmRhdGEgKyBpLCBFT0lfU09JLCA0KSkgeworICAgICAgICAgICAgICAgIGlmIChw aWN0dXJlXzJfc2l6ZSkgeworICAgICAgICAgICAgICAgICAgICBhdl9sb2cocy0+YXZjdHgs IEFWX0xPR19XQVJOSU5HLCAiRUlPIFNPSSBzZXF1ZW5jZSBmb3VuZCB0d2ljZSwgcmlzayBv ZiB3cm9uZyBkZXRlY3Rpb25cbiIpOworICAgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAg ICAgICAgICAgICAgICAgIHBpY3R1cmVfMV9zaXplID0gaSArIDI7CisgICAgICAgICAgICAg ICAgICAgIHBpY3R1cmVfMl9zaXplID0gYXZwa3QtPnNpemUgLSBwaWN0dXJlXzFfc2l6ZTsK KyAgICAgICAgICAgICAgICAgICAgcy0+aGFzXzJfZmllbGRzID0gMTsKKyAgICAgICAgICAg ICAgICAgICAgcy0+aXNfYm90dG9tX2NvZGVkX2ZpcnN0ID0gbWF5X2hhdmVfMl9maWVsZHNf aW5fMV9wYWNrZXQgLSAxOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAg ICAgICAgfQorICAgIH0KKworICAgIC8vIHBhcnNpbmcgZnVsbCBmcmFtZSBvciBmaXJzdCBw aWN0dXJlCisgICAgYXZwa3QtPnNpemUgLT0gcGljdHVyZV8yX3NpemU7CisgICAgcmV0MSA9 IGpwZWcyMDAwX2RlY29kZV9mcmFtZV9waWN0dXJlKGF2Y3R4LCBwaWN0dXJlLCBhdnBrdCk7 CisgICAgCisgICAgLy8gcGFyc2luZyBzZWNvbmQgcGljdHVyZSBpZiBwcmVzZW50CisgICAg aWYgKHBpY3R1cmVfMl9zaXplKSB7CisgICAgICAgIGF2cGt0LT5kYXRhICs9IHBpY3R1cmVf MV9zaXplOworICAgICAgICBhdnBrdC0+c2l6ZSA9IHBpY3R1cmVfMl9zaXplOworICAgICAg ICBzLT5pc19zZWNvbmRfZmllbGQgPSAxOworICAgICAgICByZXQyID0ganBlZzIwMDBfZGVj b2RlX2ZyYW1lX3BpY3R1cmUoYXZjdHgsIHBpY3R1cmUsIGF2cGt0KTsKKworICAgICAgICAv LyByZXNldAorICAgICAgICBhdnBrdC0+ZGF0YSAtPSBwaWN0dXJlXzFfc2l6ZTsKKyAgICAg ICAgYXZwa3QtPnNpemUgKz0gcGljdHVyZV8xX3NpemU7CisgICAgfQorIAorICAgICpnb3Rf ZnJhbWUgPSBhdmN0eC0+c2tpcF9mcmFtZSA8IEFWRElTQ0FSRF9BTEwgJiYgKHJldDEgPj0g MCB8fCByZXQyID49IDApOyAvLyBnb3RfZnJhbWUgaXMgMSBpZiBhbnkgb2YgdGhlIDIgcGlj dHVyZXMgaXMgZmluZQorICAgIHJldHVybiByZXQxIDwgMCA/IHJldDEgOiAocmV0MiA8IDAg PyByZXQyIDogKHJldDEgKyByZXQyKSk7IC8vIHByaW9yaXR5IG9uIGZpcnN0IGZpZWxkIGVy cm9yIGNvZGUKK30KKwogI2RlZmluZSBPRkZTRVQoeCkgb2Zmc2V0b2YoSnBlZzIwMDBEZWNv ZGVyQ29udGV4dCwgeCkKICNkZWZpbmUgVkQgQVZfT1BUX0ZMQUdfVklERU9fUEFSQU0gfCBB Vl9PUFRfRkxBR19ERUNPRElOR19QQVJBTQogCmRpZmYgLS1naXQgYS9saWJhdmNvZGVjL2pw ZWcyMDAwZGVjLmggYi9saWJhdmNvZGVjL2pwZWcyMDAwZGVjLmgKaW5kZXggZDBjYTZlN2E3 OS4uY2U0MjgxMmM0OCAxMDA2NDQKLS0tIGEvbGliYXZjb2RlYy9qcGVnMjAwMGRlYy5oCisr KyBiL2xpYmF2Y29kZWMvanBlZzIwMDBkZWMuaApAQCAtMTE0LDYgKzExNCwxMSBAQCB0eXBl ZGVmIHN0cnVjdCBKcGVnMjAwMERlY29kZXJDb250ZXh0IHsKIAogICAgIC8qb3B0aW9ucyBw YXJhbWV0ZXJzKi8KICAgICBpbnQgICAgICAgICAgICAgcmVkdWN0aW9uX2ZhY3RvcjsKKyAg ICAKKyAgICAvKiBmaWVsZCBpbmZvICovCisgICAgaW50OF90ICAgICAgICAgIGhhc18yX2Zp ZWxkczsKKyAgICBpbnQ4X3QgICAgICAgICAgaXNfYm90dG9tX2NvZGVkX2ZpcnN0OworICAg IGludDhfdCAgICAgICAgICBpc19zZWNvbmRfZmllbGQ7CiB9IEpwZWcyMDAwRGVjb2RlckNv bnRleHQ7CiAKICNlbmRpZiAvL0FWQ09ERUNfSlBFRzIwMDBERUNfSAotLSAKMi4xMy4zLndp bmRvd3MuMQoK --------------Ah73XEwpQ4suYhTiyQcMz40q 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". --------------Ah73XEwpQ4suYhTiyQcMz40q--