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 EA87B493A0 for ; Thu, 8 Feb 2024 21:58:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 92F6D68D178; Thu, 8 Feb 2024 23:58:07 +0200 (EET) Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 194EB68C954 for ; Thu, 8 Feb 2024 23:58:00 +0200 (EET) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-5f38d676cecso18286387b3.0 for ; Thu, 08 Feb 2024 13:58:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707429479; x=1708034279; h=content-transfer-encoding:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=UbzScIPQplXZM7h60qs3bmEq2VYpk/1K6qu2qpAlzCU=; b=B6+PrtMwGfqGbifoxB86akfeX0NrBvzhirqRMhDTxSVg4wWurL969i5tv3MZgVgUlH +rAOI4FTmivl/XFVZWZWdj8esISbSVOkDwJ+TFgfLYYvfSuX4S+Ue58pvQu94dNe/rwd 86U+rnw0dgdwJazGZ+MMWDQstWiZw1xJLZnEuDA40J/r9mHwqwTYQ5UqrmRM89K4IZK+ u/rL/CE9SR0JmVLcvV8ngKM6WjCIBDsuKlD4zY3vHKEa0FrGl7uB1mUzzRSnR769jeqr PfiPSYx2Mppnf5JEXTcyhoLNcXrDYUHa0HC+AkBMyAKkTKi6qCiPUoBaHhtO1/xNaYxn wf9g== X-Gm-Message-State: AOJu0YySLQzJAR2CZq9+H4STPL89IiPNZCY+BYDoPAxHc8gGMp4stlRz nuoG9D1Be+FUq8ouAP1GaMZOO+wjSY234o0fzTz/eUzcjwZ9yQuVb8j3BAHJ0C6Uq27aCOJ3//P Fmsf2CXWcm2jq/1zook1d2FIT1x24XJeEbfIa/X4dV6n02W2NwHstkPWYQ48hQSVyDvZ17WxmwK o92t7VXQjGGxjdmk0r90x3ZgmFCVpDK8o72Q== X-Google-Smtp-Source: AGHT+IFReOVOcoqURAPbXxDvM7baYOxGyemJCTPd26hy/sthKhcQTarEXS/XvTpVnI4CgpuQBGvMmkZ9tQM= X-Received: from reksio.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1be8]) (user=darekm job=sendgmr) by 2002:a25:946:0:b0:dc6:19b9:5b83 with SMTP id u6-20020a250946000000b00dc619b95b83mr829834ybm.6.1707429476463; Thu, 08 Feb 2024 13:57:56 -0800 (PST) Date: Thu, 8 Feb 2024 21:56:49 +0000 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240208215649.3090001-2-darekm@google.com> To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v3] lavc/libvpxenc: add screen-content-mode option 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: , From: Dariusz Marcinkiewicz via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Dariusz Marcinkiewicz , =?UTF-8?q?Erik=20Spr=C3=A5ng?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: VGhpcyBleHBvc2VzIFZQOEVfU0VUX1NDUkVFTl9DT05URU5UX01PREUgb3B0aW9uIGZyb20gbGli dnB4IGFuZCBtYWtlcwp1cyByZXRyeSBlbmNvZGUgaWYgc2NyZWVuX2NvbnRlbnRfbW9kZSA9PSAy IGFuZCBubyBvdXRwdXQgd2FzIHByb2R1Y2VkCmJ5IGVuY29kZXIuCgpDby1hdXRob3JlZC1ieTog RXJpayBTcHLDpW5nIDxzcHJhbmdAd2VicnRjLm9yZz4KU2lnbmVkLW9mZi1ieTogRGFyaXVzeiBN YXJjaW5raWV3aWN6IDxkYXJla21AZ29vZ2xlLmNvbT4KLS0tCiBkb2MvZW5jb2RlcnMudGV4aSAg ICAgIHwgIDMgKysrCiBsaWJhdmNvZGVjL2xpYnZweGVuYy5jIHwgNTcgKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKystLS0tCiBsaWJhdmNvZGVjL3ZlcnNpb24uaCAgIHwgIDIg Ky0KIDMgZmlsZXMgY2hhbmdlZCwgNTYgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kb2MvZW5jb2RlcnMudGV4aSBiL2RvYy9lbmNvZGVycy50ZXhpCmluZGV4IGM5 ZmU2ZDYxNDMuLjA4NjhhYTY2ZGIgMTAwNjQ0Ci0tLSBhL2RvYy9lbmNvZGVycy50ZXhpCisrKyBi L2RvYy9lbmNvZGVycy50ZXhpCkBAIC0yMTUwLDYgKzIxNTAsOSBAQCBvZiBxdWFsaXR5LgogU2V0 IGEgY2hhbmdlIHRocmVzaG9sZCBvbiBibG9ja3MgYmVsb3cgd2hpY2ggdGhleSB3aWxsIGJlIHNr aXBwZWQgYnkgdGhlCiBlbmNvZGVyLgogCitAaXRlbSBzY3JlZW4tY29udGVudC1tb2RlCitTY3Jl ZW4gY29udGVudCBtb2RlLCBvbmUgb2Y6IG9mZiAoMCksIHNjcmVlbiAoMSksIHNjcmVlbiB3aXRo IG1vcmUgYWdncmVzc2l2ZSByYXRlIGNvbnRyb2wgKDIpLgorCiBAaXRlbSBzbGljZXMgKEBlbXBo e3Rva2VuLXBhcnRzfSkKIE5vdGUgdGhhdCBGRm1wZWcncyBAb3B0aW9ue3NsaWNlc30gb3B0aW9u IGdpdmVzIHRoZSB0b3RhbCBudW1iZXIgb2YgcGFydGl0aW9ucywKIHdoaWxlIEBjb21tYW5ke3Zw eGVuY30ncyBAb3B0aW9ue3Rva2VuLXBhcnRzfSBpcyBnaXZlbiBhcwpkaWZmIC0tZ2l0IGEvbGli YXZjb2RlYy9saWJ2cHhlbmMuYyBiL2xpYmF2Y29kZWMvbGlidnB4ZW5jLmMKaW5kZXggODA5ODhh MjYwOC4uNzU3MWE4NTc3YSAxMDA2NDQKLS0tIGEvbGliYXZjb2RlYy9saWJ2cHhlbmMuYworKysg Yi9saWJhdmNvZGVjL2xpYnZweGVuYy5jCkBAIC0xMTQsNiArMTE0LDcgQEAgdHlwZWRlZiBzdHJ1 Y3QgVlB4RW5jb2RlckNvbnRleHQgewogICAgIGludCBjcmY7CiAgICAgaW50IHN0YXRpY190aHJl c2g7CiAgICAgaW50IG1heF9pbnRyYV9yYXRlOworICAgIGludCBzY3JlZW5fY29udGVudF9tb2Rl OwogICAgIGludCByY191bmRlcnNob290X3BjdDsKICAgICBpbnQgcmNfb3ZlcnNob290X3BjdDsK IApAQCAtMTY0LDYgKzE2NSw3IEBAIHN0YXRpYyBjb25zdCBjaGFyICpjb25zdCBjdGxpZHN0cltd ID0gewogICAgIFtWUDhFX1NFVF9NQVhfSU5UUkFfQklUUkFURV9QQ1RdID0gIlZQOEVfU0VUX01B WF9JTlRSQV9CSVRSQVRFX1BDVCIsCiAgICAgW1ZQOEVfU0VUX1NIQVJQTkVTU10gICAgICAgICAg ICAgICA9ICJWUDhFX1NFVF9TSEFSUE5FU1MiLAogICAgIFtWUDhFX1NFVF9URU1QT1JBTF9MQVlF Ul9JRF0gICAgICAgPSAiVlA4RV9TRVRfVEVNUE9SQUxfTEFZRVJfSUQiLAorICAgIFtWUDhFX1NF VF9TQ1JFRU5fQ09OVEVOVF9NT0RFXSAgICAgPSAiVlA4RV9TRVRfU0NSRUVOX0NPTlRFTlRfTU9E RSIsCiAjaWYgQ09ORklHX0xJQlZQWF9WUDlfRU5DT0RFUgogICAgIFtWUDlFX1NFVF9MT1NTTEVT U10gICAgICAgICAgICAgICAgPSAiVlA5RV9TRVRfTE9TU0xFU1MiLAogICAgIFtWUDlFX1NFVF9U SUxFX0NPTFVNTlNdICAgICAgICAgICAgPSAiVlA5RV9TRVRfVElMRV9DT0xVTU5TIiwKQEAgLTEy NjIsNiArMTI2NCwxNiBAQCBzdGF0aWMgYXZfY29sZCBpbnQgdnB4X2luaXQoQVZDb2RlY0NvbnRl eHQgKmF2Y3R4LAogI2VuZGlmCiAgICAgfQogI2VuZGlmCisjaWZkZWYgVlBYX0NUUkxfVlA4RV9T RVRfU0NSRUVOX0NPTlRFTlRfTU9ERQorICAgIGlmIChhdmN0eC0+Y29kZWNfaWQgPT0gQVZfQ09E RUNfSURfVlA4ICYmIGN0eC0+c2NyZWVuX2NvbnRlbnRfbW9kZSA+PSAwKSB7CisgICAgICBpZiAo Y3R4LT5zY3JlZW5fY29udGVudF9tb2RlID09IDIgJiYgY3R4LT5pc19hbHBoYSkgeworICAgICAg ICBhdl9sb2coYXZjdHgsIEFWX0xPR19FUlJPUiwKKyAgICAgICAgICAgICAgICJUcmFuc3BhcmVu Y3kgZW5jb2Rpbmcgd2l0aCBzY3JlZW4gbW9kZSB3aXRoIGFnZ3Jlc3NpdmUgcmF0ZSBjb250cm9s IG5vdCBzdXBwb3J0ZWRcbiIpOworICAgICAgICByZXR1cm4gQVZFUlJPUihFSU5WQUwpOworICAg ICAgfQorICAgICAgY29kZWNjdGxfaW50KGF2Y3R4LCBWUDhFX1NFVF9TQ1JFRU5fQ09OVEVOVF9N T0RFLCBjdHgtPnNjcmVlbl9jb250ZW50X21vZGUpOworICAgIH0KKyNlbmRpZgogCiAgICAgYXZf bG9nKGF2Y3R4LCBBVl9MT0dfREVCVUcsICJVc2luZyBkZWFkbGluZTogJWRcbiIsIGN0eC0+ZGVh ZGxpbmUpOwogCkBAIC0xMzc5LDE0ICsxMzkxLDE1IEBAIHN0YXRpYyBpbnQgc3RvcmVmcmFtZShB VkNvZGVjQ29udGV4dCAqYXZjdHgsIHN0cnVjdCBGcmFtZUxpc3REYXRhICpjeF9mcmFtZSwKICAq IEByZXR1cm4gQVZFUlJPUihFTk9NRU0pIG9uIGNvZGVkIGZyYW1lIHF1ZXVlIGRhdGEgYWxsb2Nh dGlvbiBlcnJvcgogICovCiBzdGF0aWMgaW50IHF1ZXVlX2ZyYW1lcyhBVkNvZGVjQ29udGV4dCAq YXZjdHgsIHN0cnVjdCB2cHhfY29kZWNfY3R4ICplbmNvZGVyLAotICAgICAgICAgICAgICAgICAg ICAgICAgc3RydWN0IEZyYW1lTGlzdERhdGEgKipmcmFtZV9saXN0LCBBVlBhY2tldCAqcGt0X291 dCkKKyAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBGcmFtZUxpc3REYXRhICoqZnJhbWVf bGlzdCwgQVZQYWNrZXQgKnBrdF9vdXQsCisgICAgICAgICAgICAgICAgICAgICAgICBpbnQgcXVl dWVfb25seSwgaW50ICpmcmFtZV9lbmMpCiB7CiAgICAgVlB4Q29udGV4dCAqY3R4ID0gYXZjdHgt PnByaXZfZGF0YTsKICAgICBjb25zdCBzdHJ1Y3QgdnB4X2NvZGVjX2N4X3BrdCAqcGt0OwogICAg IGNvbnN0IHZvaWQgKml0ZXIgPSBOVUxMOwogICAgIGludCBzaXplID0gMDsKIAotICAgIGlmICgh Y3R4LT5pc19hbHBoYSAmJiAqZnJhbWVfbGlzdCkgeworICAgIGlmICghcXVldWVfb25seSAmJiAq ZnJhbWVfbGlzdCkgewogICAgICAgICBzdHJ1Y3QgRnJhbWVMaXN0RGF0YSAqY3hfZnJhbWUgPSAq ZnJhbWVfbGlzdDsKICAgICAgICAgLyogcmV0dXJuIHRoZSBsZWFkaW5nIGZyYW1lIGlmIHdlJ3Zl IGFscmVhZHkgYmVndW4gcXVldWVpbmcgKi8KICAgICAgICAgc2l6ZSA9IHN0b3JlZnJhbWUoYXZj dHgsIGN4X2ZyYW1lLCBOVUxMLCBwa3Rfb3V0KTsKQEAgLTE0MDEsNyArMTQxNCw3IEBAIHN0YXRp YyBpbnQgcXVldWVfZnJhbWVzKEFWQ29kZWNDb250ZXh0ICphdmN0eCwgc3RydWN0IHZweF9jb2Rl Y19jdHggKmVuY29kZXIsCiAgICAgd2hpbGUgKHBrdCA9IHZweF9jb2RlY19nZXRfY3hfZGF0YShl bmNvZGVyLCAmaXRlcikpIHsKICAgICAgICAgc3dpdGNoIChwa3QtPmtpbmQpIHsKICAgICAgICAg Y2FzZSBWUFhfQ09ERUNfQ1hfRlJBTUVfUEtUOgotICAgICAgICAgICAgaWYgKCFjdHgtPmlzX2Fs cGhhICYmICFzaXplKSB7CisgICAgICAgICAgICBpZiAoIXF1ZXVlX29ubHkgJiYgIXNpemUpIHsK ICAgICAgICAgICAgICAgICBzdHJ1Y3QgRnJhbWVMaXN0RGF0YSBjeF9mcmFtZTsKIAogICAgICAg ICAgICAgICAgIC8qIGF2b2lkIHN0b3JpbmcgdGhlIGZyYW1lIHdoZW4gdGhlIGxpc3QgaXMgZW1w dHkgYW5kIHdlIGhhdmVuJ3QgeWV0CkBAIC0xNDExLDYgKzE0MjQsOCBAQCBzdGF0aWMgaW50IHF1 ZXVlX2ZyYW1lcyhBVkNvZGVjQ29udGV4dCAqYXZjdHgsIHN0cnVjdCB2cHhfY29kZWNfY3R4ICpl bmNvZGVyLAogICAgICAgICAgICAgICAgIHNpemUgPSBzdG9yZWZyYW1lKGF2Y3R4LCAmY3hfZnJh bWUsIE5VTEwsIHBrdF9vdXQpOwogICAgICAgICAgICAgICAgIGlmIChzaXplIDwgMCkKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIHNpemU7CisgICAgICAgICAgICAgICAgaWYgKHNpemUgPiAw KQorICAgICAgICAgICAgICAgICAgICAqZnJhbWVfZW5jID0gMTsKICAgICAgICAgICAgIH0gZWxz ZSB7CiAgICAgICAgICAgICAgICAgc3RydWN0IEZyYW1lTGlzdERhdGEgKmN4X2ZyYW1lID0gYXZf bWFsbG9jKHNpemVvZigqY3hfZnJhbWUpKTsKIApAQCAtMTQzMCw2ICsxNDQ1LDggQEAgc3RhdGlj IGludCBxdWV1ZV9mcmFtZXMoQVZDb2RlY0NvbnRleHQgKmF2Y3R4LCBzdHJ1Y3QgdnB4X2NvZGVj X2N0eCAqZW5jb2RlciwKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIEFWRVJST1IoRU5PTUVN KTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgbWVtY3B5KGN4X2ZyYW1lLT5i dWYsIHBrdC0+ZGF0YS5mcmFtZS5idWYsIHBrdC0+ZGF0YS5mcmFtZS5zeik7CisgICAgICAgICAg ICAgICAgaWYgKHBrdC0+ZGF0YS5mcmFtZS5zeiA+IDApCisgICAgICAgICAgICAgICAgICAqZnJh bWVfZW5jID0gMTsKICAgICAgICAgICAgICAgICBjb2RlZF9mcmFtZV9hZGQoZnJhbWVfbGlzdCwg Y3hfZnJhbWUpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYnJlYWs7CkBAIC0xNjkzLDYg KzE3MTAsNyBAQCBzdGF0aWMgaW50IHZweF9lbmNvZGUoQVZDb2RlY0NvbnRleHQgKmF2Y3R4LCBB VlBhY2tldCAqcGt0LAogICAgIHZweF9zdmNfbGF5ZXJfaWRfdCBsYXllcl9pZDsKICAgICBpbnQg bGF5ZXJfaWRfdmFsaWQgPSAwOwogICAgIHVuc2lnbmVkIGxvbmcgZHVyYXRpb24gPSAwOworICAg IGludCBmcmFtZV9lbmMgPSAwOwogCiAgICAgaWYgKGF2Y3R4LT5xbWF4ID49IDAgJiYgZW5jY2Zn LT5yY19tYXhfcXVhbnRpemVyICE9IGF2Y3R4LT5xbWF4KSB7CiAgICAgICAgIHN0cnVjdCB2cHhf Y29kZWNfZW5jX2NmZyBjZmcgPSAqZW5jY2ZnOwpAQCAtMTg1Niw5ICsxODc0LDMyIEBAIEZGX0VO QUJMRV9ERVBSRUNBVElPTl9XQVJOSU5HUwogICAgICAgICB9CiAgICAgfQogCi0gICAgY29kZWRf c2l6ZSA9IHF1ZXVlX2ZyYW1lcyhhdmN0eCwgJmN0eC0+ZW5jb2RlciwgJmN0eC0+Y29kZWRfZnJh bWVfbGlzdCwgcGt0KTsKKyAgICBjb2RlZF9zaXplID0gcXVldWVfZnJhbWVzKGF2Y3R4LCAmY3R4 LT5lbmNvZGVyLCAmY3R4LT5jb2RlZF9mcmFtZV9saXN0LAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcGt0LCBjdHgtPmlzX2FscGhhLCAmZnJhbWVfZW5jKTsKKyAgICBpZiAoYXZjdHgt PmNvZGVjX2lkID09IEFWX0NPREVDX0lEX1ZQOCAmJiBmcmFtZV9lbmMgPT0gMCAmJgorICAgICAg ICBjdHgtPnNjcmVlbl9jb250ZW50X21vZGUgPT0gMiAmJiBmcmFtZSkgeworICAgICAgICAvLyBW UDggdHVuZWQgZm9yIHNjcmVlbiBjb250ZW50IHdpdGggYWdncmVzaXZlIHJhdGUgY29udHJvbCAt IHJldHVybmVkCisgICAgICAgIC8vIE9LIHN0YXR1cyBjb2RlIGJ1dCBwcm9kdWNlZCBubyBvdXRw dXQsIHRoaXMgaW5kaWNhdGVzIGZyYW1lIHdhcworICAgICAgICAvLyByb2xsZWQgYmFjayBkdWUg dG8gYml0cmF0ZSBvdmVyc2hvb3QgLSB0cnkgdG8gZW5jb2RlIGl0IGFnYWluLgorICAgICAgICBh dl9sb2coYXZjdHgsIEFWX0xPR19WRVJCT1NFLAorICAgICAgICAgICAgICAgIkF0dGVtcHRpbmcg dG8gcmVlbmNvZGUgZHJvcHBlZCBmcmFtZS5cbiIpOworICAgICAgICByZXMgPSB2cHhfY29kZWNf ZW5jb2RlKCZjdHgtPmVuY29kZXIsIHJhd2ltZywgdGltZXN0YW1wLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGR1cmF0aW9uLCBmbGFncywgY3R4LT5kZWFkbGluZSk7CisgICAgICAg IGlmIChyZXMgIT0gVlBYX0NPREVDX09LKSB7CisgICAgICAgICAgICBsb2dfZW5jb2Rlcl9lcnJv cihhdmN0eCwgIkVycm9yIGVuY29kaW5nIGZyYW1lIik7CisgICAgICAgICAgICByZXR1cm4gQVZF UlJPUl9JTlZBTElEREFUQTsKKyAgICAgICAgfQorICAgICAgICBpZiAoIWNvZGVkX3NpemUpCisg ICAgICAgICAgY29kZWRfc2l6ZSA9IHF1ZXVlX2ZyYW1lcyhhdmN0eCwgJmN0eC0+ZW5jb2Rlciwg JmN0eC0+Y29kZWRfZnJhbWVfbGlzdCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHBrdCwgLypxdWV1ZV9vbmx5Ki8wLCAmZnJhbWVfZW5jKTsKKyAgICAgICAgZWxzZQorICAg ICAgICAgIHF1ZXVlX2ZyYW1lcyhhdmN0eCwgJmN0eC0+ZW5jb2RlciwgJmN0eC0+Y29kZWRfZnJh bWVfbGlzdCwgcGt0LAorICAgICAgICAgICAgICAgICAgICAgICAvKnF1ZXVlX29ubHkqLzEsICZm cmFtZV9lbmMpOworICAgIH0KKwogICAgIGlmIChjdHgtPmlzX2FscGhhKSB7Ci0gICAgICAgIHF1 ZXVlX2ZyYW1lcyhhdmN0eCwgJmN0eC0+ZW5jb2Rlcl9hbHBoYSwgJmN0eC0+YWxwaGFfY29kZWRf ZnJhbWVfbGlzdCwgTlVMTCk7CisgICAgICAgIHF1ZXVlX2ZyYW1lcyhhdmN0eCwgJmN0eC0+ZW5j b2Rlcl9hbHBoYSwgJmN0eC0+YWxwaGFfY29kZWRfZnJhbWVfbGlzdCwKKyAgICAgICAgICAgICAg ICAgICAgIE5VTEwsIC8qcXVldWVfb25seSovMSwgJmZyYW1lX2VuYyk7CiAKICAgICAgICAgaWYg KGN0eC0+Y29kZWRfZnJhbWVfbGlzdCAmJiBjdHgtPmFscGhhX2NvZGVkX2ZyYW1lX2xpc3QpIHsK ICAgICAgICAgICAgIHN0cnVjdCBGcmFtZUxpc3REYXRhICpjeF9mcmFtZSA9IGN0eC0+Y29kZWRf ZnJhbWVfbGlzdDsKQEAgLTE5NDYsNiArMTk4NywxMiBAQCBzdGF0aWMgY29uc3QgQVZPcHRpb24g dnA4X29wdGlvbnNbXSA9IHsKICAgICB7ICJhdXRvLWFsdC1yZWYiLCAgICAiRW5hYmxlIHVzZSBv ZiBhbHRlcm5hdGUgcmVmZXJlbmNlICIKICAgICAgICAgICAgICAgICAgICAgICAgICAiZnJhbWVz ICgyLXBhc3Mgb25seSkiLCAgICAgICAgICAgICAgICAgICAgICAgIE9GRlNFVChhdXRvX2FsdF9y ZWYpLCAgICBBVl9PUFRfVFlQRV9JTlQsIHsuaTY0ID0gLTF9LCAtMSwgIDIsIFZFfSwKICAgICB7 ICJjcHUtdXNlZCIsICAgICAgICAiUXVhbGl0eS9TcGVlZCByYXRpbyBtb2RpZmllciIsICAgICAg ICAgICAgICAgIE9GRlNFVChjcHVfdXNlZCksICAgICAgICBBVl9PUFRfVFlQRV9JTlQsIHsuaTY0 ID0gMX0sIC0xNiwgMTYsIFZFfSwKKyNpZmRlZiBWUFhfQ1RSTF9WUDhFX1NFVF9TQ1JFRU5fQ09O VEVOVF9NT0RFCisgICAgeyAic2NyZWVuLWNvbnRlbnQtbW9kZSIsICAgICAiRW5jb2RlciBzY3Jl ZW4gY29udGVudCBtb2RlIiwgICAgICAgICBPRkZTRVQoc2NyZWVuX2NvbnRlbnRfbW9kZSksIEFW X09QVF9UWVBFX0lOVCwgey5pNjQgPSAtMX0sIC0xLCAgMiwgVkUsICJzY3JlZW5fY29udGVudF9t b2RlIn0sCisgICAgeyAib2ZmIiwgICAgICAgICAgIlNjcmVlbiBjb250ZW50IG1vZGUgb2ZmIiwg ICAgICAgICAgICAgICAgICAgICAgICAwLCAgICAgICAgICAgICAgICAgICAgICBBVl9PUFRfVFlQ RV9DT05TVCwgey5pNjQgPSAwfSwgMCwgIDAsIFZFLCAic2NyZWVuX2NvbnRlbnRfbW9kZSJ9LAor ICAgIHsgIm9uIiwgICAgICAgICAgICJTY3JlZW4gY29udGVudCBtb2RlIG9uIiwgICAgICAgICAg ICAgICAgICAgICAgICAgMCwgICAgICAgICAgICAgICAgICAgICAgQVZfT1BUX1RZUEVfQ09OU1Qs IHsuaTY0ID0gMX0sIDAsICAwLCBWRSwgInNjcmVlbl9jb250ZW50X21vZGUifSwKKyAgICB7ICJv bi1hZ3Jlc3NpdmUtcmF0ZS1jb250cm9sIiwgIlNjcmVlbiBjb250ZW50IG1vZGUgb24gd2l0aCBh Z2dyZXNzaXZlIHJhdGUgY29udHJvbCIsIDAsICAgIEFWX09QVF9UWVBFX0NPTlNULCB7Lmk2NCA9 IDJ9LCAwLCAgMCwgVkUsICJzY3JlZW5fY29udGVudF9tb2RlIn0sCisjZW5kaWYKICAgICBMRUdB Q1lfT1BUSU9OUwogICAgIHsgTlVMTCB9CiB9OwpkaWZmIC0tZ2l0IGEvbGliYXZjb2RlYy92ZXJz aW9uLmggYi9saWJhdmNvZGVjL3ZlcnNpb24uaAppbmRleCAwZmFlM2QwNmQzLi40YjYxOGQ3NDBm IDEwMDY0NAotLS0gYS9saWJhdmNvZGVjL3ZlcnNpb24uaAorKysgYi9saWJhdmNvZGVjL3ZlcnNp b24uaApAQCAtMzAsNyArMzAsNyBAQAogI2luY2x1ZGUgInZlcnNpb25fbWFqb3IuaCIKIAogI2Rl ZmluZSBMSUJBVkNPREVDX1ZFUlNJT05fTUlOT1IgIDM4Ci0jZGVmaW5lIExJQkFWQ09ERUNfVkVS U0lPTl9NSUNSTyAxMDAKKyNkZWZpbmUgTElCQVZDT0RFQ19WRVJTSU9OX01JQ1JPIDEwMQogCiAj ZGVmaW5lIExJQkFWQ09ERUNfVkVSU0lPTl9JTlQgIEFWX1ZFUlNJT05fSU5UKExJQkFWQ09ERUNf VkVSU0lPTl9NQUpPUiwgXAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBMSUJBVkNPREVDX1ZFUlNJT05fTUlOT1IsIFwKLS0gCjIuNDMuMC42ODcuZzM4YWE2 NTU5YjAtZ29vZwoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZmZtcGVnLWRldmVsIG1haWxpbmcgbGlzdApmZm1wZWctZGV2ZWxAZmZtcGVnLm9yZwpodHRw czovL2ZmbXBlZy5vcmcvbWFpbG1hbi9saXN0aW5mby9mZm1wZWctZGV2ZWwKClRvIHVuc3Vic2Ny aWJlLCB2aXNpdCBsaW5rIGFib3ZlLCBvciBlbWFpbApmZm1wZWctZGV2ZWwtcmVxdWVzdEBmZm1w ZWcub3JnIHdpdGggc3ViamVjdCAidW5zdWJzY3JpYmUiLgo=