190045 2018-09-27 10:51:17 -0700 [GStreamer][MSE] Use GObject for GST_TRACE_OBJECT 2018-09-29 02:43:10 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aboya aboya bugs-noreply commit-queue pnormand tsaunier oldest_to_newest 1464052 0 aboya 2018-09-27 10:51:17 -0700 Passing a non-GObject object to GST_TRACE_OBJECT() can be theoretically misunderstood by the GStreamer logging function, so this patch avoids that. 1464056 1 350977 aboya 2018-09-27 10:53:00 -0700 Created attachment 350977 Patch 1464060 2 350977 tsaunier 2018-09-27 11:06:30 -0700 Comment on attachment 350977 Patch Should you also give the pipeline a proper name? 1464072 3 aboya 2018-09-27 11:25:30 -0700 (In reply to Thibault Saunier from comment #2) > Comment on attachment 350977 [details] > Patch > > Should you also give the pipeline a proper name? Any suggestion for a useful name? 1464346 4 pnormand 2018-09-28 01:29:45 -0700 mse-append-pipeline-n where n is a monotically increasing number? 1464353 5 aboya 2018-09-28 04:00:05 -0700 (In reply to Philippe Normand from comment #4) > mse-append-pipeline-n where n is a monotically increasing number? I've chosen to use "append-pipeline-<type>-<container>-<number>", e.g.: append-pipeline-audio-mp4-0; as it's usually useful to know which pipeline handles what thing. 1464354 6 351067 aboya 2018-09-28 04:01:16 -0700 Created attachment 351067 Patch 1464357 7 351067 tsaunier 2018-09-28 05:09:27 -0700 Comment on attachment 351067 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351067&action=review lgtm otherwise. > Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp:144 > + m_sourceBufferPrivate->type().containerType().replace("/", "-").utf8().data(), appendPipelineCount++); Increment should probably be atomic. 1464365 8 351067 aboya 2018-09-28 06:25:16 -0700 Comment on attachment 351067 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=351067&action=review >> Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp:144 >> + m_sourceBufferPrivate->type().containerType().replace("/", "-").utf8().data(), appendPipelineCount++); > > Increment should probably be atomic. AppendPipeline can only be constructed in the main thread. There is even an assertion for that. No need for atomics here. 1464366 9 tsaunier 2018-09-28 06:27:33 -0700 (In reply to Alicia Boya García from comment #8) > Comment on attachment 351067 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=351067&action=review > > >> Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp:144 > >> + m_sourceBufferPrivate->type().containerType().replace("/", "-").utf8().data(), appendPipelineCount++); > > > > Increment should probably be atomic. > > AppendPipeline can only be constructed in the main thread. There is even an > assertion for that. No need for atomics here. OK, informal r+ here then. 1464731 10 351067 commit-queue 2018-09-29 02:43:08 -0700 Comment on attachment 351067 Patch Clearing flags on attachment: 351067 Committed r236640: <https://trac.webkit.org/changeset/236640> 1464732 11 commit-queue 2018-09-29 02:43:10 -0700 All reviewed patches have been landed. Closing bug. 350977 2018-09-27 10:53:00 -0700 2018-09-28 04:01:12 -0700 Patch bug-190045-20180927195259.patch text/plain 3890 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2NTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmJlMzg2NmY4NGNiYzRj ZGRlM2FmMjVjM2ViMDQ0N2Q4NTkyNWUyZi4uMjY1YzdhYjQ4NmQxNWNmNzBiNGVhMzczMjM3ZjE3 NWE1ODIxNzU0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA5LTI3ICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XVtNU0VdIFVzZSBHT2JqZWN0IGZvciBHU1RfVFJBQ0VfT0JKRUNUCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTAwNDUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXNzaW5nIGEgbm9uLUdPYmplY3Qgb2Jq ZWN0IHRvIEdTVF9UUkFDRV9PQkpFQ1QoKSBjYW4gYmUKKyAgICAgICAgdGhlb3JldGljYWxseSBt aXN1bmRlcnN0b29kIGJ5IHRoZSBHU3RyZWFtZXIgbG9nZ2luZyBmdW5jdGlvbiwgc28gdGhpcwor ICAgICAgICBwYXRjaCBhdm9pZHMgdGhhdC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9tc2UvQXBwZW5kUGlwZWxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBw ZW5kUGlwZWxpbmU6OmFwcHNyY0VuZE9mQXBwZW5kQ2hlY2tlclByb2JlKToKKyAgICAgICAgKFdl YkNvcmU6OkFwcGVuZFBpcGVsaW5lOjpoYW5kbGVFbmRPZkFwcGVuZCk6CisgICAgICAgIChXZWJD b3JlOjpBcHBlbmRQaXBlbGluZTo6Y29uc3VtZUFwcHNpbmtBdmFpbGFibGVTYW1wbGVzKToKKyAg ICAgICAgKFdlYkNvcmU6OkFwcGVuZFBpcGVsaW5lOjpwdXNoTmV3QnVmZmVyKToKKwogMjAxOC0w OS0yNyAgQWxpY2lhIEJveWEgR2FyY8OtYSAgPGFib3lhQGlnYWxpYS5jb20+CiAKICAgICAgICAg W01TRV0gRml4IHVud2FudGVkIHNhbXBsZSBlcmFzZSBmcm9tIHRoZSBkZWNvZGUgcXVldWUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2Uv QXBwZW5kUGlwZWxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL21zZS9BcHBlbmRQaXBlbGluZS5jcHAKaW5kZXggZWZlZjdjM2JiMjA1MmZmODQ3NmQ1 MDMzMTVjNDZkZmJkOGU1NzNiZS4uMmMxOTk2NmFmODdhYTZiNzRhYTIwZTY4NjAzYzczYjAyZjJj Yzk4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL21zZS9BcHBlbmRQaXBlbGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9BcHBlbmRQaXBlbGluZS5jcHAKQEAgLTI3OCw3ICsyNzgs NyBAQCBHc3RQYWRQcm9iZVJldHVybiBBcHBlbmRQaXBlbGluZTo6YXBwc3JjRW5kT2ZBcHBlbmRD aGVja2VyUHJvYmUoR3N0UGFkUHJvYmVJbmZvKgogICAgICAgICByZXR1cm4gR1NUX1BBRF9QUk9C RV9PSzsKICAgICB9CiAKLSAgICBHU1RfVFJBQ0VfT0JKRUNUKHRoaXMsICJwb3N0aW5nIGVuZC1v Zi1hcHBlbmQgcmVxdWVzdCB0byBidXMiKTsKKyAgICBHU1RfVFJBQ0VfT0JKRUNUKG1fcGlwZWxp bmUuZ2V0KCksICJwb3N0aW5nIGVuZC1vZi1hcHBlbmQgcmVxdWVzdCB0byBidXMiKTsKICAgICBH c3RTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGdzdF9zdHJ1Y3R1cmVfbmV3X2VtcHR5KCJlbmQtb2Yt YXBwZW5kIik7CiAgICAgR3N0TWVzc2FnZSogbWVzc2FnZSA9IGdzdF9tZXNzYWdlX25ld19hcHBs aWNhdGlvbihHU1RfT0JKRUNUKG1fYXBwc3JjLmdldCgpKSwgc3RydWN0dXJlKTsKICAgICBnc3Rf YnVzX3Bvc3QobV9idXMuZ2V0KCksIG1lc3NhZ2UpOwpAQCAtNjE0LDcgKzYxNCw3IEBAIHZvaWQg QXBwZW5kUGlwZWxpbmU6OmFwcHNpbmtDYXBzQ2hhbmdlZCgpCiB2b2lkIEFwcGVuZFBpcGVsaW5l OjpoYW5kbGVFbmRPZkFwcGVuZCgpCiB7CiAgICAgQVNTRVJUKFdURjo6aXNNYWluVGhyZWFkKCkp OwotICAgIEdTVF9UUkFDRV9PQkpFQ1QodGhpcywgInJlY2VpdmVkIGVuZC1vZi1hcHBlbmQiKTsK KyAgICBHU1RfVFJBQ0VfT0JKRUNUKG1fcGlwZWxpbmUuZ2V0KCksICJyZWNlaXZlZCBlbmQtb2Yt YXBwZW5kIik7CiAKICAgICAvLyBSZWdhcmRsZXNzIG9mIHRoZSBzdGF0ZSB0cmFuc2l0aW9uLCB0 aGUgcmVzdWx0IGlzIHRoZSBzYW1lOiBkaWRSZWNlaXZlQWxsUGVuZGluZ1NhbXBsZXMoKSBpcyBj YWxsZWQuCiAgICAgc3dpdGNoIChtX2FwcGVuZFN0YXRlKSB7CkBAIC03NDIsNyArNzQyLDcgQEAg dm9pZCBBcHBlbmRQaXBlbGluZTo6Y29uc3VtZUFwcHNpbmtBdmFpbGFibGVTYW1wbGVzKCkKICAg ICAgICAgYmF0Y2hlZFNhbXBsZUNvdW50Kys7CiAgICAgfQogCi0gICAgR1NUX1RSQUNFX09CSkVD VCh0aGlzLCAiYmF0Y2hlZFNhbXBsZUNvdW50ID0gJWQiLCBiYXRjaGVkU2FtcGxlQ291bnQpOwor ICAgIEdTVF9UUkFDRV9PQkpFQ1QobV9waXBlbGluZS5nZXQoKSwgImJhdGNoZWRTYW1wbGVDb3Vu dCA9ICVkIiwgYmF0Y2hlZFNhbXBsZUNvdW50KTsKIH0KIAogdm9pZCBBcHBlbmRQaXBlbGluZTo6 cmVzZXRQaXBlbGluZSgpCkBAIC03OTAsNyArNzkwLDcgQEAgR3N0Rmxvd1JldHVybiBBcHBlbmRQ aXBlbGluZTo6cHVzaE5ld0J1ZmZlcihHc3RCdWZmZXIqIGJ1ZmZlcikKIAogICAgIHNldEFwcGVu ZFN0YXRlKEFwcGVuZFBpcGVsaW5lOjpBcHBlbmRTdGF0ZTo6T25nb2luZyk7CiAKLSAgICBHU1Rf VFJBQ0VfT0JKRUNUKHRoaXMsICJwdXNoaW5nIGRhdGEgYnVmZmVyICUiIEdTVF9QVFJfRk9STUFU LCBidWZmZXIpOworICAgIEdTVF9UUkFDRV9PQkpFQ1QobV9waXBlbGluZS5nZXQoKSwgInB1c2hp bmcgZGF0YSBidWZmZXIgJSIgR1NUX1BUUl9GT1JNQVQsIGJ1ZmZlcik7CiAgICAgR3N0Rmxvd1Jl dHVybiBwdXNoRGF0YUJ1ZmZlclJldCA9IGdzdF9hcHBfc3JjX3B1c2hfYnVmZmVyKEdTVF9BUFBf U1JDKG1fYXBwc3JjLmdldCgpKSwgYnVmZmVyKTsKICAgICAvLyBQdXNoaW5nIGJ1ZmZlcnMgdG8g YXBwc3JjIGNhbiBvbmx5IGZhaWwgaWYgdGhlIGFwcHNyYyBpcyBmbHVzaGluZywgaW4gRU9TIG9y IHN0b3BwZWQuIE5laXRoZXIgb2YgdGhlc2Ugc2hvdWxkCiAgICAgLy8gYmUgdHJ1ZSBhdCB0aGlz IHBvaW50LgpAQCAtODA4LDcgKzgwOCw3IEBAIEdzdEZsb3dSZXR1cm4gQXBwZW5kUGlwZWxpbmU6 OnB1c2hOZXdCdWZmZXIoR3N0QnVmZmVyKiBidWZmZXIpCiAgICAgR3N0QnVmZmVyKiBlbmRPZkFw cGVuZEJ1ZmZlciA9IGdzdF9idWZmZXJfbmV3KCk7CiAgICAgZ3N0X2J1ZmZlcl9hZGRfbWV0YShl bmRPZkFwcGVuZEJ1ZmZlciwgc193ZWJLaXRFbmRPZkFwcGVuZE1ldGFJbmZvLCBudWxscHRyKTsK IAotICAgIEdTVF9UUkFDRV9PQkpFQ1QodGhpcywgInB1c2hpbmcgZW5kLW9mLWFwcGVuZCBidWZm ZXIgJSIgR1NUX1BUUl9GT1JNQVQsIGVuZE9mQXBwZW5kQnVmZmVyKTsKKyAgICBHU1RfVFJBQ0Vf T0JKRUNUKG1fcGlwZWxpbmUuZ2V0KCksICJwdXNoaW5nIGVuZC1vZi1hcHBlbmQgYnVmZmVyICUi IEdTVF9QVFJfRk9STUFULCBlbmRPZkFwcGVuZEJ1ZmZlcik7CiAgICAgR3N0Rmxvd1JldHVybiBw dXNoRW5kT2ZBcHBlbmRCdWZmZXJSZXQgPSBnc3RfYXBwX3NyY19wdXNoX2J1ZmZlcihHU1RfQVBQ X1NSQyhtX2FwcHNyYy5nZXQoKSksIGVuZE9mQXBwZW5kQnVmZmVyKTsKICAgICBnX3JldHVybl92 YWxfaWZfZmFpbChwdXNoRW5kT2ZBcHBlbmRCdWZmZXJSZXQgPT0gR1NUX0ZMT1dfT0ssIEdTVF9G TE9XX0VSUk9SKTsKIAo= 351067 2018-09-28 04:01:16 -0700 2018-09-29 02:43:08 -0700 Patch bug-190045-20180928130114.patch text/plain 4648 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2NTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWFjZTc5NTdjOWY3MmEy ZmNkYzE2ZmIzNjhjY2Y1MDgyNzk4N2U2Ny4uOWUxYTNmM2RhMDFiNWIyNzllY2I4NjFmNmEyMWVi NjMxNjFkZjgwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE4LTA5LTI3ICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XVtNU0VdIFVzZSBHT2JqZWN0IGZvciBHU1RfVFJBQ0VfT0JKRUNUCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTAwNDUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXNzaW5nIGEgbm9uLUdPYmplY3Qgb2Jq ZWN0IHRvIEdTVF9UUkFDRV9PQkpFQ1QoKSBjYW4gYmUKKyAgICAgICAgdGhlb3JldGljYWxseSBt aXN1bmRlcnN0b29kIGJ5IHRoZSBHU3RyZWFtZXIgbG9nZ2luZyBmdW5jdGlvbiwgc28gdGhpcwor ICAgICAgICBwYXRjaCBhdm9pZHMgdGhhdC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9tc2UvQXBwZW5kUGlwZWxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBw ZW5kUGlwZWxpbmU6OmFwcHNyY0VuZE9mQXBwZW5kQ2hlY2tlclByb2JlKToKKyAgICAgICAgKFdl YkNvcmU6OkFwcGVuZFBpcGVsaW5lOjpoYW5kbGVFbmRPZkFwcGVuZCk6CisgICAgICAgIChXZWJD b3JlOjpBcHBlbmRQaXBlbGluZTo6Y29uc3VtZUFwcHNpbmtBdmFpbGFibGVTYW1wbGVzKToKKyAg ICAgICAgKFdlYkNvcmU6OkFwcGVuZFBpcGVsaW5lOjpwdXNoTmV3QnVmZmVyKToKKwogMjAxOC0w OS0yNyAgQWxpY2lhIEJveWEgR2FyY8OtYSAgPGFib3lhQGlnYWxpYS5jb20+CiAKICAgICAgICAg W01TRV0gRml4IHVud2FudGVkIHNhbXBsZSBlcmFzZSBmcm9tIHRoZSBkZWNvZGUgcXVldWUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2Uv QXBwZW5kUGlwZWxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL21zZS9BcHBlbmRQaXBlbGluZS5jcHAKaW5kZXggZWZlZjdjM2JiMjA1MmZmODQ3NmQ1 MDMzMTVjNDZkZmJkOGU1NzNiZS4uMzY1ZGVlNTdhMjlmZWU3MjMzZjM2NzlkMDBlZTY3MjY3YWJk NDQ1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL21zZS9BcHBlbmRQaXBlbGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9BcHBlbmRQaXBlbGluZS5jcHAKQEAgLTEzOSw3ICsxMzks MTAgQEAgQXBwZW5kUGlwZWxpbmU6OkFwcGVuZFBpcGVsaW5lKFJlZjxNZWRpYVNvdXJjZUNsaWVu dEdTdHJlYW1lck1TRT4gbWVkaWFTb3VyY2VDbGkKIAogICAgIC8vIEZJWE1FOiBnaXZlIGEgbmFt ZSB0byB0aGUgcGlwZWxpbmUsIG1heWJlIHJlbGF0ZWQgd2l0aCB0aGUgdHJhY2sgaXQncyBtYW5h Z2luZy4KICAgICAvLyBUaGUgdHJhY2sgbmFtZSBpcyBzdGlsbCB1bmtub3duIGF0IHRoaXMgdGlt ZSwgdGhvdWdoLgotICAgIG1fcGlwZWxpbmUgPSBnc3RfcGlwZWxpbmVfbmV3KG51bGxwdHIpOwor ICAgIHN0YXRpYyBzaXplX3QgYXBwZW5kUGlwZWxpbmVDb3VudCA9IDA7CisgICAgU3RyaW5nIHBp cGVsaW5lTmFtZSA9IFN0cmluZzo6Zm9ybWF0KCJhcHBlbmQtcGlwZWxpbmUtJXMtJXp1IiwKKyAg ICAgICAgbV9zb3VyY2VCdWZmZXJQcml2YXRlLT50eXBlKCkuY29udGFpbmVyVHlwZSgpLnJlcGxh Y2UoIi8iLCAiLSIpLnV0ZjgoKS5kYXRhKCksIGFwcGVuZFBpcGVsaW5lQ291bnQrKyk7CisgICAg bV9waXBlbGluZSA9IGdzdF9waXBlbGluZV9uZXcocGlwZWxpbmVOYW1lLnV0ZjgoKS5kYXRhKCkp OwogCiAgICAgbV9idXMgPSBhZG9wdEdSZWYoZ3N0X3BpcGVsaW5lX2dldF9idXMoR1NUX1BJUEVM SU5FKG1fcGlwZWxpbmUuZ2V0KCkpKSk7CiAgICAgZ3N0X2J1c19hZGRfc2lnbmFsX3dhdGNoX2Z1 bGwobV9idXMuZ2V0KCksIFJ1bkxvb3BTb3VyY2VQcmlvcml0eTo6UnVuTG9vcERpc3BhdGNoZXIp OwpAQCAtMjc4LDcgKzI4MSw3IEBAIEdzdFBhZFByb2JlUmV0dXJuIEFwcGVuZFBpcGVsaW5lOjph cHBzcmNFbmRPZkFwcGVuZENoZWNrZXJQcm9iZShHc3RQYWRQcm9iZUluZm8qCiAgICAgICAgIHJl dHVybiBHU1RfUEFEX1BST0JFX09LOwogICAgIH0KIAotICAgIEdTVF9UUkFDRV9PQkpFQ1QodGhp cywgInBvc3RpbmcgZW5kLW9mLWFwcGVuZCByZXF1ZXN0IHRvIGJ1cyIpOworICAgIEdTVF9UUkFD RV9PQkpFQ1QobV9waXBlbGluZS5nZXQoKSwgInBvc3RpbmcgZW5kLW9mLWFwcGVuZCByZXF1ZXN0 IHRvIGJ1cyIpOwogICAgIEdzdFN0cnVjdHVyZSogc3RydWN0dXJlID0gZ3N0X3N0cnVjdHVyZV9u ZXdfZW1wdHkoImVuZC1vZi1hcHBlbmQiKTsKICAgICBHc3RNZXNzYWdlKiBtZXNzYWdlID0gZ3N0 X21lc3NhZ2VfbmV3X2FwcGxpY2F0aW9uKEdTVF9PQkpFQ1QobV9hcHBzcmMuZ2V0KCkpLCBzdHJ1 Y3R1cmUpOwogICAgIGdzdF9idXNfcG9zdChtX2J1cy5nZXQoKSwgbWVzc2FnZSk7CkBAIC02MTQs NyArNjE3LDcgQEAgdm9pZCBBcHBlbmRQaXBlbGluZTo6YXBwc2lua0NhcHNDaGFuZ2VkKCkKIHZv aWQgQXBwZW5kUGlwZWxpbmU6OmhhbmRsZUVuZE9mQXBwZW5kKCkKIHsKICAgICBBU1NFUlQoV1RG Ojppc01haW5UaHJlYWQoKSk7Ci0gICAgR1NUX1RSQUNFX09CSkVDVCh0aGlzLCAicmVjZWl2ZWQg ZW5kLW9mLWFwcGVuZCIpOworICAgIEdTVF9UUkFDRV9PQkpFQ1QobV9waXBlbGluZS5nZXQoKSwg InJlY2VpdmVkIGVuZC1vZi1hcHBlbmQiKTsKIAogICAgIC8vIFJlZ2FyZGxlc3Mgb2YgdGhlIHN0 YXRlIHRyYW5zaXRpb24sIHRoZSByZXN1bHQgaXMgdGhlIHNhbWU6IGRpZFJlY2VpdmVBbGxQZW5k aW5nU2FtcGxlcygpIGlzIGNhbGxlZC4KICAgICBzd2l0Y2ggKG1fYXBwZW5kU3RhdGUpIHsKQEAg LTc0Miw3ICs3NDUsNyBAQCB2b2lkIEFwcGVuZFBpcGVsaW5lOjpjb25zdW1lQXBwc2lua0F2YWls YWJsZVNhbXBsZXMoKQogICAgICAgICBiYXRjaGVkU2FtcGxlQ291bnQrKzsKICAgICB9CiAKLSAg ICBHU1RfVFJBQ0VfT0JKRUNUKHRoaXMsICJiYXRjaGVkU2FtcGxlQ291bnQgPSAlZCIsIGJhdGNo ZWRTYW1wbGVDb3VudCk7CisgICAgR1NUX1RSQUNFX09CSkVDVChtX3BpcGVsaW5lLmdldCgpLCAi YmF0Y2hlZFNhbXBsZUNvdW50ID0gJWQiLCBiYXRjaGVkU2FtcGxlQ291bnQpOwogfQogCiB2b2lk IEFwcGVuZFBpcGVsaW5lOjpyZXNldFBpcGVsaW5lKCkKQEAgLTc5MCw3ICs3OTMsNyBAQCBHc3RG bG93UmV0dXJuIEFwcGVuZFBpcGVsaW5lOjpwdXNoTmV3QnVmZmVyKEdzdEJ1ZmZlciogYnVmZmVy KQogCiAgICAgc2V0QXBwZW5kU3RhdGUoQXBwZW5kUGlwZWxpbmU6OkFwcGVuZFN0YXRlOjpPbmdv aW5nKTsKIAotICAgIEdTVF9UUkFDRV9PQkpFQ1QodGhpcywgInB1c2hpbmcgZGF0YSBidWZmZXIg JSIgR1NUX1BUUl9GT1JNQVQsIGJ1ZmZlcik7CisgICAgR1NUX1RSQUNFX09CSkVDVChtX3BpcGVs aW5lLmdldCgpLCAicHVzaGluZyBkYXRhIGJ1ZmZlciAlIiBHU1RfUFRSX0ZPUk1BVCwgYnVmZmVy KTsKICAgICBHc3RGbG93UmV0dXJuIHB1c2hEYXRhQnVmZmVyUmV0ID0gZ3N0X2FwcF9zcmNfcHVz aF9idWZmZXIoR1NUX0FQUF9TUkMobV9hcHBzcmMuZ2V0KCkpLCBidWZmZXIpOwogICAgIC8vIFB1 c2hpbmcgYnVmZmVycyB0byBhcHBzcmMgY2FuIG9ubHkgZmFpbCBpZiB0aGUgYXBwc3JjIGlzIGZs dXNoaW5nLCBpbiBFT1Mgb3Igc3RvcHBlZC4gTmVpdGhlciBvZiB0aGVzZSBzaG91bGQKICAgICAv LyBiZSB0cnVlIGF0IHRoaXMgcG9pbnQuCkBAIC04MDgsNyArODExLDcgQEAgR3N0Rmxvd1JldHVy biBBcHBlbmRQaXBlbGluZTo6cHVzaE5ld0J1ZmZlcihHc3RCdWZmZXIqIGJ1ZmZlcikKICAgICBH c3RCdWZmZXIqIGVuZE9mQXBwZW5kQnVmZmVyID0gZ3N0X2J1ZmZlcl9uZXcoKTsKICAgICBnc3Rf YnVmZmVyX2FkZF9tZXRhKGVuZE9mQXBwZW5kQnVmZmVyLCBzX3dlYktpdEVuZE9mQXBwZW5kTWV0 YUluZm8sIG51bGxwdHIpOwogCi0gICAgR1NUX1RSQUNFX09CSkVDVCh0aGlzLCAicHVzaGluZyBl bmQtb2YtYXBwZW5kIGJ1ZmZlciAlIiBHU1RfUFRSX0ZPUk1BVCwgZW5kT2ZBcHBlbmRCdWZmZXIp OworICAgIEdTVF9UUkFDRV9PQkpFQ1QobV9waXBlbGluZS5nZXQoKSwgInB1c2hpbmcgZW5kLW9m LWFwcGVuZCBidWZmZXIgJSIgR1NUX1BUUl9GT1JNQVQsIGVuZE9mQXBwZW5kQnVmZmVyKTsKICAg ICBHc3RGbG93UmV0dXJuIHB1c2hFbmRPZkFwcGVuZEJ1ZmZlclJldCA9IGdzdF9hcHBfc3JjX3B1 c2hfYnVmZmVyKEdTVF9BUFBfU1JDKG1fYXBwc3JjLmdldCgpKSwgZW5kT2ZBcHBlbmRCdWZmZXIp OwogICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKHB1c2hFbmRPZkFwcGVuZEJ1ZmZlclJldCA9PSBH U1RfRkxPV19PSywgR1NUX0ZMT1dfRVJST1IpOwogCg==