54627 2011-02-17 01:59:08 -0800 [GStreamer] URI queries support in webkitwebsrc 2011-02-21 02:15:02 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 54628 0 ylatuya webkit-unassigned gustavo mrobinson pnormand oldest_to_newest 352690 0 82770 ylatuya 2011-02-17 01:59:08 -0800 Created attachment 82770 Add support for uri queries Attached patch that adds support for URI queries. You can find it in the following branch too. http://gitorious.org/~ylatuya/webkitgtk/ylatuyas-webkit/commits/hls 352692 1 pnormand 2011-02-17 02:09:01 -0800 Can you please add a ChangeLog and check the code style with Tools/Scripts/check-webkit-style ? 352693 2 pnormand 2011-02-17 02:09:27 -0800 ah also see http://www.webkit.org/coding/contributing.html :) 352725 3 82777 ylatuya 2011-02-17 03:22:33 -0800 Created attachment 82777 Patch 352730 4 pnormand 2011-02-17 03:40:15 -0800 LGTM. Any reviewer to flip the switch? :) 352874 5 82777 mrobinson 2011-02-17 07:36:15 -0800 Comment on attachment 82777 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=82777&action=review Thanks for your contribution! Please consider the following review comments. This patch is only a few changes from an r+. > WebCore/ChangeLog:10 > + [GStreamer] URI queries support in webkitwebsrc > + https://bugs.webkit.org/show_bug.cgi?id=54627 > + > + * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: > + (webkit_web_src_init): > + (webKitWebSrcQuery): Do you mind explaining a bit what this adds? Those familiar with Gstreamer will understand what sry query support means, but not the majority of the people skimming the ChangeLog. > WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:120 > +static gboolean webKitWebSrcQuery(GstPad * pad, GstQuery * query); No spaces before the asterisks here. > WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:493 > + > +static gboolean webKitWebSrcQuery(GstPad * pad, GstQuery * query) > +{ > + WebKitWebSrc * src = WEBKIT_WEB_SRC(gst_pad_get_parent_element(pad)); Ditto. > WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:494 > + gboolean ret; Normally we don't abbreviate variable names in WebKit, so perhaps something like "success"? 353598 6 82964 ylatuya 2011-02-18 08:32:55 -0800 Created attachment 82964 Patch 353604 7 ylatuya 2011-02-18 08:42:40 -0800 Updated patch with your suggestions. I'm currently trying to add support for http live streaming streams[1] to gstreamer and as part of it I wanted to be able to watch them using webkit with the video tag. The hls demuxer is using gst_element_from_uri() to fetch fragments and update the playlist so that the webkit source element is used. It needs to have the 'location' property, this way the uri can be set in the element and it also needs to reply to URI queries so that the demuxer can know the uri of the playlist and use it to update it. You can see a screenshot[2] of epiphany playing a multibitrate stream in gstreamer's bug reports[3] :) [1]http://tools.ietf.org/html/draft-pantos-http-live-streaming-05 [2]http://bugzilla-attachments.gnome.org/attachment.cgi?id=181032 [3]https://bugzilla.gnome.org/show_bug.cgi?id=594035 353605 8 82964 mrobinson 2011-02-18 08:44:36 -0800 Comment on attachment 82964 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=82964&action=review Great stuff. Philippe do you mind landing this with the corrected ChangeLog? > WebCore/ChangeLog:11 > + No new tests. (OOPS!) Just need to replace this with an explanation of why there are no tests. > WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:511 > + WebKitWebSrc* src = WEBKIT_WEB_SRC(gst_pad_get_parent_element(pad)); > + gboolean success; > + > + switch (GST_QUERY_TYPE(query)) { > + case GST_QUERY_URI: > + gst_query_set_uri(query, src->priv->uri); > + success = TRUE; > + break; > + default: > + success = FALSE; > + break; > + } > + > + if (!success) > + success = gst_element_query(GST_ELEMENT(src->priv->appsrc), query); > + > + gst_object_unref(src); > + return success; This looks fine, but adding a GRefPtr specialization for GstObjects would make it even cleaner: { GRefPtr<GstObject*> src = adoptGRef(WEBKIT_WEB_SRC(gst_pad_get_parent_element(pad))); if (GST_QUERY_TYPE(query) == GST_QUERY_URI) { gst_query_set_uri(query, src->priv->uri) return TRUE; } return gst_element_query(GST_ELEMENT(src->priv->appsrc), query); } 354466 9 pnormand 2011-02-21 01:56:23 -0800 I just noticed this patch was made against an old version of the module. I added DURATION query support since then, so the patch needs fixup before landing, I'll do that, complete the ChangeLog and land the patch ;) 354475 10 pnormand 2011-02-21 02:13:31 -0800 Committed r79200: <http://trac.webkit.org/changeset/79200> 354476 11 pnormand 2011-02-21 02:15:02 -0800 I think the GRefPtr stuff should be part of another patch, I'll try to prepare that. 82770 2011-02-17 01:59:08 -0800 2011-02-17 03:22:28 -0800 Add support for uri queries 0001-webkitwebsrc-add-support-for-URI-queries.patch text/plain 2240 ylatuya RnJvbSAxZmM3YjhjOTgzNzkwNzFmMmE0MGQzZDYxNjIzNzhkYzgzYmJjMTNiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRvbmkgTW9yYWxlcyBBbGFzdHJ1ZXkgPGFtb3JhbGVzQGZs dW1vdGlvbi5jb20+CkRhdGU6IFdlZCwgMTYgRmViIDIwMTEgMTc6MjQ6NTAgKzAxMDAKU3ViamVj dDogW1BBVENIXSB3ZWJraXR3ZWJzcmM6IGFkZCBzdXBwb3J0IGZvciBVUkkgcXVlcmllcwoKLS0t CiAuLi4vZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAgICAgICAgICB8ICAg MjUgKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZXMgY2hhbmdlZCwgMjUgaW5zZXJ0aW9ucygr KSwgMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAppbmRleCA4 MThmNzRhLi45NzU0NTY1IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKQEAgLTEx Nyw2ICsxMTcsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3JjU2Vla0RhdGFDYihHc3RB cHBTcmMqIGFwcHNyYywgZ3VpbnQ2NCBvZmZzZXQsIGdwb2ludAogc3RhdGljIHZvaWQgd2ViS2l0 V2ViU3JjU3RvcChXZWJLaXRXZWJTcmMqIHNyYywgYm9vbCBzZWVraW5nKTsKIHN0YXRpYyBnYm9v bGVhbiB3ZWJLaXRXZWJTcmNTZXRVcmkoR3N0VVJJSGFuZGxlciogaGFuZGxlciwgY29uc3QgZ2No YXIqIHVyaSk7CiBzdGF0aWMgY29uc3QgZ2NoYXIqIHdlYktpdFdlYlNyY0dldFVyaShHc3RVUklI YW5kbGVyKiBoYW5kbGVyKTsKK3N0YXRpYyBnYm9vbGVhbiB3ZWJLaXRXZWJTcmNRdWVyeSAoR3N0 UGFkICogcGFkLCBHc3RRdWVyeSAqIHF1ZXJ5KTsKIAogc3RhdGljIEdzdEFwcFNyY0NhbGxiYWNr cyBhcHBzcmNDYWxsYmFja3MgPSB7CiAgICAgd2ViS2l0V2ViU3JjTmVlZERhdGFDYiwKQEAgLTIy OSw2ICsyMzAsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NyY19pbml0KFdlYktpdFdlYlNy Yyogc3JjLAogCiAgICAgcHJpdi0+c3JjcGFkID0gZ3N0X2dob3N0X3BhZF9uZXdfbm9fdGFyZ2V0 X2Zyb21fdGVtcGxhdGUoInNyYyIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFkVGVtcGxhdGUpOworICAgIGdzdF9wYWRfc2V0 X3F1ZXJ5X2Z1bmN0aW9uKHByaXYtPnNyY3BhZCwgd2ViS2l0V2ViU3JjUXVlcnkpOwogCiAgICAg Z3N0X2VsZW1lbnRfYWRkX3BhZChHU1RfRUxFTUVOVChzcmMpLCBwcml2LT5zcmNwYWQpOwogCkBA IC00ODUsNiArNDg3LDI5IEBAIHN0YXRpYyBHc3RTdGF0ZUNoYW5nZVJldHVybiB3ZWJLaXRXZWJT cmNDaGFuZ2VTdGF0ZShHc3RFbGVtZW50KiBlbGVtZW50LCBHc3RTdGF0CiAgICAgcmV0dXJuIHJl dDsKIH0KIAorCitzdGF0aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3JjUXVlcnkgKEdzdFBhZCAqIHBh ZCwgR3N0UXVlcnkgKiBxdWVyeSkKK3sKKyAgICBXZWJLaXRXZWJTcmMgKnNyYyA9IFdFQktJVF9X RUJfU1JDKGdzdF9wYWRfZ2V0X3BhcmVudF9lbGVtZW50IChwYWQpKTsKKyAgICBnYm9vbGVhbiBy ZXQ7CisKKyAgICBzd2l0Y2ggKEdTVF9RVUVSWV9UWVBFIChxdWVyeSkpIHsKKyAgICAgICAgY2Fz ZSBHU1RfUVVFUllfVVJJOgorICAgICAgICAgICAgZ3N0X3F1ZXJ5X3NldF91cmkgKHF1ZXJ5LCBz cmMtPnByaXYtPnVyaSk7CisgICAgICAgICAgICByZXQgPSBUUlVFOworICAgICAgICAgICAgYnJl YWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICByZXQgPSBGQUxTRTsKKyAgICAgICAg YnJlYWs7CisgICAgfQorCisgICAgaWYgKCFyZXQpCisgICAgICAgIHJldCA9IGdzdF9lbGVtZW50 X3F1ZXJ5IChHU1RfRUxFTUVOVChzcmMtPnByaXYtPmFwcHNyYyksIHF1ZXJ5KTsKKworICAgIGdz dF9vYmplY3RfdW5yZWYgKHNyYyk7CisgICAgcmV0dXJuIHJldDsKK30KKwogLy8gdXJpIGhhbmRs ZXIgaW50ZXJmYWNlCiAKIHN0YXRpYyBHc3RVUklUeXBlIHdlYktpdFdlYlNyY1VyaUdldFR5cGUo dm9pZCkKLS0gCjEuNy4xCgo= 82777 2011-02-17 03:22:33 -0800 2011-02-18 08:32:51 -0800 Patch bug-54627-20110217122426.patch text/plain 2469 ylatuya ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGIzYjBjOC4uZWU2ZjE0YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwxNyBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgogCisgICAgICAgIFtHU3RyZWFtZXJdIFVSSSBxdWVyaWVzIHN1cHBvcnQg aW4gd2Via2l0d2Vic3JjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01NDYyNworCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dl YktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX3NyY19pbml0 KToKKyAgICAgICAgKHdlYktpdFdlYlNyY1F1ZXJ5KToKKworMjAxMS0wMi0xNyAgQW5kb25pIE1v cmFsZXMgQWxhc3RydWV5ICA8YW1vcmFsZXNAZmx1bW90aW9uLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwogICAgICAgICBBZGRlZCAnbG9jYXRpb24nIHByb3Bl cnR5CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDYy OAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJL aXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAppbmRleCAxMmY2MTgwLi40ODJjYjJm IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRX ZWJTb3VyY2VHU3RyZWFtZXIuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKQEAgLTExNyw2ICsxMTcsNyBAQCBz dGF0aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3JjU2Vla0RhdGFDYihHc3RBcHBTcmMqIGFwcHNyYywg Z3VpbnQ2NCBvZmZzZXQsIGdwb2ludAogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjU3RvcChXZWJL aXRXZWJTcmMqIHNyYywgYm9vbCBzZWVraW5nKTsKIHN0YXRpYyBnYm9vbGVhbiB3ZWJLaXRXZWJT cmNTZXRVcmkoR3N0VVJJSGFuZGxlciogaGFuZGxlciwgY29uc3QgZ2NoYXIqIHVyaSk7CiBzdGF0 aWMgY29uc3QgZ2NoYXIqIHdlYktpdFdlYlNyY0dldFVyaShHc3RVUklIYW5kbGVyKiBoYW5kbGVy KTsKK3N0YXRpYyBnYm9vbGVhbiB3ZWJLaXRXZWJTcmNRdWVyeShHc3RQYWQgKiBwYWQsIEdzdFF1 ZXJ5ICogcXVlcnkpOwogCiBzdGF0aWMgR3N0QXBwU3JjQ2FsbGJhY2tzIGFwcHNyY0NhbGxiYWNr cyA9IHsKICAgICB3ZWJLaXRXZWJTcmNOZWVkRGF0YUNiLApAQCAtMjI5LDYgKzIzMCw3IEBAIHN0 YXRpYyB2b2lkIHdlYmtpdF93ZWJfc3JjX2luaXQoV2ViS2l0V2ViU3JjKiBzcmMsCiAKICAgICBw cml2LT5zcmNwYWQgPSBnc3RfZ2hvc3RfcGFkX25ld19ub190YXJnZXRfZnJvbV90ZW1wbGF0ZSgi c3JjIiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBwYWRUZW1wbGF0ZSk7CisgICAgZ3N0X3BhZF9zZXRfcXVlcnlfZnVuY3Rpb24o cHJpdi0+c3JjcGFkLCB3ZWJLaXRXZWJTcmNRdWVyeSk7CiAKICAgICBnc3RfZWxlbWVudF9hZGRf cGFkKEdTVF9FTEVNRU5UKHNyYyksIHByaXYtPnNyY3BhZCk7CiAKQEAgLTQ4NSw2ICs0ODcsMjkg QEAgc3RhdGljIEdzdFN0YXRlQ2hhbmdlUmV0dXJuIHdlYktpdFdlYlNyY0NoYW5nZVN0YXRlKEdz dEVsZW1lbnQqIGVsZW1lbnQsIEdzdFN0YXQKICAgICByZXR1cm4gcmV0OwogfQogCisKK3N0YXRp YyBnYm9vbGVhbiB3ZWJLaXRXZWJTcmNRdWVyeShHc3RQYWQgKiBwYWQsIEdzdFF1ZXJ5ICogcXVl cnkpCit7CisgICAgV2ViS2l0V2ViU3JjICogc3JjID0gV0VCS0lUX1dFQl9TUkMoZ3N0X3BhZF9n ZXRfcGFyZW50X2VsZW1lbnQocGFkKSk7CisgICAgZ2Jvb2xlYW4gcmV0OworCisgICAgc3dpdGNo IChHU1RfUVVFUllfVFlQRShxdWVyeSkpIHsKKyAgICBjYXNlIEdTVF9RVUVSWV9VUkk6CisgICAg ICAgIGdzdF9xdWVyeV9zZXRfdXJpKHF1ZXJ5LCBzcmMtPnByaXYtPnVyaSk7CisgICAgICAgIHJl dCA9IFRSVUU7CisgICAgICAgIGJyZWFrOworICAgIGRlZmF1bHQ6CisgICAgICAgIHJldCA9IEZB TFNFOworICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICBpZiAoIXJldCkKKyAgICAgICAgcmV0 ID0gZ3N0X2VsZW1lbnRfcXVlcnkoR1NUX0VMRU1FTlQoc3JjLT5wcml2LT5hcHBzcmMpLCBxdWVy eSk7CisKKyAgICBnc3Rfb2JqZWN0X3VucmVmKHNyYyk7CisgICAgcmV0dXJuIHJldDsKK30KKwog Ly8gdXJpIGhhbmRsZXIgaW50ZXJmYWNlCiAKIHN0YXRpYyBHc3RVUklUeXBlIHdlYktpdFdlYlNy Y1VyaUdldFR5cGUodm9pZCkK 82964 2011-02-18 08:32:55 -0800 2011-02-18 08:44:36 -0800 Patch bug-54627-20110218173458.patch text/plain 2651 ylatuya ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Y2M5Y2ZhNi4uOTExNjczMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTIsNiArMiwyMiBAQAogCiAgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgogCisgICAgICAgIFtHU3RyZWFtZXJdIEFkZCBVUkkgcXVlcmllcyBzdXBw b3J0IGluIHdlYmtpdHdlYnNyYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NTQ2MjcKKworICAgICAgICBUaGlzIGFsbG93IHJlcGx5aW5nIHRvIFVSSSBx dWVyaWVzIGZyb20gZG93bnN0cmVhbSBlbGVtZW50cworICAgICAgICB3aXRoIHRoZSB1cmkgY3Vy cmVudGx5IHNldCBpbiB0aGUgc291cmNlIGVsZW1lbnQuCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz LiAoT09QUyEpCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0 V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJfc3JjX2luaXQpOgor ICAgICAgICAod2ViS2l0V2ViU3JjUXVlcnkpOgorCisyMDExLTAyLTE4ICBBbmRvbmkgTW9yYWxl cyBBbGFzdHJ1ZXkgIDxhbW9yYWxlc0BmbHVtb3Rpb24uY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIFtHU3RyZWFtZXJdIEFkZCAnbG9jYXRpb24n IHByb3BlcnR5IGluIHdlYmtpdHdlYnNyYwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTQ2MjgKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcCBiL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAK aW5kZXggNzIwMWY2Ni4uMjgxYzAzYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcAorKysgYi9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3Bw CkBAIC0xMTcsNiArMTE3LDcgQEAgc3RhdGljIGdib29sZWFuIHdlYktpdFdlYlNyY1NlZWtEYXRh Q2IoR3N0QXBwU3JjKiBhcHBzcmMsIGd1aW50NjQgb2Zmc2V0LCBncG9pbnQKIHN0YXRpYyB2b2lk IHdlYktpdFdlYlNyY1N0b3AoV2ViS2l0V2ViU3JjKiBzcmMsIGJvb2wgc2Vla2luZyk7CiBzdGF0 aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3JjU2V0VXJpKEdzdFVSSUhhbmRsZXIqLCBjb25zdCBnY2hh ciopOwogc3RhdGljIGNvbnN0IGdjaGFyKiB3ZWJLaXRXZWJTcmNHZXRVcmkoR3N0VVJJSGFuZGxl ciopOworc3RhdGljIGdib29sZWFuIHdlYktpdFdlYlNyY1F1ZXJ5KEdzdFBhZCosIEdzdFF1ZXJ5 Kik7CiAKIHN0YXRpYyBHc3RBcHBTcmNDYWxsYmFja3MgYXBwc3JjQ2FsbGJhY2tzID0gewogICAg IHdlYktpdFdlYlNyY05lZWREYXRhQ2IsCkBAIC0yMzAsNiArMjMxLDcgQEAgc3RhdGljIHZvaWQg d2Via2l0X3dlYl9zcmNfaW5pdChXZWJLaXRXZWJTcmMqIHNyYywKIAogICAgIHByaXYtPnNyY3Bh ZCA9IGdzdF9naG9zdF9wYWRfbmV3X25vX3RhcmdldF9mcm9tX3RlbXBsYXRlKCJzcmMiLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHBhZFRlbXBsYXRlKTsKKyAgICBnc3RfcGFkX3NldF9xdWVyeV9mdW5jdGlvbihwcml2LT5zcmNw YWQsIHdlYktpdFdlYlNyY1F1ZXJ5KTsKIAogICAgIGdzdF9lbGVtZW50X2FkZF9wYWQoR1NUX0VM RU1FTlQoc3JjKSwgcHJpdi0+c3JjcGFkKTsKIApAQCAtNDg2LDYgKzQ4OCwyOSBAQCBzdGF0aWMg R3N0U3RhdGVDaGFuZ2VSZXR1cm4gd2ViS2l0V2ViU3JjQ2hhbmdlU3RhdGUoR3N0RWxlbWVudCog ZWxlbWVudCwgR3N0U3RhdAogICAgIHJldHVybiByZXQ7CiB9CiAKKworc3RhdGljIGdib29sZWFu IHdlYktpdFdlYlNyY1F1ZXJ5KEdzdFBhZCogcGFkLCBHc3RRdWVyeSogcXVlcnkpCit7CisgICAg V2ViS2l0V2ViU3JjKiBzcmMgPSBXRUJLSVRfV0VCX1NSQyhnc3RfcGFkX2dldF9wYXJlbnRfZWxl bWVudChwYWQpKTsKKyAgICBnYm9vbGVhbiBzdWNjZXNzOworCisgICAgc3dpdGNoIChHU1RfUVVF UllfVFlQRShxdWVyeSkpIHsKKyAgICBjYXNlIEdTVF9RVUVSWV9VUkk6CisgICAgICAgIGdzdF9x dWVyeV9zZXRfdXJpKHF1ZXJ5LCBzcmMtPnByaXYtPnVyaSk7CisgICAgICAgIHN1Y2Nlc3MgPSBU UlVFOworICAgICAgICBicmVhazsKKyAgICBkZWZhdWx0OgorICAgICAgICBzdWNjZXNzID0gRkFM U0U7CisgICAgICAgIGJyZWFrOworICAgIH0KKworICAgIGlmICghc3VjY2VzcykKKyAgICAgICAg c3VjY2VzcyA9IGdzdF9lbGVtZW50X3F1ZXJ5KEdTVF9FTEVNRU5UKHNyYy0+cHJpdi0+YXBwc3Jj KSwgcXVlcnkpOworCisgICAgZ3N0X29iamVjdF91bnJlZihzcmMpOworICAgIHJldHVybiBzdWNj ZXNzOworfQorCiAvLyB1cmkgaGFuZGxlciBpbnRlcmZhY2UKIAogc3RhdGljIEdzdFVSSVR5cGUg d2ViS2l0V2ViU3JjVXJpR2V0VHlwZSh2b2lkKQo=