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 7B43843216 for ; Mon, 25 Jul 2022 15:44:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0BC2968B440; Mon, 25 Jul 2022 18:44:07 +0300 (EEST) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5454668B5C4 for ; Mon, 25 Jul 2022 18:44:00 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 0A72D9C0438 for ; Mon, 25 Jul 2022 11:43:58 -0400 (EDT) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id aLaycn1_ERq9 for ; Mon, 25 Jul 2022 11:43:57 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 731C09C04C2 for ; Mon, 25 Jul 2022 11:43:57 -0400 (EDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com 731C09C04C2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1658763837; bh=IWMBsnwjY1DBXa4mybgq9PqPM7pYf2G8rsFisCqpNg4=; h=Date:From:To:Message-ID:MIME-Version; b=TAVM5KMbLPGClzED2OBtdtH2PWyH0xwWrVuCu3lZtuaV3eHfzm/ga9rIduYS1SCeY 3mxjy7C9kTAW5Gmn2fY+zmT8XZWEBxV2iOj1tcY8TdVm8FQb+riID7LuMU7DbDUeVd GCWXXE6bQ19BWwo9/1z5arFXto85I5Uc1I2ghms45PozxbNpzBr0MRsn6MYuUjBR6+ YTf562kqCJImMJa3NVhOEjThbjgSjPLV7bGIpomIVLpZWRru2u2T8a3OF6DOm4PVU7 419k7uUBSKXelZqNij3j+H1d16DquQ0pq85TjRhmPzDRokQyUAd8v+kEr3hqe/Xf84 wC//F2PqLDbWQ== X-Virus-Scanned: amavisd-new at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id FhCSkq3DVszh for ; Mon, 25 Jul 2022 11:43:57 -0400 (EDT) Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [192.168.48.237]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 464FA9C0496 for ; Mon, 25 Jul 2022 11:43:57 -0400 (EDT) Date: Mon, 25 Jul 2022 11:43:57 -0400 (EDT) From: Aline Gondim Santos Gondim Santos To: ffmpeg-devel@ffmpeg.org Message-ID: <1210625895.106019.1658763837244.JavaMail.zimbra@savoirfairelinux.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_106017_1430103691.1658763837242" X-Mailer: Zimbra 8.8.15_GA_4308 (ZimbraWebClient - GC103 (Linux)/8.8.15_GA_4304) Thread-Index: YG7nZ59kS6Cb9EjWw7UdEVBmZxJxJQ== Thread-Topic: avdevice/xcbgrab: allow window resizing Subject: [FFmpeg-devel] avdevice/xcbgrab: allow window resizing 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: ------=_Part_106017_1430103691.1658763837242 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Problem: While grabbing a window, if that window is resized the pipeline does not follow the new size. Solution: Make xbcgrab follow the windows geometry by reinitializing the stream. The stream reinit asked for the SHM removal due to memory leak. Aline Gondim Santos, Software Developer - Montreal, QC Savoir-faire Linux inc. Contactez moi sur [ https://jami.net/ | Jami ] : alinegsantos ou au (514) 276-5468 ext. 138 ------=_Part_106017_1430103691.1658763837242 Content-Type: application/mbox; name=0001-avdevice-xcbgrab-allow-window-resizing.patch Content-Disposition: attachment; filename=0001-avdevice-xcbgrab-allow-window-resizing.patch Content-Transfer-Encoding: base64 RnJvbSA3YWI5YTEzOGNmOWUxYmEyYThjZTA5ZmFlNTA5NTcyNWEwM2YyZDA4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGluZSBHb25kaW0gU2FudG9zIDxhbGluZS5nb25kaW1zYW50 b3NAc2F2b2lyZmFpcmVsaW51eC5jb20+CkRhdGU6IE1vbiwgMjUgSnVsIDIwMjIgMTI6MTI6MzQg LTAzMDAKU3ViamVjdDogW1BBVENIXSBhdmRldmljZS94Y2JncmFiOiBhbGxvdyB3aW5kb3cgcmVz aXppbmcKClNpZ25lZC1vZmYtYnk6IEFsaW5lIEdvbmRpbSBTYW50b3MgPGFsaW5lLmdvbmRpbXNh bnRvc0BzYXZvaXJmYWlyZWxpbnV4LmNvbT4KLS0tCiBsaWJhdmRldmljZS94Y2JncmFiLmMgfCAx ODAgKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMzkgaW5zZXJ0aW9ucygrKSwgMTQxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xp YmF2ZGV2aWNlL3hjYmdyYWIuYyBiL2xpYmF2ZGV2aWNlL3hjYmdyYWIuYwppbmRleCA2NGE2OGJh NDk3Li4wNTI4MjkxMWE5IDEwMDY0NAotLS0gYS9saWJhdmRldmljZS94Y2JncmFiLmMKKysrIGIv bGliYXZkZXZpY2UveGNiZ3JhYi5jCkBAIC0yOSwxMSArMjksNiBAQAogI2luY2x1ZGUgPHhjYi94 Zml4ZXMuaD4KICNlbmRpZgogCi0jaWYgQ09ORklHX0xJQlhDQl9TSE0KLSNpbmNsdWRlIDxzeXMv c2htLmg+Ci0jaW5jbHVkZSA8eGNiL3NobS5oPgotI2VuZGlmCi0KICNpZiBDT05GSUdfTElCWENC X1NIQVBFCiAjaW5jbHVkZSA8eGNiL3NoYXBlLmg+CiAjZW5kaWYKQEAgLTUzLDkgKzQ4LDYgQEAg dHlwZWRlZiBzdHJ1Y3QgWENCR3JhYkNvbnRleHQgewogICAgIHhjYl9jb25uZWN0aW9uX3QgKmNv bm47CiAgICAgeGNiX3NjcmVlbl90ICpzY3JlZW47CiAgICAgeGNiX3dpbmRvd190IHdpbmRvdzsK LSNpZiBDT05GSUdfTElCWENCX1NITQotICAgIEFWQnVmZmVyUG9vbCAqc2htX3Bvb2w7Ci0jZW5k aWYKICAgICBpbnQ2NF90IHRpbWVfZnJhbWU7CiAgICAgQVZSYXRpb25hbCB0aW1lX2Jhc2U7CiAg ICAgaW50NjRfdCBmcmFtZV9kdXJhdGlvbjsKQEAgLTcyLDEwICs2NCw5IEBAIHR5cGVkZWYgc3Ry dWN0IFhDQkdyYWJDb250ZXh0IHsKICAgICBpbnQgcmVnaW9uX2JvcmRlcjsKICAgICBpbnQgY2Vu dGVyZWQ7CiAgICAgaW50IHNlbGVjdF9yZWdpb247CisgICAgaW50IGlzX2FyZWE7CiAKICAgICBj b25zdCBjaGFyICpmcmFtZXJhdGU7Ci0KLSAgICBpbnQgaGFzX3NobTsKIH0gWENCR3JhYkNvbnRl eHQ7CiAKICNkZWZpbmUgRk9MTE9XX0NFTlRFUiAtMQpAQCAtOTcsNiArODgsNyBAQCBzdGF0aWMg Y29uc3QgQVZPcHRpb24gb3B0aW9uc1tdID0gewogICAgIHsgInNob3dfcmVnaW9uIiwgIlNob3cg dGhlIGdyYWJiaW5nIHJlZ2lvbi4iLCBPRkZTRVQoc2hvd19yZWdpb24pLCBBVl9PUFRfVFlQRV9J TlQsIHsgLmk2NCA9IDAgfSwgMCwgMSwgRCB9LAogICAgIHsgInJlZ2lvbl9ib3JkZXIiLCAiU2V0 IHRoZSByZWdpb24gYm9yZGVyIHRoaWNrbmVzcy4iLCBPRkZTRVQocmVnaW9uX2JvcmRlciksIEFW X09QVF9UWVBFX0lOVCwgeyAuaTY0ID0gMyB9LCAxLCAxMjgsIEQgfSwKICAgICB7ICJzZWxlY3Rf cmVnaW9uIiwgIlNlbGVjdCB0aGUgZ3JhYmJpbmcgcmVnaW9uIGdyYXBoaWNhbGx5IHVzaW5nIHRo ZSBwb2ludGVyLiIsIE9GRlNFVChzZWxlY3RfcmVnaW9uKSwgQVZfT1BUX1RZUEVfQk9PTCwgeyAu aTY0ID0gMCB9LCAwLCAxLCBEIH0sCisgICAgeyAiaXNfYXJlYSIsICJEZWZpbmUgaWYgd2UgYXJl IGdyYWJpbmcgYSByZWdpb24gb2YgdGhlIGRpc3BsYXkvd2luZG93LiIsIE9GRlNFVChpc19hcmVh KSwgQVZfT1BUX1RZUEVfSU5ULCB7IC5pNjQgPSAxIH0sIDAsIDEsIEQgfSwKICAgICB7IE5VTEwg fSwKIH07CiAKQEAgLTIxNiw5OSArMjA4LDYgQEAgc3RhdGljIGludDY0X3Qgd2FpdF9mcmFtZShB VkZvcm1hdENvbnRleHQgKnMsIEFWUGFja2V0ICpwa3QpCiAgICAgcmV0dXJuIGN1cnRpbWU7CiB9 CiAKLSNpZiBDT05GSUdfTElCWENCX1NITQotc3RhdGljIGludCBjaGVja19zaG0oeGNiX2Nvbm5l Y3Rpb25fdCAqY29ubikKLXsKLSAgICB4Y2Jfc2htX3F1ZXJ5X3ZlcnNpb25fY29va2llX3QgY29v a2llID0geGNiX3NobV9xdWVyeV92ZXJzaW9uKGNvbm4pOwotICAgIHhjYl9zaG1fcXVlcnlfdmVy c2lvbl9yZXBseV90ICpyZXBseTsKLQotICAgIHJlcGx5ID0geGNiX3NobV9xdWVyeV92ZXJzaW9u X3JlcGx5KGNvbm4sIGNvb2tpZSwgTlVMTCk7Ci0gICAgaWYgKHJlcGx5KSB7Ci0gICAgICAgIGZy ZWUocmVwbHkpOwotICAgICAgICByZXR1cm4gMTsKLSAgICB9Ci0KLSAgICByZXR1cm4gMDsKLX0K LQotc3RhdGljIHZvaWQgZnJlZV9zaG1fYnVmZmVyKHZvaWQgKm9wYXF1ZSwgdWludDhfdCAqZGF0 YSkKLXsKLSAgICBzaG1kdChkYXRhKTsKLX0KLQotc3RhdGljIEFWQnVmZmVyUmVmICphbGxvY2F0 ZV9zaG1fYnVmZmVyKHZvaWQgKm9wYXF1ZSwgc2l6ZV90IHNpemUpCi17Ci0gICAgeGNiX2Nvbm5l Y3Rpb25fdCAqY29ubiA9IG9wYXF1ZTsKLSAgICB4Y2Jfc2htX3NlZ190IHNlZ21lbnQ7Ci0gICAg QVZCdWZmZXJSZWYgKnJlZjsKLSAgICB1aW50OF90ICpkYXRhOwotICAgIGludCBpZDsKLQotICAg IGlkID0gc2htZ2V0KElQQ19QUklWQVRFLCBzaXplLCBJUENfQ1JFQVQgfCAwNzc3KTsKLSAgICBp ZiAoaWQgPT0gLTEpCi0gICAgICAgIHJldHVybiBOVUxMOwotCi0gICAgc2VnbWVudCA9IHhjYl9n ZW5lcmF0ZV9pZChjb25uKTsKLSAgICB4Y2Jfc2htX2F0dGFjaChjb25uLCBzZWdtZW50LCBpZCwg MCk7Ci0gICAgZGF0YSA9IHNobWF0KGlkLCBOVUxMLCAwKTsKLSAgICBzaG1jdGwoaWQsIElQQ19S TUlELCAwKTsKLSAgICBpZiAoKGludHB0cl90KWRhdGEgPT0gLTEgfHwgIWRhdGEpCi0gICAgICAg IHJldHVybiBOVUxMOwotCi0gICAgcmVmID0gYXZfYnVmZmVyX2NyZWF0ZShkYXRhLCBzaXplLCBm cmVlX3NobV9idWZmZXIsICh2b2lkICopKHB0cmRpZmZfdClzZWdtZW50LCAwKTsKLSAgICBpZiAo IXJlZikKLSAgICAgICAgc2htZHQoZGF0YSk7Ci0KLSAgICByZXR1cm4gcmVmOwotfQotCi1zdGF0 aWMgaW50IHhjYmdyYWJfZnJhbWVfc2htKEFWRm9ybWF0Q29udGV4dCAqcywgQVZQYWNrZXQgKnBr dCkKLXsKLSAgICBYQ0JHcmFiQ29udGV4dCAqYyA9IHMtPnByaXZfZGF0YTsKLSAgICB4Y2Jfc2ht X2dldF9pbWFnZV9jb29raWVfdCBpcTsKLSAgICB4Y2Jfc2htX2dldF9pbWFnZV9yZXBseV90ICpp bWc7Ci0gICAgeGNiX2RyYXdhYmxlX3QgZHJhd2FibGUgPSBjLT53aW5kb3dfaWQ7Ci0gICAgeGNi X2dlbmVyaWNfZXJyb3JfdCAqZSA9IE5VTEw7Ci0gICAgQVZCdWZmZXJSZWYgKmJ1ZjsKLSAgICB4 Y2Jfc2htX3NlZ190IHNlZ21lbnQ7Ci0KLSAgICBidWYgPSBhdl9idWZmZXJfcG9vbF9nZXQoYy0+ c2htX3Bvb2wpOwotICAgIGlmICghYnVmKSB7Ci0gICAgICAgIGF2X2xvZyhzLCBBVl9MT0dfRVJS T1IsICJDb3VsZCBub3QgZ2V0IHNoYXJlZCBtZW1vcnkgYnVmZmVyLlxuIik7Ci0gICAgICAgIHJl dHVybiBBVkVSUk9SKEVOT01FTSk7Ci0gICAgfQotICAgIHNlZ21lbnQgPSAoeGNiX3NobV9zZWdf dCkodWludHB0cl90KWF2X2J1ZmZlcl9wb29sX2J1ZmZlcl9nZXRfb3BhcXVlKGJ1Zik7Ci0KLSAg ICBpcSA9IHhjYl9zaG1fZ2V0X2ltYWdlKGMtPmNvbm4sIGRyYXdhYmxlLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgYy0+eCwgYy0+eSwgYy0+d2lkdGgsIGMtPmhlaWdodCwgfjAsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICBYQ0JfSU1BR0VfRk9STUFUX1pfUElYTUFQLCBzZWdtZW50 LCAwKTsKLSAgICBpbWcgPSB4Y2Jfc2htX2dldF9pbWFnZV9yZXBseShjLT5jb25uLCBpcSwgJmUp OwotCi0gICAgeGNiX2ZsdXNoKGMtPmNvbm4pOwotCi0gICAgaWYgKGUpIHsKLSAgICAgICAgYXZf bG9nKHMsIEFWX0xPR19FUlJPUiwKLSAgICAgICAgICAgICAgICJDYW5ub3QgZ2V0IHRoZSBpbWFn ZSBkYXRhICIKLSAgICAgICAgICAgICAgICJldmVudF9lcnJvcjogcmVzcG9uc2VfdHlwZToldSBl cnJvcl9jb2RlOiV1ICIKLSAgICAgICAgICAgICAgICJzZXF1ZW5jZToldSByZXNvdXJjZV9pZDol dSBtaW5vcl9jb2RlOiV1IG1ham9yX2NvZGU6JXUuXG4iLAotICAgICAgICAgICAgICAgZS0+cmVz cG9uc2VfdHlwZSwgZS0+ZXJyb3JfY29kZSwKLSAgICAgICAgICAgICAgIGUtPnNlcXVlbmNlLCBl LT5yZXNvdXJjZV9pZCwgZS0+bWlub3JfY29kZSwgZS0+bWFqb3JfY29kZSk7Ci0KLSAgICAgICAg ZnJlZShlKTsKLSAgICAgICAgYXZfYnVmZmVyX3VucmVmKCZidWYpOwotICAgICAgICByZXR1cm4g QVZFUlJPUihFQUNDRVMpOwotICAgIH0KLQotICAgIGZyZWUoaW1nKTsKLQotICAgIHBrdC0+YnVm ID0gYnVmOwotICAgIHBrdC0+ZGF0YSA9IGJ1Zi0+ZGF0YTsKLSAgICBwa3QtPnNpemUgPSBjLT5m cmFtZV9zaXplOwotCi0gICAgcmV0dXJuIDA7Ci19Ci0jZW5kaWYgLyogQ09ORklHX0xJQlhDQl9T SE0gKi8KLQogI2lmIENPTkZJR19MSUJYQ0JfWEZJWEVTCiBzdGF0aWMgaW50IGNoZWNrX3hmaXhl cyh4Y2JfY29ubmVjdGlvbl90ICpjb25uKQogewpAQCAtNDYyLDE0ICszNjEsNyBAQCBzdGF0aWMg aW50IHhjYmdyYWJfcmVhZF9wYWNrZXQoQVZGb3JtYXRDb250ZXh0ICpzLCBBVlBhY2tldCAqcGt0 KQogICAgIGlmIChjLT5zaG93X3JlZ2lvbikKICAgICAgICAgeGNiZ3JhYl91cGRhdGVfcmVnaW9u KHMsIHdpbl94LCB3aW5feSk7CiAKLSNpZiBDT05GSUdfTElCWENCX1NITQotICAgIGlmIChjLT5o YXNfc2htICYmIHhjYmdyYWJfZnJhbWVfc2htKHMsIHBrdCkgPCAwKSB7Ci0gICAgICAgIGF2X2xv ZyhzLCBBVl9MT0dfV0FSTklORywgIkNvbnRpbnVpbmcgd2l0aG91dCBzaGFyZWQgbWVtb3J5Llxu Iik7Ci0gICAgICAgIGMtPmhhc19zaG0gPSAwOwotICAgIH0KLSNlbmRpZgotICAgIGlmICghYy0+ aGFzX3NobSkKLSAgICAgICAgcmV0ID0geGNiZ3JhYl9mcmFtZShzLCBwa3QpOworICAgIHJldCA9 IHhjYmdyYWJfZnJhbWUocywgcGt0KTsKICAgICBwa3QtPmR0cyA9IHBrdC0+cHRzID0gcHRzOwog ICAgIHBrdC0+ZHVyYXRpb24gPSBjLT5mcmFtZV9kdXJhdGlvbjsKIApAQCAtNDg4LDExICszODAs OCBAQCBzdGF0aWMgYXZfY29sZCBpbnQgeGNiZ3JhYl9yZWFkX2Nsb3NlKEFWRm9ybWF0Q29udGV4 dCAqcykKIHsKICAgICBYQ0JHcmFiQ29udGV4dCAqY3R4ID0gcy0+cHJpdl9kYXRhOwogCi0jaWYg Q09ORklHX0xJQlhDQl9TSE0KLSAgICBhdl9idWZmZXJfcG9vbF91bmluaXQoJmN0eC0+c2htX3Bv b2wpOwotI2VuZGlmCi0KICAgICB4Y2JfZGlzY29ubmVjdChjdHgtPmNvbm4pOworICAgIGN0eC0+ Y29ubiA9IE5VTEw7CiAKICAgICByZXR1cm4gMDsKIH0KQEAgLTU3Miw3ICs0NjEsMTUgQEAgc3Rh dGljIGludCBwaXhmbXRfZnJvbV9waXhtYXBfZm9ybWF0KEFWRm9ybWF0Q29udGV4dCAqcywgaW50 IGRlcHRoLAogc3RhdGljIGludCBjcmVhdGVfc3RyZWFtKEFWRm9ybWF0Q29udGV4dCAqcykKIHsK ICAgICBYQ0JHcmFiQ29udGV4dCAqYyA9IHMtPnByaXZfZGF0YTsKLSAgICBBVlN0cmVhbSAqc3Qg ICAgICA9IGF2Zm9ybWF0X25ld19zdHJlYW0ocywgTlVMTCk7CisKKyAgICAvLyBJZiB3ZSB0cnkg dG8gb3BlbiBhbm90aGVyIHN0cmVhbSB0byB4MTFncmFiLCB0aGVyZSBpcyBubyByZWFzb24KKyAg ICAvLyB0byBrZWVwIG1vcmUgdGhhbiBvbmUgc3RyZWFtIGluIHRoZSBjb250ZXh0LgorICAgIEFW U3RyZWFtICpzdDsKKyAgICBpZiAoIXMtPm5iX3N0cmVhbXMpIHsKKyAgICAgICAgc3QgPSBhdmZv cm1hdF9uZXdfc3RyZWFtKHMsIE5VTEwpOworICAgIH0gZWxzZSB7CisgICAgICAgIHN0ID0gcy0+ c3RyZWFtc1swXTsKKyAgICB9CiAgICAgeGNiX2dldF9nZW9tZXRyeV9jb29raWVfdCBnYzsKICAg ICB4Y2JfZ2V0X2dlb21ldHJ5X3JlcGx5X3QgKmdlbzsKICAgICBpbnQ2NF90IGZyYW1lX3NpemVf Yml0czsKQEAgLTU5NCw3ICs0OTEsMTYgQEAgc3RhdGljIGludCBjcmVhdGVfc3RyZWFtKEFWRm9y bWF0Q29udGV4dCAqcykKICAgICAgICAgcmV0dXJuIEFWRVJST1JfRVhURVJOQUw7CiAgICAgfQog CisgICAgLy8gV2lkdGggYW5kIEhlaWdodCBhcmUgbm90IDAgb25seSB3aGVuIHdlIHNldCBhIHdp bmRvdyBhcmVhIHRvIHNoYXJlCisgICAgLy8gVGhpcyBpZiBtYXkgYmUgdmFsaWQgb25seSBpbiAg dGhlIGZpcnN0IGNhbGwgdG8gY3JlYXRlX3N0cmVhbQogICAgIGlmICghYy0+d2lkdGggfHwgIWMt PmhlaWdodCkgeworICAgICAgICBjLT5pc19hcmVhID0gMDsKKyAgICAgICAgYy0+d2lkdGggPSBn ZW8tPndpZHRoOworICAgICAgICBjLT5oZWlnaHQgPSBnZW8tPmhlaWdodDsKKyAgICB9CisgICAg Ly8gSWYgbm90IGEgcHJlZGVmaW5lZCBhcmVhLCB0aGVuIHdlIHNob3VsZCBmb2xsb3cgZ2VvbWV0 cnkgY2hhbmdlcworICAgIC8vIFRoaXMgY2FuIGJlIHZhbGlkIG9ubHkgb24gdGhlIHNlY29uZCBj YWxsIG9ud2FyZHMKKyAgICBpZiAoIWMtPmlzX2FyZWEgJiYgKGMtPndpZHRoICE9IGdlby0+d2lk dGggfHwgYy0+aGVpZ2h0ICE9IGdlby0+aGVpZ2h0KSkgewogICAgICAgICBjLT53aWR0aCA9IGdl by0+d2lkdGg7CiAgICAgICAgIGMtPmhlaWdodCA9IGdlby0+aGVpZ2h0OwogICAgIH0KQEAgLTYy OCwxMyArNTM0LDYgQEAgc3RhdGljIGludCBjcmVhdGVfc3RyZWFtKEFWRm9ybWF0Q29udGV4dCAq cykKICAgICB9CiAgICAgYy0+ZnJhbWVfc2l6ZSA9IGZyYW1lX3NpemVfYml0cyAvIDg7CiAKLSNp ZiBDT05GSUdfTElCWENCX1NITQotICAgIGMtPnNobV9wb29sID0gYXZfYnVmZmVyX3Bvb2xfaW5p dDIoYy0+ZnJhbWVfc2l6ZSArIEFWX0lOUFVUX0JVRkZFUl9QQURESU5HX1NJWkUsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYy0+Y29ubiwgYWxsb2NhdGVfc2ht X2J1ZmZlciwgTlVMTCk7Ci0gICAgaWYgKCFjLT5zaG1fcG9vbCkKLSAgICAgICAgcmV0dXJuIEFW RVJST1IoRU5PTUVNKTsKLSNlbmRpZgotCiAgICAgc3QtPmNvZGVjcGFyLT5jb2RlY190eXBlID0g QVZNRURJQV9UWVBFX1ZJREVPOwogICAgIHN0LT5jb2RlY3Bhci0+Y29kZWNfaWQgICA9IEFWX0NP REVDX0lEX1JBV1ZJREVPOwogICAgIHN0LT5jb2RlY3Bhci0+d2lkdGggICAgICA9IGMtPndpZHRo OwpAQCAtODI5LDIzICs3MjgsMjYgQEAgc3RhdGljIGF2X2NvbGQgaW50IHhjYmdyYWJfcmVhZF9o ZWFkZXIoQVZGb3JtYXRDb250ZXh0ICpzKQogICAgICAgICBzc2NhbmYocy0+dXJsLCAiKyVkLCVk IiwgJmMtPngsICZjLT55KTsKICAgICB9CiAKLSAgICBjLT5jb25uID0geGNiX2Nvbm5lY3QoZGlz cGxheV9uYW1lWzBdID8gZGlzcGxheV9uYW1lIDogTlVMTCwgJnNjcmVlbl9udW0pOwotICAgIGF2 X2ZyZWVwKCZkaXNwbGF5X25hbWUpOworICAgIGlmICghYy0+Y29ubiB8fCAhYy0+c2NyZWVuKSB7 CisgICAgICAgIHhjYmdyYWJfcmVhZF9jbG9zZShzKTsKKyAgICAgICAgYy0+Y29ubiA9IHhjYl9j b25uZWN0KGRpc3BsYXlfbmFtZVswXSA/IGRpc3BsYXlfbmFtZSA6IE5VTEwsICZzY3JlZW5fbnVt KTsKKyAgICAgICAgYXZfZnJlZXAoJmRpc3BsYXlfbmFtZSk7CiAKLSAgICBpZiAoKHJldCA9IHhj Yl9jb25uZWN0aW9uX2hhc19lcnJvcihjLT5jb25uKSkpIHsKLSAgICAgICAgYXZfbG9nKHMsIEFW X0xPR19FUlJPUiwgIkNhbm5vdCBvcGVuIGRpc3BsYXkgJXMsIGVycm9yICVkLlxuIiwKLSAgICAg ICAgICAgICAgIHMtPnVybFswXSA/IHMtPnVybCA6ICJkZWZhdWx0IiwgcmV0KTsKLSAgICAgICAg cmV0dXJuIEFWRVJST1IoRUlPKTsKLSAgICB9CisgICAgICAgIGlmICgocmV0ID0geGNiX2Nvbm5l Y3Rpb25faGFzX2Vycm9yKGMtPmNvbm4pKSkgeworICAgICAgICAgICAgYXZfbG9nKHMsIEFWX0xP R19FUlJPUiwgIkNhbm5vdCBvcGVuIGRpc3BsYXkgJXMsIGVycm9yICVkLlxuIiwKKyAgICAgICAg ICAgICAgICBzLT51cmxbMF0gPyBzLT51cmwgOiAiZGVmYXVsdCIsIHJldCk7CisgICAgICAgICAg ICByZXR1cm4gQVZFUlJPUihFSU8pOworICAgICAgICB9CiAKLSAgICBzZXR1cCA9IHhjYl9nZXRf c2V0dXAoYy0+Y29ubik7CisgICAgICAgc2V0dXAgPSB4Y2JfZ2V0X3NldHVwKGMtPmNvbm4pOwog Ci0gICAgYy0+c2NyZWVuID0gZ2V0X3NjcmVlbihzZXR1cCwgc2NyZWVuX251bSk7Ci0gICAgaWYg KCFjLT5zY3JlZW4pIHsKLSAgICAgICAgYXZfbG9nKHMsIEFWX0xPR19FUlJPUiwgIlRoZSBzY3Jl ZW4gJWQgZG9lcyBub3QgZXhpc3QuXG4iLAotICAgICAgICAgICAgICAgc2NyZWVuX251bSk7Ci0g ICAgICAgIHhjYmdyYWJfcmVhZF9jbG9zZShzKTsKLSAgICAgICAgcmV0dXJuIEFWRVJST1IoRUlP KTsKKyAgICAgICAgYy0+c2NyZWVuID0gZ2V0X3NjcmVlbihzZXR1cCwgc2NyZWVuX251bSk7Cisg ICAgICAgIGlmICghYy0+c2NyZWVuKSB7CisgICAgICAgICAgICBhdl9sb2cocywgQVZfTE9HX0VS Uk9SLCAiVGhlIHNjcmVlbiAlZCBkb2VzIG5vdCBleGlzdC5cbiIsCisgICAgICAgICAgICAgICAg c2NyZWVuX251bSk7CisgICAgICAgICAgICB4Y2JncmFiX3JlYWRfY2xvc2Uocyk7CisgICAgICAg ICAgICByZXR1cm4gQVZFUlJPUihFSU8pOworICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKGMt PndpbmRvd19pZCA9PSBYQ0JfTk9ORSkKQEAgLTg3NiwxMCArNzc4LDYgQEAgc3RhdGljIGF2X2Nv bGQgaW50IHhjYmdyYWJfcmVhZF9oZWFkZXIoQVZGb3JtYXRDb250ZXh0ICpzKQogICAgICAgICBy ZXR1cm4gcmV0OwogICAgIH0KIAotI2lmIENPTkZJR19MSUJYQ0JfU0hNCi0gICAgYy0+aGFzX3No bSA9IGNoZWNrX3NobShjLT5jb25uKTsKLSNlbmRpZgotCiAjaWYgQ09ORklHX0xJQlhDQl9YRklY RVMKICAgICBpZiAoYy0+ZHJhd19tb3VzZSkgewogICAgICAgICBpZiAoIShjLT5kcmF3X21vdXNl ID0gY2hlY2tfeGZpeGVzKGMtPmNvbm4pKSkgewotLSAKMi4zNC4xCgo= ------=_Part_106017_1430103691.1658763837242 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". ------=_Part_106017_1430103691.1658763837242--