196346 2019-03-28 04:27:23 -0700 [GStreamer] imxvpudecoder detection and handling 2019-03-29 03:45:40 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand calvaris webkit-bug-importer oldest_to_newest 1522034 0 pnormand 2019-03-28 04:27:23 -0700 When the imxvpudecoder is used, the texture sampling of the directviv-uploaded texure returns an RGB value, so there's no need to convert it. 1522037 1 366165 pnormand 2019-03-28 04:48:32 -0700 Created attachment 366165 Patch 1522043 2 366165 calvaris 2019-03-28 05:28:29 -0700 Comment on attachment 366165 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=366165&action=review > Source/WebCore/ChangeLog:9 > + directviv-uploaded texure returns an RGB value, so there's no need texture > Source/WebCore/ChangeLog:11 > + ImageRotation flag handling. The flat is now computed once only flag > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:858 > + bool shouldWait = m_videoDecoderPlatform == WebKitGstVideoDecoderPlatform::Video4Linux; > auto proxyOperation = > - [shouldWait = m_isVideoDecoderVideo4Linux, pipeline = pipeline()](TextureMapperPlatformLayerProxy& proxy) > + [shouldWait, pipeline = pipeline()](TextureMapperPlatformLayerProxy& proxy) nit: is there any problem in using this in one line? > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:294 > + mutable WebKitGstVideoDecoderPlatform m_videoDecoderPlatform; Does this need to be mutable? 1522412 3 366165 pnormand 2019-03-29 02:55:51 -0700 Comment on attachment 366165 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=366165&action=review >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:294 >> + mutable WebKitGstVideoDecoderPlatform m_videoDecoderPlatform; > > Does this need to be mutable? It indeed does not! 1522422 4 pnormand 2019-03-29 03:43:47 -0700 Committed r243644: <https://trac.webkit.org/changeset/243644> 1522423 5 webkit-bug-importer 2019-03-29 03:45:40 -0700 <rdar://problem/49415998> 366165 2019-03-28 04:48:32 -0700 2019-03-28 05:43:57 -0700 Patch bug-196346-20190328114831.patch text/plain 11274 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNjAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODA0NTIzYjIwODZkYWM2 YjQ1NWY2NTg4ODk4MjUyNGY3OWMwNDZjMS4uNzZiZmQxYTZlMDBlM2IwNDg2ZjA4MWY3NzlkZGUy ZDM5ZWEyMDFiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE5LTAzLTI4ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBpbXh2cHVkZWNvZGVyIGRldGVjdGlvbiBhbmQgaGFuZGxpbmcKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NjM0NgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIGlteHZwdWRlY29kZXIgaXMg dXNlZCwgdGhlIHRleHR1cmUgc2FtcGxpbmcgb2YgdGhlCisgICAgICAgIGRpcmVjdHZpdi11cGxv YWRlZCB0ZXh1cmUgcmV0dXJucyBhbiBSR0IgdmFsdWUsIHNvIHRoZXJlJ3Mgbm8gbmVlZAorICAg ICAgICB0byBjb252ZXJ0IGl0LiBUaGlzIHBhdGNoIGFsc28gaW5jbHVkZXMgYSByZWZhY3Rvcmlu ZyBvZiB0aGUKKyAgICAgICAgSW1hZ2VSb3RhdGlvbiBmbGFnIGhhbmRsaW5nLiBUaGUgZmxhdCBp cyBub3cgY29tcHV0ZWQgb25jZSBvbmx5CisgICAgICAgIGFuZCBzdG9yZWQgaW4gYW4gaW5zdGFu Y2UgdmFyaWFibGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y3JlYXRlR1NUUGxheUJpbik6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6R3N0VmlkZW9GcmFtZUhvbGRlcjo6R3N0VmlkZW9GcmFtZUhv bGRlcik6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNl Ojp+TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpwdXNoVGV4dHVyZVRvQ29tcG9zaXRvcik6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpmbHVz aEN1cnJlbnRCdWZmZXIpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyQmFzZTo6Y29weVZpZGVvVGV4dHVyZVRvUGxhdGZvcm1UZXh0dXJlKToKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6Om5hdGl2ZUltYWdlRm9y Q3VycmVudFRpbWUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyQmFzZTo6c2V0VmlkZW9Tb3VyY2VPcmllbnRhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjp1cGRhdGVUZXh0dXJlTWFwcGVyRmxhZ3Mp OgorICAgICAgICAoV2ViQ29yZTo6dGV4TWFwRmxhZ0Zyb21PcmllbnRhdGlvbik6IERlbGV0ZWQu CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lckJhc2UuaDoKKwogMjAxOS0wMy0yNyAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBbbWFjT1NdIFNlbGVjdCBlbGVtZW50IGRvZXNuJ3Qgc2hvdyBw b3B1cCBpZiBzZWxlY3QgZWxlbWVudCBoYWQgbG9zdCBmb2N1cyB3aGlsZSBwb3B1cCB3YXMgcHJl dmlvc3VseSBzaG93bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyLmNwcAppbmRleCBhZWFiMzk2MmUwYzUwMzNkNGFmYjRkOTg2MzY5MTRkZWUwZDI1MjFjLi5l Njc4N2Y1MGZhZGIyMmZjMGRiNmQzMWQ4ZjNjODMxODQ2MjNiZDU4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMjM5Nyw3ICsyMzk3LDEy IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpjcmVhdGVHU1RQbGF5QmluKGNv bnN0IGdjaGFyKiBwbGF5YmluTmFtZSwgY29uCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAg ICAgR1VuaXF1ZVB0cjxjaGFyPiBlbGVtZW50TmFtZShnc3RfZWxlbWVudF9nZXRfbmFtZShlbGVt ZW50KSk7Ci0gICAgICAgIHBsYXllci0+bV9pc1ZpZGVvRGVjb2RlclZpZGVvNExpbnV4ID0gZ19z dHJfaGFzX3ByZWZpeChlbGVtZW50TmFtZS5nZXQoKSwgInY0bDIiKTsKKyAgICAgICAgaWYgKGdf c3RyX2hhc19wcmVmaXgoZWxlbWVudE5hbWUuZ2V0KCksICJ2NGwyIikpCisgICAgICAgICAgICBw bGF5ZXItPm1fdmlkZW9EZWNvZGVyUGxhdGZvcm0gPSBXZWJLaXRHc3RWaWRlb0RlY29kZXJQbGF0 Zm9ybTo6VmlkZW80TGludXg7CisgICAgICAgIGVsc2UgaWYgKGdfc3RyX2hhc19wcmVmaXgoZWxl bWVudE5hbWUuZ2V0KCksICJpbXh2cHVkZWNvZGVyIikpCisgICAgICAgICAgICBwbGF5ZXItPm1f dmlkZW9EZWNvZGVyUGxhdGZvcm0gPSBXZWJLaXRHc3RWaWRlb0RlY29kZXJQbGF0Zm9ybTo6SW14 VlBVOworCisgICAgICAgIHBsYXllci0+dXBkYXRlVGV4dHVyZU1hcHBlckZsYWdzKCk7CiAgICAg fSksIHRoaXMpOwogCiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKG1fcGlwZWxpbmUuZ2V0 KCksICJzb3VyY2Utc2V0dXAiLCBHX0NBTExCQUNLKHNvdXJjZVNldHVwQ2FsbGJhY2spLCB0aGlz KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNl LmNwcAppbmRleCA1Nzk1ZTk2ODFmZWI2NGFjZmYzNzMzNTI1MGNmNzAzMjY0MTlmMjA5Li45ZjY5 YjAxMGY5ODNiNjhlZDhkZDY1ZWI1ZjE5MDMyYWQ3YzIzODIwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyQmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCkBAIC0xMTksNyArMTE5 LDYgQEAKICNpbmNsdWRlICJCaXRtYXBUZXh0dXJlUG9vbC5oIgogI2luY2x1ZGUgIkdyYXBoaWNz Q29udGV4dDNELmgiCiAjaW5jbHVkZSAiVGV4dHVyZU1hcHBlckNvbnRleHRBdHRyaWJ1dGVzLmgi Ci0jaW5jbHVkZSAiVGV4dHVyZU1hcHBlckdMLmgiCiAjaW5jbHVkZSAiVGV4dHVyZU1hcHBlclBs YXRmb3JtTGF5ZXJCdWZmZXIuaCIKICNpbmNsdWRlICJUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXll clByb3h5LmgiCiAjaWYgVVNFKENBSVJPKSAmJiBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFT KQpAQCAtMTQ5LDI2ICsxNDgsNiBAQCBzdGF0aWMgaW50IGdyZWF0ZXN0Q29tbW9uRGl2aXNvcihp bnQgYSwgaW50IGIpCiAgICAgcmV0dXJuIEFCUyhhKTsKIH0KIAotI2lmIFVTRShURVhUVVJFX01B UFBFUl9HTCkKLXN0YXRpYyBpbmxpbmUgVGV4dHVyZU1hcHBlckdMOjpGbGFncyB0ZXhNYXBGbGFn RnJvbU9yaWVudGF0aW9uKGNvbnN0IEltYWdlT3JpZW50YXRpb24mIG9yaWVudGF0aW9uKQotewot ICAgIHN3aXRjaCAob3JpZW50YXRpb24pIHsKLSAgICBjYXNlIERlZmF1bHRJbWFnZU9yaWVudGF0 aW9uOgotICAgICAgICByZXR1cm4gMDsKLSAgICBjYXNlIE9yaWdpblJpZ2h0VG9wOgotICAgICAg ICByZXR1cm4gVGV4dHVyZU1hcHBlckdMOjpTaG91bGRSb3RhdGVUZXh0dXJlOTA7Ci0gICAgY2Fz ZSBPcmlnaW5Cb3R0b21SaWdodDoKLSAgICAgICAgcmV0dXJuIFRleHR1cmVNYXBwZXJHTDo6U2hv dWxkUm90YXRlVGV4dHVyZTE4MDsKLSAgICBjYXNlIE9yaWdpbkxlZnRCb3R0b206Ci0gICAgICAg IHJldHVybiBUZXh0dXJlTWFwcGVyR0w6OlNob3VsZFJvdGF0ZVRleHR1cmUyNzA7Ci0gICAgZGVm YXVsdDoKLSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgfQotCi0gICAgcmV0dXJu IDA7Ci19Ci0jZW5kaWYKLQogI2lmIFVTRShURVhUVVJFX01BUFBFUl9HTCkKIGNsYXNzIEdzdFZp ZGVvRnJhbWVIb2xkZXIgOiBwdWJsaWMgVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXJCdWZmZXI6 OlVubWFuYWdlZEJ1ZmZlckRhdGFIb2xkZXIgewogcHVibGljOgpAQCAtMTg1LDcgKzE2NCw3IEBA IHB1YmxpYzoKICAgICAgICAgICAgIHJldHVybjsKIAogI2lmIFVTRShHU1RSRUFNRVJfR0wpCi0g ICAgICAgIG1fZmxhZ3MgPSBmbGFncyB8IChtX2hhc0FscGhhQ2hhbm5lbCA/IFRleHR1cmVNYXBw ZXJHTDo6U2hvdWxkQmxlbmQgOiAwKSB8IFRFWFRVUkVfTUFQUEVSX0NPTE9SX0NPTlZFUlRfRkxB RzsKKyAgICAgICAgbV9mbGFncyA9IGZsYWdzIHwgKG1faGFzQWxwaGFDaGFubmVsID8gVGV4dHVy ZU1hcHBlckdMOjpTaG91bGRCbGVuZCA6IDApOwogCiAgICAgICAgIGlmIChnc3RHTEVuYWJsZWQp IHsKICAgICAgICAgICAgIG1faXNNYXBwZWQgPSBnc3RfdmlkZW9fZnJhbWVfbWFwKCZtX3ZpZGVv RnJhbWUsICZ2aWRlb0luZm8sIG1fYnVmZmVyLCBzdGF0aWNfY2FzdDxHc3RNYXBGbGFncz4oR1NU X01BUF9SRUFEIHwgR1NUX01BUF9HTCkpOwpAQCAtMjc0LDcgKzI1Myw3IEBAIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lckJhc2U6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UoTWVk aWFQbGF5ZXIqIHBsCiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjp+TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyQmFzZSgpCiB7CiAjaWYgVVNFKEdTVFJFQU1FUl9HTCkKLSAgICBp ZiAobV9pc1ZpZGVvRGVjb2RlclZpZGVvNExpbnV4KQorICAgIGlmIChtX3ZpZGVvRGVjb2RlclBs YXRmb3JtID09IFdlYktpdEdzdFZpZGVvRGVjb2RlclBsYXRmb3JtOjpWaWRlbzRMaW51eCkKICAg ICAgICAgZmx1c2hDdXJyZW50QnVmZmVyKCk7CiAjZW5kaWYKICNpZiBVU0UoVEVYVFVSRV9NQVBQ RVJfR0wpICYmIFVTRShOSUNPU0lBKQpAQCAtNzMzLDcgKzcxMiw3IEBAIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6cHVzaFRleHR1cmVUb0NvbXBvc2l0b3IoKQogICAgICAg ICAgICAgaWYgKCFwcm94eS5pc0FjdGl2ZSgpKQogICAgICAgICAgICAgICAgIHJldHVybjsKIAot ICAgICAgICAgICAgc3RkOjp1bmlxdWVfcHRyPEdzdFZpZGVvRnJhbWVIb2xkZXI+IGZyYW1lSG9s ZGVyID0gc3RkOjptYWtlX3VuaXF1ZTxHc3RWaWRlb0ZyYW1lSG9sZGVyPihtX3NhbXBsZS5nZXQo KSwgdGV4TWFwRmxhZ0Zyb21PcmllbnRhdGlvbihtX3ZpZGVvU291cmNlT3JpZW50YXRpb24pLCAh bV91c2luZ0ZhbGxiYWNrVmlkZW9TaW5rKTsKKyAgICAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxH c3RWaWRlb0ZyYW1lSG9sZGVyPiBmcmFtZUhvbGRlciA9IHN0ZDo6bWFrZV91bmlxdWU8R3N0Vmlk ZW9GcmFtZUhvbGRlcj4obV9zYW1wbGUuZ2V0KCksIG1fdGV4dHVyZU1hcHBlckZsYWdzLCAhbV91 c2luZ0ZhbGxiYWNrVmlkZW9TaW5rKTsKIAogICAgICAgICAgICAgR0x1aW50IHRleHR1cmVJRCA9 IGZyYW1lSG9sZGVyLT50ZXh0dXJlSUQoKTsKICAgICAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxU ZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllckJ1ZmZlcj4gbGF5ZXJCdWZmZXI7CkBAIC03NDgsNyAr NzI3LDcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpwdXNoVGV4dHVy ZVRvQ29tcG9zaXRvcigpCiAgICAgICAgICAgICAgICAgICAgIGxheWVyQnVmZmVyID0gc3RkOjpt YWtlX3VuaXF1ZTxUZXh0dXJlTWFwcGVyUGxhdGZvcm1MYXllckJ1ZmZlcj4oV1RGTW92ZSh0ZXh0 dXJlKSk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGZyYW1lSG9sZGVyLT51 cGRhdGVUZXh0dXJlKGxheWVyQnVmZmVyLT50ZXh0dXJlR0woKSk7Ci0gICAgICAgICAgICAgICAg bGF5ZXJCdWZmZXItPnNldEV4dHJhRmxhZ3ModGV4TWFwRmxhZ0Zyb21PcmllbnRhdGlvbihtX3Zp ZGVvU291cmNlT3JpZW50YXRpb24pIHwgKGZyYW1lSG9sZGVyLT5oYXNBbHBoYUNoYW5uZWwoKSA/ IFRleHR1cmVNYXBwZXJHTDo6U2hvdWxkQmxlbmQgOiAwKSk7CisgICAgICAgICAgICAgICAgbGF5 ZXJCdWZmZXItPnNldEV4dHJhRmxhZ3MobV90ZXh0dXJlTWFwcGVyRmxhZ3MgfCAoZnJhbWVIb2xk ZXItPmhhc0FscGhhQ2hhbm5lbCgpID8gVGV4dHVyZU1hcHBlckdMOjpTaG91bGRCbGVuZCA6IDAp KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHByb3h5LnB1c2hOZXh0QnVmZmVyKFdURk1v dmUobGF5ZXJCdWZmZXIpKTsKICAgICAgICAgfTsKQEAgLTg3NCw4ICs4NTMsOSBAQCB2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmZsdXNoQ3VycmVudEJ1ZmZlcigpCiAgICAg ICAgICAgICBnc3Rfc2FtcGxlX2dldF9zZWdtZW50KG1fc2FtcGxlLmdldCgpKSwgaW5mbyA/IGdz dF9zdHJ1Y3R1cmVfY29weShpbmZvKSA6IG51bGxwdHIpKTsKICAgICB9CiAKKyAgICBib29sIHNo b3VsZFdhaXQgPSBtX3ZpZGVvRGVjb2RlclBsYXRmb3JtID09IFdlYktpdEdzdFZpZGVvRGVjb2Rl clBsYXRmb3JtOjpWaWRlbzRMaW51eDsKICAgICBhdXRvIHByb3h5T3BlcmF0aW9uID0KLSAgICAg ICAgW3Nob3VsZFdhaXQgPSBtX2lzVmlkZW9EZWNvZGVyVmlkZW80TGludXgsIHBpcGVsaW5lID0g cGlwZWxpbmUoKV0oVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXJQcm94eSYgcHJveHkpCisgICAg ICAgIFtzaG91bGRXYWl0LCBwaXBlbGluZSA9IHBpcGVsaW5lKCldKFRleHR1cmVNYXBwZXJQbGF0 Zm9ybUxheWVyUHJveHkmIHByb3h5KQogICAgICAgICB7CiAgICAgICAgICAgICBHU1RfREVCVUdf T0JKRUNUKHBpcGVsaW5lLCAiRmx1c2hpbmcgdmlkZW8gc2FtcGxlICVzIiwgc2hvdWxkV2FpdCA/ ICJzeW5jaHJvbm91c2x5IiA6ICIiKTsKICAgICAgICAgICAgIExvY2tIb2xkZXIgbG9ja2VyKCFz aG91bGRXYWl0ID8gJnByb3h5LmxvY2soKSA6IG51bGxwdHIpOwpAQCAtOTM2LDcgKzkxNiw3IEBA IGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6Y29weVZpZGVvVGV4dHVyZVRv UGxhdGZvcm1UZXh0dXJlKEdyYXBoaWNzCiAgICAgaWYgKCFHU1RfSVNfU0FNUExFKG1fc2FtcGxl LmdldCgpKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgc3RkOjp1bmlxdWVfcHRyPEdz dFZpZGVvRnJhbWVIb2xkZXI+IGZyYW1lSG9sZGVyID0gc3RkOjptYWtlX3VuaXF1ZTxHc3RWaWRl b0ZyYW1lSG9sZGVyPihtX3NhbXBsZS5nZXQoKSwgdGV4TWFwRmxhZ0Zyb21PcmllbnRhdGlvbiht X3ZpZGVvU291cmNlT3JpZW50YXRpb24pLCB0cnVlKTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8R3N0 VmlkZW9GcmFtZUhvbGRlcj4gZnJhbWVIb2xkZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPEdzdFZpZGVv RnJhbWVIb2xkZXI+KG1fc2FtcGxlLmdldCgpLCBtX3RleHR1cmVNYXBwZXJGbGFncywgdHJ1ZSk7 CiAKICAgICBhdXRvIHRleHR1cmVJRCA9IGZyYW1lSG9sZGVyLT50ZXh0dXJlSUQoKTsKICAgICBp ZiAoIXRleHR1cmVJRCkKQEAgLTk2Myw3ICs5NDMsNyBAQCBOYXRpdmVJbWFnZVB0ciBNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlOjpuYXRpdmVJbWFnZUZvckN1cnJlbnRUaW1lKCkKICAg ICBpZiAoIUdTVF9JU19TQU1QTEUobV9zYW1wbGUuZ2V0KCkpKQogICAgICAgICByZXR1cm4gbnVs bHB0cjsKIAotICAgIHN0ZDo6dW5pcXVlX3B0cjxHc3RWaWRlb0ZyYW1lSG9sZGVyPiBmcmFtZUhv bGRlciA9IHN0ZDo6bWFrZV91bmlxdWU8R3N0VmlkZW9GcmFtZUhvbGRlcj4obV9zYW1wbGUuZ2V0 KCksIHRleE1hcEZsYWdGcm9tT3JpZW50YXRpb24obV92aWRlb1NvdXJjZU9yaWVudGF0aW9uKSwg dHJ1ZSk7CisgICAgc3RkOjp1bmlxdWVfcHRyPEdzdFZpZGVvRnJhbWVIb2xkZXI+IGZyYW1lSG9s ZGVyID0gc3RkOjptYWtlX3VuaXF1ZTxHc3RWaWRlb0ZyYW1lSG9sZGVyPihtX3NhbXBsZS5nZXQo KSwgbV90ZXh0dXJlTWFwcGVyRmxhZ3MsIHRydWUpOwogCiAgICAgYXV0byB0ZXh0dXJlSUQgPSBm cmFtZUhvbGRlci0+dGV4dHVyZUlEKCk7CiAgICAgaWYgKCF0ZXh0dXJlSUQpCkBAIC05OTUsNyAr OTc1LDQwIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZTo6c2V0VmlkZW9T b3VyY2VPcmllbnRhdGlvbihjb25zdCBJbWFnZU9yaWVuCiAgICAgICAgIHJldHVybjsKIAogICAg IG1fdmlkZW9Tb3VyY2VPcmllbnRhdGlvbiA9IG9yaWVudGF0aW9uOworI2lmIFVTRShURVhUVVJF X01BUFBFUl9HTCkKKyAgICB1cGRhdGVUZXh0dXJlTWFwcGVyRmxhZ3MoKTsKKyNlbmRpZgorfQor CisjaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQordm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJCYXNlOjp1cGRhdGVUZXh0dXJlTWFwcGVyRmxhZ3MoKQoreworICAgIHN3aXRjaCAobV92 aWRlb1NvdXJjZU9yaWVudGF0aW9uKSB7CisgICAgY2FzZSBEZWZhdWx0SW1hZ2VPcmllbnRhdGlv bjoKKyAgICAgICAgbV90ZXh0dXJlTWFwcGVyRmxhZ3MgPSAwOworICAgICAgICBicmVhazsKKyAg ICBjYXNlIE9yaWdpblJpZ2h0VG9wOgorICAgICAgICBtX3RleHR1cmVNYXBwZXJGbGFncyA9IFRl eHR1cmVNYXBwZXJHTDo6U2hvdWxkUm90YXRlVGV4dHVyZTkwOworICAgICAgICBicmVhazsKKyAg ICBjYXNlIE9yaWdpbkJvdHRvbVJpZ2h0OgorICAgICAgICBtX3RleHR1cmVNYXBwZXJGbGFncyA9 IFRleHR1cmVNYXBwZXJHTDo6U2hvdWxkUm90YXRlVGV4dHVyZTE4MDsKKyAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBPcmlnaW5MZWZ0Qm90dG9tOgorICAgICAgICBtX3RleHR1cmVNYXBwZXJGbGFn cyA9IFRleHR1cmVNYXBwZXJHTDo6U2hvdWxkUm90YXRlVGV4dHVyZTI3MDsKKyAgICAgICAgYnJl YWs7CisgICAgZGVmYXVsdDoKKyAgICAgICAgLy8gRklYTUU6IEhhbmRsZSBPcmlnaW5Ub3BSaWdo dCwgT3JpZ2luQm90dG9tTGVmdCwgT3JpZ2luTGVmdFRvcCBhbmQgT3JpZ2luUmlnaHRCb3R0b20/ CisgICAgICAgIG1fdGV4dHVyZU1hcHBlckZsYWdzID0gMDsKKyAgICAgICAgYnJlYWs7CisgICAg fQorCisgICAgLy8gV2hlbiB0aGUgaW14dnB1ZGVjb2RlciBpcyB1c2VkLCB0aGUgdGV4dHVyZSBz YW1wbGluZyBvZiB0aGUKKyAgICAvLyBkaXJlY3R2aXYtdXBsb2FkZWQgdGV4dXJlIHJldHVybnMg YW4gUkdCIHZhbHVlLCBzbyB0aGVyZSdzIG5vIG5lZWQgdG8KKyAgICAvLyBjb252ZXJ0IGl0Lgor ICAgIGlmIChtX3ZpZGVvRGVjb2RlclBsYXRmb3JtICE9IFdlYktpdEdzdFZpZGVvRGVjb2RlclBs YXRmb3JtOjpJbXhWUFUpCisgICAgICAgIG1fdGV4dHVyZU1hcHBlckZsYWdzIHw9IFRFWFRVUkVf TUFQUEVSX0NPTE9SX0NPTlZFUlRfRkxBRzsKIH0KKyNlbmRpZgogCiBib29sIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lckJhc2U6OnN1cHBvcnRzRnVsbHNjcmVlbigpIGNvbnN0CiB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuaAppbmRleCA2 ODZhMThiYjNkZmJlNDgwNmVlZWNjNmU0ZjkwYzRjNjllZTJiYzFlLi4xNmVhN2I3MzUzNWQzZmZk NzJmYWM3Y2IzYjQzNTg5MmM4ZmNlYzhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlLmgKQEAgLTM4LDYgKzM4LDcgQEAKICNpbmNsdWRlIDx3 dGYvV2Vha1B0ci5oPgogCiAjaWYgVVNFKFRFWFRVUkVfTUFQUEVSX0dMKQorI2luY2x1ZGUgIlRl eHR1cmVNYXBwZXJHTC5oIgogI2lmIFVTRShOSUNPU0lBKQogI2luY2x1ZGUgIk5pY29zaWFDb250 ZW50TGF5ZXJUZXh0dXJlTWFwcGVySW1wbC5oIgogI2Vsc2UKQEAgLTIyMSw2ICsyMjIsMTEgQEAg cHJvdGVjdGVkOgogICAgIHN0YXRpYyB2b2lkIHZvbHVtZUNoYW5nZWRDYWxsYmFjayhNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXJCYXNlKik7CiAgICAgc3RhdGljIHZvaWQgbXV0ZUNoYW5nZWRD YWxsYmFjayhNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJCYXNlKik7CiAKKyNpZiBVU0UoVEVY VFVSRV9NQVBQRVJfR0wpCisgICAgdm9pZCB1cGRhdGVUZXh0dXJlTWFwcGVyRmxhZ3MoKTsKKyAg ICBUZXh0dXJlTWFwcGVyR0w6OkZsYWdzIG1fdGV4dHVyZU1hcHBlckZsYWdzOworI2VuZGlmCisK ICAgICBlbnVtIE1haW5UaHJlYWROb3RpZmljYXRpb24gewogICAgICAgICBWaWRlb0NoYW5nZWQg PSAxIDw8IDAsCiAgICAgICAgIFZpZGVvQ2Fwc0NoYW5nZWQgPSAxIDw8IDEsCkBAIC0yODMsNyAr Mjg5LDkgQEAgcHJvdGVjdGVkOgogICAgIGJvb2wgbV93YWl0aW5nRm9yS2V5IHsgZmFsc2UgfTsK ICNlbmRpZgogCi0gICAgbXV0YWJsZSBib29sIG1faXNWaWRlb0RlY29kZXJWaWRlbzRMaW51eCB7 IGZhbHNlIH07CisgICAgZW51bSBjbGFzcyBXZWJLaXRHc3RWaWRlb0RlY29kZXJQbGF0Zm9ybSB7 IElteFZQVSwgVmlkZW80TGludXggfTsKKworICAgIG11dGFibGUgV2ViS2l0R3N0VmlkZW9EZWNv ZGVyUGxhdGZvcm0gbV92aWRlb0RlY29kZXJQbGF0Zm9ybTsKIH07CiAKIH0K