128957 2014-02-17 23:40:09 -0800 [GStreamer] the GstPlayFlags enum diverged from upstream 2014-02-19 02:19:53 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pnormand calvaris calvaris cgarcia commit-queue eric.carlson glenn gustavo jer.noble menard mrobinson philipj sergio vjaquez oldest_to_newest 981808 0 pnormand 2014-02-17 23:40:09 -0800 The GST_PLAY_FLAG_BUFFERING value is wrong now (how come?), the deinterlace and soft-colorbalance flags are missing. 981831 1 calvaris 2014-02-18 01:11:10 -0800 This is going to be fun to support. 981964 2 224521 calvaris 2014-02-18 09:34:58 -0800 Created attachment 224521 Patch 981965 3 224521 calvaris 2014-02-18 09:36:02 -0800 Comment on attachment 224521 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224521&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:170 > + GFlagsClass* flagsClass = static_cast<GFlagsClass*>(g_type_class_ref(g_type_from_name("GstPlayFlags"))); I was thinking of caching this by making it static. What do you think, Phil? 982256 4 224521 pnormand 2014-02-18 23:10:22 -0800 Comment on attachment 224521 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=224521&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:168 > +static unsigned getGstPlaysFlag(const char* nick) Perhaps this could be moved to GStreamerUtilities >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:170 >> + GFlagsClass* flagsClass = static_cast<GFlagsClass*>(g_type_class_ref(g_type_from_name("GstPlayFlags"))); > > I was thinking of caching this by making it static. What do you think, Phil? Ok but then no unref below I suppose :) 982280 5 224606 calvaris 2014-02-19 01:16:59 -0800 Created attachment 224606 Patch 982282 6 calvaris 2014-02-19 01:18:00 -0800 (In reply to comment #4) > > +static unsigned getGstPlaysFlag(const char* nick) > > Perhaps this could be moved to GStreamerUtilities Done. > >> + GFlagsClass* flagsClass = static_cast<GFlagsClass*>(g_type_class_ref(g_type_from_name("GstPlayFlags"))); > > > > I was thinking of caching this by making it static. What do you think, Phil? > > Ok but then no unref below I suppose :) Of course, done. 982299 7 224606 commit-queue 2014-02-19 02:19:50 -0800 Comment on attachment 224606 Patch Clearing flags on attachment: 224606 Committed r164362: <http://trac.webkit.org/changeset/164362> 982300 8 commit-queue 2014-02-19 02:19:53 -0800 All reviewed patches have been landed. Closing bug. 224521 2014-02-18 09:34:58 -0800 2014-02-19 01:16:53 -0800 Patch bug-128957-20140218183457.patch text/plain 4264 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0Mjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWYxNjFjMGRjMTA2ZTEy NDZkMzliZDM4NjRkZjJjNzgzMGZjNTNiNC4uZDZiNDgxNzM1NmMzMDhhNzZlN2FlOTZmNWVjNDdj MWJiNzE0NjNlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE0LTAyLTE4ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKKyAgICAgICAgW0dT dHJlYW1lcl0gdGhlIEdzdFBsYXlGbGFncyBlbnVtIGRpdmVyZ2VkIGZyb20gdXBzdHJlYW0KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODk1NworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZWQgdGhl IEdzdFBsYXlGbGFncyBmcm9tIHRoZSBHU3RyZWFtZXIgaW1wbGVtZW50YXRpb24gYW5kCisgICAg ICAgIHJlcGxhY2VkIGJ5IHRoZSB1c2Ugb2YgdGhlIEdGbGFncy4KKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Z2V0R3N0UGxheXNGbGFnKTogQ3JlYXRlZCB0byBnZXQgdGhlIGZs YWdzIGJ5IHVzaW5nIHRoZQorICAgICAgICBHRmxhZ3MgaW5mcmFzdHJ1Y3R1cmUuCisgICAgICAg IChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNldERvd25sb2FkQnVmZmVy aW5nKToKKyAgICAgICAgUmVwbGFjZWQgR1NUX1BMQVlfRkxBR19ET1dOTE9BRCB3aXRoIGdldEdz dFBsYXlzRmxhZy4KKworMjAxNC0wMi0xOCAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2 YXJpc0BpZ2FsaWEuY29tPgorCiAgICAgICAgIE1vdmUgaW5oZXJpdGluZyBtZXRob2QgdG8gdGhl IHN1cGVyY2xhc3MgaW4gdGhlIEphdmFTY3JpcHQgbWVkaWEgY29udHJvbHMKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODg5NwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IDdlOWM0OTc5ODRm ZDVmMzJiODk2OTNjYzAzNDlmOWQ5YTUxNTdlYjYuLmYwMGYxMDcyMTAyNGNkZTMwZGY5YzdjMTQw ZTJiYTk4NTI2ZWQ5MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuY3BwCkBAIC01NiwyMSArNTYsNiBAQAogI2luY2x1ZGUgIldlYktpdE1lZGlhU291 cmNlR1N0cmVhbWVyLmgiCiAjZW5kaWYKIAotLy8gR3N0UGxheUZsYWdzIGZsYWdzIGZyb20gcGxh eWJpbjIuIEl0IGlzIHRoZSBwb2xpY3kgb2YgR1N0cmVhbWVyIHRvCi0vLyBub3QgcHVibGljbHkg ZXhwb3NlIGVsZW1lbnQtc3BlY2lmaWMgZW51bXMuIFRoYXQncyB3aHkgdGhpcwotLy8gR3N0UGxh eUZsYWdzIGVudW0gaGFzIGJlZW4gY29waWVkIGhlcmUuCi10eXBlZGVmIGVudW0gewotICAgIEdT VF9QTEFZX0ZMQUdfVklERU8gICAgICAgICA9IDB4MDAwMDAwMDEsCi0gICAgR1NUX1BMQVlfRkxB R19BVURJTyAgICAgICAgID0gMHgwMDAwMDAwMiwKLSAgICBHU1RfUExBWV9GTEFHX1RFWFQgICAg ICAgICAgPSAweDAwMDAwMDA0LAotICAgIEdTVF9QTEFZX0ZMQUdfVklTICAgICAgICAgICA9IDB4 MDAwMDAwMDgsCi0gICAgR1NUX1BMQVlfRkxBR19TT0ZUX1ZPTFVNRSAgID0gMHgwMDAwMDAxMCwK LSAgICBHU1RfUExBWV9GTEFHX05BVElWRV9BVURJTyAgPSAweDAwMDAwMDIwLAotICAgIEdTVF9Q TEFZX0ZMQUdfTkFUSVZFX1ZJREVPICA9IDB4MDAwMDAwNDAsCi0gICAgR1NUX1BMQVlfRkxBR19E T1dOTE9BRCAgICAgID0gMHgwMDAwMDA4MCwKLSAgICBHU1RfUExBWV9GTEFHX0JVRkZFUklORyAg ICAgPSAweDAwMDAwMDEwMAotfSBHc3RQbGF5RmxhZ3M7Ci0KIC8vIE1heCBpbnRlcnZhbCBpbiBz ZWNvbmRzIHRvIHN0YXkgaW4gdGhlIFJFQURZIHN0YXRlIG9uIG1hbnVhbAogLy8gc3RhdGUgY2hh bmdlIHJlcXVlc3RzLgogc3RhdGljIGNvbnN0IGd1aW50IGdSZWFkeVN0YXRlVGltZXJJbnRlcnZh bCA9IDYwOwpAQCAtMTgwLDYgKzE2NSwyMCBAQCBzdGF0aWMgR3N0Q2xvY2tUaW1lIHRvR3N0Q2xv Y2tUaW1lKGZsb2F0IHRpbWUpCiAgICAgcmV0dXJuIEdTVF9USU1FVkFMX1RPX1RJTUUodGltZVZh bHVlKTsKIH0KIAorc3RhdGljIHVuc2lnbmVkIGdldEdzdFBsYXlzRmxhZyhjb25zdCBjaGFyKiBu aWNrKQoreworICAgIEdGbGFnc0NsYXNzKiBmbGFnc0NsYXNzID0gc3RhdGljX2Nhc3Q8R0ZsYWdz Q2xhc3MqPihnX3R5cGVfY2xhc3NfcmVmKGdfdHlwZV9mcm9tX25hbWUoIkdzdFBsYXlGbGFncyIp KSk7CisgICAgaWYgKCFmbGFnc0NsYXNzKQorICAgICAgICByZXR1cm4gMDsKKworICAgIEdGbGFn c1ZhbHVlKiBmbGFnID0gZ19mbGFnc19nZXRfdmFsdWVfYnlfbmljayhmbGFnc0NsYXNzLCBuaWNr KTsKKyAgICBnX3R5cGVfY2xhc3NfdW5yZWYoZmxhZ3NDbGFzcyk7CisgICAgaWYgKCFmbGFnKQor ICAgICAgICByZXR1cm4gMDsKKworICAgIHJldHVybiBmbGFnLT52YWx1ZTsKK30KKwogdm9pZCBN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNldEF1ZGlvU3RyZWFtUHJvcGVydGllcyhHT2Jq ZWN0KiBvYmplY3QpCiB7CiAgICAgaWYgKGdfc3RyY21wMChHX09CSkVDVF9UWVBFX05BTUUob2Jq ZWN0KSwgIkdzdFB1bHNlU2luayIpKQpAQCAtMTc4NCwyMSArMTc4MywyMyBAQCB2b2lkIE1lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0RG93bmxvYWRCdWZmZXJpbmcoKQogICAgIGlmICgh bV9wbGF5QmluKQogICAgICAgICByZXR1cm47CiAKLSAgICBHc3RQbGF5RmxhZ3MgZmxhZ3M7Cisg ICAgdW5zaWduZWQgZmxhZ3M7CiAgICAgZ19vYmplY3RfZ2V0KG1fcGxheUJpbi5nZXQoKSwgImZs YWdzIiwgJmZsYWdzLCBOVUxMKTsKIAorICAgIHVuc2lnbmVkIGZsYWdEb3dubG9hZCA9IGdldEdz dFBsYXlzRmxhZygiZG93bmxvYWQiKTsKKwogICAgIC8vIFdlIGRvbid0IHdhbnQgdG8gc3RvcCBk b3dubG9hZGluZyBpZiB3ZSBhbHJlYWR5IHN0YXJ0ZWQgaXQuCi0gICAgaWYgKGZsYWdzICYgR1NU X1BMQVlfRkxBR19ET1dOTE9BRCAmJiBtX3JlYWR5U3RhdGUgPiBNZWRpYVBsYXllcjo6SGF2ZU5v dGhpbmcgJiYgIW1fcmVzZXRQaXBlbGluZSkKKyAgICBpZiAoZmxhZ3MgJiBmbGFnRG93bmxvYWQg JiYgbV9yZWFkeVN0YXRlID4gTWVkaWFQbGF5ZXI6OkhhdmVOb3RoaW5nICYmICFtX3Jlc2V0UGlw ZWxpbmUpCiAgICAgICAgIHJldHVybjsKIAogICAgIGJvb2wgc2hvdWxkRG93bmxvYWQgPSAhaXNM aXZlU3RyZWFtKCkgJiYgbV9wcmVsb2FkID09IE1lZGlhUGxheWVyOjpBdXRvOwogICAgIGlmIChz aG91bGREb3dubG9hZCkgewogICAgICAgICBMT0dfTUVESUFfTUVTU0FHRSgiRW5hYmxpbmcgb24t ZGlzayBidWZmZXJpbmciKTsKLSAgICAgICAgZ19vYmplY3Rfc2V0KG1fcGxheUJpbi5nZXQoKSwg ImZsYWdzIiwgZmxhZ3MgfCBHU1RfUExBWV9GTEFHX0RPV05MT0FELCBOVUxMKTsKKyAgICAgICAg Z19vYmplY3Rfc2V0KG1fcGxheUJpbi5nZXQoKSwgImZsYWdzIiwgZmxhZ3MgfCBmbGFnRG93bmxv YWQsIE5VTEwpOwogICAgICAgICBtX2ZpbGxUaW1lci5zdGFydFJlcGVhdGluZygwLjIpOwogICAg IH0gZWxzZSB7CiAgICAgICAgIExPR19NRURJQV9NRVNTQUdFKCJEaXNhYmxpbmcgb24tZGlzayBi dWZmZXJpbmciKTsKLSAgICAgICAgZ19vYmplY3Rfc2V0KG1fcGxheUJpbi5nZXQoKSwgImZsYWdz IiwgZmxhZ3MgJiB+R1NUX1BMQVlfRkxBR19ET1dOTE9BRCwgTlVMTCk7CisgICAgICAgIGdfb2Jq ZWN0X3NldChtX3BsYXlCaW4uZ2V0KCksICJmbGFncyIsIGZsYWdzICYgfmZsYWdEb3dubG9hZCwg TlVMTCk7CiAgICAgICAgIG1fZmlsbFRpbWVyLnN0b3AoKTsKICAgICB9CiB9Cg== 224606 2014-02-19 01:16:59 -0800 2014-02-19 02:19:50 -0800 Patch bug-128957-20140219101657.patch text/plain 5100 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0Mjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWYxNjFjMGRjMTA2ZTEy NDZkMzliZDM4NjRkZjJjNzgzMGZjNTNiNC4uOTBhZmVhZmI5NTQ2OGYzMjU1ZDA5N2Y5OGQ1Y2E4 MjAxNjUxYzAzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAyLTE5ICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl0gdGhlIEdzdFBsYXlGbGFncyBlbnVtIGRpdmVyZ2VkIGZyb20gdXBzdHJlYW0KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODk1NworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZWQgdGhl IEdzdFBsYXlGbGFncyBmcm9tIHRoZSBHU3RyZWFtZXIgaW1wbGVtZW50YXRpb24gYW5kCisgICAg ICAgIHJlcGxhY2VkIGJ5IHRoZSB1c2Ugb2YgdGhlIEdGbGFncy4KKworICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJVdGlsaXRpZXMuaDoKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyVXRpbGl0aWVzLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmdldEdzdFBsYXlzRmxhZyk6IENyZWF0ZWQgdG8gZ2V0IHRoZSBmbGFncyBi eSB1c2luZyB0aGUKKyAgICAgICAgR0ZsYWdzIGluZnJhc3RydWN0dXJlLgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzZXREb3du bG9hZEJ1ZmZlcmluZyk6CisgICAgICAgIFJlcGxhY2VkIEdTVF9QTEFZX0ZMQUdfRE9XTkxPQUQg d2l0aCBnZXRHc3RQbGF5c0ZsYWcuCisKIDIwMTQtMDItMTggIFhhYmllciBSb2RyaWd1ZXogQ2Fs dmFyICA8Y2FsdmFyaXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBNb3ZlIGluaGVyaXRpbmcgbWV0 aG9kIHRvIHRoZSBzdXBlcmNsYXNzIGluIHRoZSBKYXZhU2NyaXB0IG1lZGlhIGNvbnRyb2xzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0 cmVhbWVyVXRpbGl0aWVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9HU3RyZWFtZXJVdGlsaXRpZXMuY3BwCmluZGV4IGE2YWFlMDIyOTdiZTJjMzYwYjhl MzI3OTczMzRjY2E3MjA5NThkZDYuLmFhYWMwOTg5MzhkN2U3YTk0MzFhNGExZGE1NTYwNThiMmIy ODc2MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9HU3RyZWFtZXJVdGlsaXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJVdGlsaXRpZXMuY3BwCkBAIC0xMzMsNiArMTMz LDE4IEBAIGJvb2wgaW5pdGlhbGl6ZUdTdHJlYW1lcigpCiAgICAgcmV0dXJuIGdzdEluaXRpYWxp emVkOwogfQogCit1bnNpZ25lZCBnZXRHc3RQbGF5c0ZsYWcoY29uc3QgY2hhciogbmljaykKK3sK KyAgICBzdGF0aWMgR0ZsYWdzQ2xhc3MqIGZsYWdzQ2xhc3MgPSBzdGF0aWNfY2FzdDxHRmxhZ3ND bGFzcyo+KGdfdHlwZV9jbGFzc19yZWYoZ190eXBlX2Zyb21fbmFtZSgiR3N0UGxheUZsYWdzIikp KTsKKyAgICBBU1NFUlQoZmxhZ3NDbGFzcyk7CisKKyAgICBHRmxhZ3NWYWx1ZSogZmxhZyA9IGdf ZmxhZ3NfZ2V0X3ZhbHVlX2J5X25pY2soZmxhZ3NDbGFzcywgbmljayk7CisgICAgaWYgKCFmbGFn KQorICAgICAgICByZXR1cm4gMDsKKworICAgIHJldHVybiBmbGFnLT52YWx1ZTsKK30KKwogfQog CiAjZW5kaWYgLy8gVVNFKEdTVFJFQU1FUikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJVdGlsaXRpZXMuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJVdGlsaXRpZXMuaApp bmRleCA3NTVkYmRiNzIwMzBmMzk1NGZlYTkyMmUwODQ2Y2FmYWYzOTRiZTEyLi40ZDEwNzM2ZTM0 NzM0NDQ5YjA5Njc1ZmFhNmE1NWE1NmI1NGNiYzMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyVXRpbGl0aWVzLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lclV0aWxp dGllcy5oCkBAIC03Miw1ICs3Miw2IEBAIGNoYXIqIGdldEdzdEJ1ZmZlckRhdGFQb2ludGVyKEdz dEJ1ZmZlciopOwogdm9pZCBtYXBHc3RCdWZmZXIoR3N0QnVmZmVyKik7CiB2b2lkIHVubWFwR3N0 QnVmZmVyKEdzdEJ1ZmZlciopOwogYm9vbCBpbml0aWFsaXplR1N0cmVhbWVyKCk7Cit1bnNpZ25l ZCBnZXRHc3RQbGF5c0ZsYWcoY29uc3QgY2hhciogbmljayk7CiAKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggN2U5YzQ5Nzk4NGZkNWYz MmI4OTY5M2NjMDM0OWY5ZDlhNTE1N2ViNi4uMzE3MjRlYmFkYTNlZmE3MDJkMmE5YTFiM2U3MTJm NjMyNWVmN2NlNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lci5jcHAKQEAgLTU2LDIxICs1Niw2IEBACiAjaW5jbHVkZSAiV2ViS2l0TWVkaWFTb3VyY2VH U3RyZWFtZXIuaCIKICNlbmRpZgogCi0vLyBHc3RQbGF5RmxhZ3MgZmxhZ3MgZnJvbSBwbGF5Ymlu Mi4gSXQgaXMgdGhlIHBvbGljeSBvZiBHU3RyZWFtZXIgdG8KLS8vIG5vdCBwdWJsaWNseSBleHBv c2UgZWxlbWVudC1zcGVjaWZpYyBlbnVtcy4gVGhhdCdzIHdoeSB0aGlzCi0vLyBHc3RQbGF5Rmxh Z3MgZW51bSBoYXMgYmVlbiBjb3BpZWQgaGVyZS4KLXR5cGVkZWYgZW51bSB7Ci0gICAgR1NUX1BM QVlfRkxBR19WSURFTyAgICAgICAgID0gMHgwMDAwMDAwMSwKLSAgICBHU1RfUExBWV9GTEFHX0FV RElPICAgICAgICAgPSAweDAwMDAwMDAyLAotICAgIEdTVF9QTEFZX0ZMQUdfVEVYVCAgICAgICAg ICA9IDB4MDAwMDAwMDQsCi0gICAgR1NUX1BMQVlfRkxBR19WSVMgICAgICAgICAgID0gMHgwMDAw MDAwOCwKLSAgICBHU1RfUExBWV9GTEFHX1NPRlRfVk9MVU1FICAgPSAweDAwMDAwMDEwLAotICAg IEdTVF9QTEFZX0ZMQUdfTkFUSVZFX0FVRElPICA9IDB4MDAwMDAwMjAsCi0gICAgR1NUX1BMQVlf RkxBR19OQVRJVkVfVklERU8gID0gMHgwMDAwMDA0MCwKLSAgICBHU1RfUExBWV9GTEFHX0RPV05M T0FEICAgICAgPSAweDAwMDAwMDgwLAotICAgIEdTVF9QTEFZX0ZMQUdfQlVGRkVSSU5HICAgICA9 IDB4MDAwMDAwMTAwCi19IEdzdFBsYXlGbGFnczsKLQogLy8gTWF4IGludGVydmFsIGluIHNlY29u ZHMgdG8gc3RheSBpbiB0aGUgUkVBRFkgc3RhdGUgb24gbWFudWFsCiAvLyBzdGF0ZSBjaGFuZ2Ug cmVxdWVzdHMuCiBzdGF0aWMgY29uc3QgZ3VpbnQgZ1JlYWR5U3RhdGVUaW1lckludGVydmFsID0g NjA7CkBAIC0xNzg0LDIxICsxNzY5LDIzIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjpzZXREb3dubG9hZEJ1ZmZlcmluZygpCiAgICAgaWYgKCFtX3BsYXlCaW4pCiAgICAgICAg IHJldHVybjsKIAotICAgIEdzdFBsYXlGbGFncyBmbGFnczsKKyAgICB1bnNpZ25lZCBmbGFnczsK ICAgICBnX29iamVjdF9nZXQobV9wbGF5QmluLmdldCgpLCAiZmxhZ3MiLCAmZmxhZ3MsIE5VTEwp OwogCisgICAgdW5zaWduZWQgZmxhZ0Rvd25sb2FkID0gZ2V0R3N0UGxheXNGbGFnKCJkb3dubG9h ZCIpOworCiAgICAgLy8gV2UgZG9uJ3Qgd2FudCB0byBzdG9wIGRvd25sb2FkaW5nIGlmIHdlIGFs cmVhZHkgc3RhcnRlZCBpdC4KLSAgICBpZiAoZmxhZ3MgJiBHU1RfUExBWV9GTEFHX0RPV05MT0FE ICYmIG1fcmVhZHlTdGF0ZSA+IE1lZGlhUGxheWVyOjpIYXZlTm90aGluZyAmJiAhbV9yZXNldFBp cGVsaW5lKQorICAgIGlmIChmbGFncyAmIGZsYWdEb3dubG9hZCAmJiBtX3JlYWR5U3RhdGUgPiBN ZWRpYVBsYXllcjo6SGF2ZU5vdGhpbmcgJiYgIW1fcmVzZXRQaXBlbGluZSkKICAgICAgICAgcmV0 dXJuOwogCiAgICAgYm9vbCBzaG91bGREb3dubG9hZCA9ICFpc0xpdmVTdHJlYW0oKSAmJiBtX3By ZWxvYWQgPT0gTWVkaWFQbGF5ZXI6OkF1dG87CiAgICAgaWYgKHNob3VsZERvd25sb2FkKSB7CiAg ICAgICAgIExPR19NRURJQV9NRVNTQUdFKCJFbmFibGluZyBvbi1kaXNrIGJ1ZmZlcmluZyIpOwot ICAgICAgICBnX29iamVjdF9zZXQobV9wbGF5QmluLmdldCgpLCAiZmxhZ3MiLCBmbGFncyB8IEdT VF9QTEFZX0ZMQUdfRE9XTkxPQUQsIE5VTEwpOworICAgICAgICBnX29iamVjdF9zZXQobV9wbGF5 QmluLmdldCgpLCAiZmxhZ3MiLCBmbGFncyB8IGZsYWdEb3dubG9hZCwgTlVMTCk7CiAgICAgICAg IG1fZmlsbFRpbWVyLnN0YXJ0UmVwZWF0aW5nKDAuMik7CiAgICAgfSBlbHNlIHsKICAgICAgICAg TE9HX01FRElBX01FU1NBR0UoIkRpc2FibGluZyBvbi1kaXNrIGJ1ZmZlcmluZyIpOwotICAgICAg ICBnX29iamVjdF9zZXQobV9wbGF5QmluLmdldCgpLCAiZmxhZ3MiLCBmbGFncyAmIH5HU1RfUExB WV9GTEFHX0RPV05MT0FELCBOVUxMKTsKKyAgICAgICAgZ19vYmplY3Rfc2V0KG1fcGxheUJpbi5n ZXQoKSwgImZsYWdzIiwgZmxhZ3MgJiB+ZmxhZ0Rvd25sb2FkLCBOVUxMKTsKICAgICAgICAgbV9m aWxsVGltZXIuc3RvcCgpOwogICAgIH0KIH0K