78244 2012-02-09 08:39:45 -0800 [GStreamer] html5test.com says that gstreamer ports do not support WebM for audio 2012-02-14 05:07:48 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED http://html5test.com P3 Normal --- 40829 1 mrobinson mrobinson eric gustavo menard pnormand webkit.review.bot oldest_to_newest 553198 0 mrobinson 2012-02-09 08:39:45 -0800 html5test.com says that we support WebM for video, but not audio. Philippe has confirmed that we just need to advertise a supporting another mime type. 553241 1 126320 mrobinson 2012-02-09 09:55:14 -0800 Created attachment 126320 Patch 553249 2 126320 eric 2012-02-09 10:03:44 -0800 Comment on attachment 126320 Patch OK... webm isnt' a compile-time option for gstreamer? 553250 3 eric 2012-02-09 10:04:06 -0800 Did you file a bug with gstreamer to fix their advertising? Can we remove this once they fix such? 553255 4 mrobinson 2012-02-09 10:08:41 -0800 (In reply to comment #3) > Did you file a bug with gstreamer to fix their advertising? Can we remove this once they fix such? Thanks for the review! Philippe, who typically handles the gstreamer integration, has asked upstream about fixing this. I guess it's kicked off an interesting discussion, but I don't have the details. One thing preventing us from removing the work-around is that we still want to work with older gstreamer versions. At some point, when our dependency jumps (likely when we drop support for pre-0.11 GStreamer) we can remove this work-around. 553262 5 126320 eric 2012-02-09 10:10:29 -0800 Comment on attachment 126320 Patch It would be nice if you would explain that in the code. :) Ideally by linking to some gstreamer bug url (so that later hackers can know when to remove this). 553269 6 pnormand 2012-02-09 10:13:46 -0800 (In reply to comment #2) > (From update of attachment 126320 [details]) > OK... webm isnt' a compile-time option for gstreamer? WebM support is shipped in separate plugins but the core of gstreamer provides what they call typefinders, able to detect the media container of a given input byte stream. (In reply to comment #3) > Did you file a bug with gstreamer to fix their advertising? Can we remove this once they fix such? Well the caps infrastructure used in gstreamer is different from the mime-types used in this code. In the future they might consider advertizing audio/webm but for the time being we need this workaround in webkit. 553272 7 eric 2012-02-09 10:19:58 -0800 You all do what you need to do. :) My concerns are: 1. Making sure that your'e not inadverntaantly advertising support when you don't hav eit. 2. Adding code which will be obsolute (or worse, wrong) at a later date, w/o any comments in the code as to when to remove it. :) But those are general concerns. This is a pretty simple patch, and you all are both quite experianced at this webkit thing. I trust you do do the right things here (whatever those are). 553273 8 mrobinson 2012-02-09 10:21:17 -0800 (In reply to comment #5) > (From update of attachment 126320 [details]) > It would be nice if you would explain that in the code. :) Ideally by linking to some gstreamer bug url (so that later hackers can know when to remove this). Good point. Philippe, is the following comment accurate? // There isn't a one-to-one correspondance of caps to supported mime types in GStreamer. // Thus, we need to manually map from caps to supported mime-types here. At some point in // the future, GStreamer may map caps to mime-types directly and then we can remove this code. I didn't link to the the bug URL, because I'm not sure if this is considered a bug in upstream yet. Perhaps Philippe can help me out here... I also notice that the video/x-h264 cap doesn't add a video/x-h264 mime-type and neither does the video/x-theora add a video/x-theora mime type. Is that on purpose? 553279 9 mrobinson 2012-02-09 10:23:30 -0800 (In reply to comment #7) > 1. Making sure that your'e not inadverntaantly advertising support when you don't hav eit. At least in this case, it seems that the audio/x-vorbis cap implies audio/webm mime type support. > 2. Adding code which will be obsolute (or worse, wrong) at a later date, w/o any comments in the code as to when to remove it. :) I definitely think it makes sense to add a comment here explaining the situation. 553910 10 pnormand 2012-02-10 00:30:25 -0800 (In reply to comment #8) > (In reply to comment #5) > > (From update of attachment 126320 [details] [details]) > > It would be nice if you would explain that in the code. :) Ideally by linking to some gstreamer bug url (so that later hackers can know when to remove this). > > Good point. Philippe, is the following comment accurate? > > // There isn't a one-to-one correspondance of caps to supported mime types in GStreamer. > // Thus, we need to manually map from caps to supported mime-types here. At some point in > // the future, GStreamer may map caps to mime-types directly and then we can remove this code. > It's ok apart from the last sentence. Here's my take :) At some point in the future, GStreamer may reduce the differences between some caps and some of the mime-types mentionned in this code. > I didn't link to the the bug URL, because I'm not sure if this is considered a bug in upstream yet. Perhaps Philippe can help me out here... > It's not considered a bug yet. I think if I open one now it will probably be quickly closed as INVALID :) But don't worry, I'm aware of this issue and eager to simplify this mimeTypeCache() function as soon as we can. > I also notice that the video/x-h264 cap doesn't add a video/x-h264 mime-type and neither does the video/x-theora add a video/x-theora mime type. Is that on purpose? Yes, I don't think it's necessary. For instance the media/W3C/video/canPlayType tests use video/mp4 and video/ogg. 554628 11 126635 mrobinson 2012-02-11 08:43:41 -0800 Created attachment 126635 Patch for landing 554629 12 126635 webkit.review.bot 2012-02-11 08:52:16 -0800 Comment on attachment 126635 Patch for landing Rejecting attachment 126635 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 ERROR: /mnt/git/webkit-commit-queue/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/11506144 554632 13 126636 mrobinson 2012-02-11 09:06:46 -0800 Created attachment 126636 Patch for landing, for real 554643 14 126636 webkit.review.bot 2012-02-11 10:36:52 -0800 Comment on attachment 126636 Patch for landing, for real Clearing flags on attachment: 126636 Committed r107482: <http://trac.webkit.org/changeset/107482> 554748 15 126320 mrobinson 2012-02-11 18:04:37 -0800 Comment on attachment 126320 Patch Clearing review bit. 126320 2012-02-09 09:55:14 -0800 2012-02-11 18:04:37 -0800 Patch bug-78244-20120209095506.patch text/plain 1725 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTcxZTliMzhjMWMwNTg0 MDQxODc4OTZiMzg0ODQ1OTVlOWVjM2Y2Yi4uYjllYThlYWQ0NTUxNmM4OTM5MGQ3YTcyMDU0Njli ZjY0ZGRjNTBlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAyLTA5ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBodG1sNXRlc3QuY29tIHNheXMgdGhhdCBnc3RyZWFtZXIgcG9ydHMgZG8gbm90IHN1cHBvcnQg V2ViTSBmb3IgYXVkaW8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc4MjQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU3BlY2lmaWNhbGx5IGFkdmVydGlzZSBzdXBwb3J0IGZvciBhdWRpby93ZWJtIHdoZW4g d2Ugc3VwcG9ydCB0aGUgdm9yYmlzCisgICAgICAgIGF1ZGlvIGNvZGVjLiBUaGlzIGlzIG5lY2Vz c2FyeSBiZWNhdXNlIGdzdHJlYW1lciBkb2Vzbid0IGFkdmVydGlzZSBpdC4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6bWltZVR5cGVDYWNoZSk6IEFkZCBhbiBvdmVycmlkZSBm b3IgYXVkaW8vd2VibS4KKwogMjAxMi0wMi0wOSAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtyZWZhY3RvcmluZ10gdGFrZSBf c2hvd1Nob3J0RXZlbnRzIG91dCBvZiB0aW1lbGluZSBjYWxjdWxhdG9yCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IGUyOGI2N2IzNzk1YzUw Y2M5NjdjMmRjNWExZmRhNTIwZmUzYzQ2MzQuLmRiYTk2NThjZjdmZDc1Yzc2YjQzNzdjNDFkNDk2 OTZmMjQ0ZDFmNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXIuY3BwCkBAIC0xNTIzLDYgKzE1MjMsNyBAQCBzdGF0aWMgSGFzaFNldDxTdHJpbmc+IG1p bWVUeXBlQ2FjaGUoKQogICAgICAgICAgICAgICAgIGlmIChnX3N0cl9lcXVhbChuYW1lLCAiYXVk aW8veC12b3JiaXMiKSkgewogICAgICAgICAgICAgICAgICAgICBjYWNoZS5hZGQoU3RyaW5nKCJh dWRpby9vZ2ciKSk7CiAgICAgICAgICAgICAgICAgICAgIGNhY2hlLmFkZChTdHJpbmcoImF1ZGlv L3gtdm9yYmlzK29nZyIpKTsKKyAgICAgICAgICAgICAgICAgICAgY2FjaGUuYWRkKFN0cmluZygi YXVkaW8vd2VibSIpKTsKICAgICAgICAgICAgICAgICAgICAgY2FjaGVkID0gdHJ1ZTsKICAgICAg ICAgICAgICAgICB9CiAK 126635 2012-02-11 08:43:41 -0800 2012-02-11 08:52:16 -0800 Patch for landing bug-78244-20120211084340.patch text/plain 2487 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTcxZTliMzhjMWMwNTg0 MDQxODc4OTZiMzg0ODQ1OTVlOWVjM2Y2Yi4uYjllYThlYWQ0NTUxNmM4OTM5MGQ3YTcyMDU0Njli ZjY0ZGRjNTBlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAyLTA5ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBodG1sNXRlc3QuY29tIHNheXMgdGhhdCBnc3RyZWFtZXIgcG9ydHMgZG8gbm90IHN1cHBvcnQg V2ViTSBmb3IgYXVkaW8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc4MjQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU3BlY2lmaWNhbGx5IGFkdmVydGlzZSBzdXBwb3J0IGZvciBhdWRpby93ZWJtIHdoZW4g d2Ugc3VwcG9ydCB0aGUgdm9yYmlzCisgICAgICAgIGF1ZGlvIGNvZGVjLiBUaGlzIGlzIG5lY2Vz c2FyeSBiZWNhdXNlIGdzdHJlYW1lciBkb2Vzbid0IGFkdmVydGlzZSBpdC4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6bWltZVR5cGVDYWNoZSk6IEFkZCBhbiBvdmVycmlkZSBm b3IgYXVkaW8vd2VibS4KKwogMjAxMi0wMi0wOSAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtyZWZhY3RvcmluZ10gdGFrZSBf c2hvd1Nob3J0RXZlbnRzIG91dCBvZiB0aW1lbGluZSBjYWxjdWxhdG9yCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IGUyOGI2N2IzNzk1YzUw Y2M5NjdjMmRjNWExZmRhNTIwZmUzYzQ2MzQuLjk4MTNjNWU5ZDUxZmZhZDQ4MzM5NWM5MWM4YzY5 YTUxODgzMzgwZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXIuY3BwCkBAIC0xNDk0LDggKzE0OTQsMTAgQEAgc3RhdGljIEhhc2hTZXQ8U3RyaW5nPiBt aW1lVHlwZUNhY2hlKCkKICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciogbmFtZSA9IGdzdF9z dHJ1Y3R1cmVfZ2V0X25hbWUoc3RydWN0dXJlKTsKICAgICAgICAgICAgICAgICBib29sIGNhY2hl ZCA9IGZhbHNlOwogCi0gICAgICAgICAgICAgICAgLy8gVGhlc2UgZm9ybWF0cyBhcmUgc3VwcG9y dGVkIGJ5IEdTdHJlYW1lciwgYnV0IG5vdAotICAgICAgICAgICAgICAgIC8vIGNvcnJlY3RseSBh ZHZlcnRpc2VkLgorICAgICAgICAgICAgICAgIC8vIFRoZXJlIGlzbid0IGEgb25lLXRvLW9uZSBj b3JyZXNwb25kYW5jZSBvZiBjYXBzIHRvIHN1cHBvcnRlZCBtaW1lIHR5cGVzIGluCisgICAgICAg ICAgICAgICAgLy8gR1N0cmVhbWVyLCBzbyB3ZSBuZWVkIHRvIG1hbnVhbGx5IG1hcCBiZXR3ZWVu IHRoZW0uIEF0IHNvbWUgcG9pbnQgaW4gdGhlIGZ1dHVyZSwKKyAgICAgICAgICAgICAgICAvLyBH U3RyZWFtZXIgbWF5IHJlZHVjZSB0aGUgZGlmZmVyZW5jZXMgYmV0d2VlbiBjYXBzIGFuZCBtaW1l IHR5cGVzIGFuZCB3ZSBjYW4KKyAgICAgICAgICAgICAgICAvLyByZW1vdmUgbWFwcGluZ3MuCiAg ICAgICAgICAgICAgICAgaWYgKGdfc3RyX2VxdWFsKG5hbWUsICJ2aWRlby94LWgyNjQiKSkgewog ICAgICAgICAgICAgICAgICAgICBjYWNoZS5hZGQoU3RyaW5nKCJ2aWRlby9tcDQiKSk7CiAgICAg ICAgICAgICAgICAgICAgIGNhY2hlZCA9IHRydWU7CkBAIC0xNTIzLDYgKzE1MjUsNyBAQCBzdGF0 aWMgSGFzaFNldDxTdHJpbmc+IG1pbWVUeXBlQ2FjaGUoKQogICAgICAgICAgICAgICAgIGlmIChn X3N0cl9lcXVhbChuYW1lLCAiYXVkaW8veC12b3JiaXMiKSkgewogICAgICAgICAgICAgICAgICAg ICBjYWNoZS5hZGQoU3RyaW5nKCJhdWRpby9vZ2ciKSk7CiAgICAgICAgICAgICAgICAgICAgIGNh Y2hlLmFkZChTdHJpbmcoImF1ZGlvL3gtdm9yYmlzK29nZyIpKTsKKyAgICAgICAgICAgICAgICAg ICAgY2FjaGUuYWRkKFN0cmluZygiYXVkaW8vd2VibSIpKTsKICAgICAgICAgICAgICAgICAgICAg Y2FjaGVkID0gdHJ1ZTsKICAgICAgICAgICAgICAgICB9CiAK 126636 2012-02-11 09:06:46 -0800 2012-02-11 10:36:52 -0800 Patch for landing, for real bug-78244-20120211090645.patch text/plain 2484 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTcxZTliMzhjMWMwNTg0 MDQxODc4OTZiMzg0ODQ1OTVlOWVjM2Y2Yi4uMGZhZmE1MDBkMGY0M2JmYmE1MzE2NWVjYWMxZTlh NGMxNjQzNTFmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAyLTA5ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBodG1sNXRlc3QuY29tIHNheXMgdGhhdCBnc3RyZWFtZXIgcG9ydHMgZG8gbm90IHN1cHBvcnQg V2ViTSBmb3IgYXVkaW8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc4MjQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCisKKyAgICAg ICAgU3BlY2lmaWNhbGx5IGFkdmVydGlzZSBzdXBwb3J0IGZvciBhdWRpby93ZWJtIHdoZW4gd2Ug c3VwcG9ydCB0aGUgdm9yYmlzCisgICAgICAgIGF1ZGlvIGNvZGVjLiBUaGlzIGlzIG5lY2Vzc2Fy eSBiZWNhdXNlIGdzdHJlYW1lciBkb2Vzbid0IGFkdmVydGlzZSBpdC4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6bWltZVR5cGVDYWNoZSk6IEFkZCBhbiBvdmVycmlkZSBmb3Ig YXVkaW8vd2VibS4KKwogMjAxMi0wMi0wOSAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtyZWZhY3RvcmluZ10gdGFrZSBfc2hv d1Nob3J0RXZlbnRzIG91dCBvZiB0aW1lbGluZSBjYWxjdWxhdG9yCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IGUyOGI2N2IzNzk1YzUwY2M5 NjdjMmRjNWExZmRhNTIwZmUzYzQ2MzQuLjk4MTNjNWU5ZDUxZmZhZDQ4MzM5NWM5MWM4YzY5YTUx ODgzMzgwZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXIuY3BwCkBAIC0xNDk0LDggKzE0OTQsMTAgQEAgc3RhdGljIEhhc2hTZXQ8U3RyaW5nPiBtaW1l VHlwZUNhY2hlKCkKICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciogbmFtZSA9IGdzdF9zdHJ1 Y3R1cmVfZ2V0X25hbWUoc3RydWN0dXJlKTsKICAgICAgICAgICAgICAgICBib29sIGNhY2hlZCA9 IGZhbHNlOwogCi0gICAgICAgICAgICAgICAgLy8gVGhlc2UgZm9ybWF0cyBhcmUgc3VwcG9ydGVk IGJ5IEdTdHJlYW1lciwgYnV0IG5vdAotICAgICAgICAgICAgICAgIC8vIGNvcnJlY3RseSBhZHZl cnRpc2VkLgorICAgICAgICAgICAgICAgIC8vIFRoZXJlIGlzbid0IGEgb25lLXRvLW9uZSBjb3Jy ZXNwb25kYW5jZSBvZiBjYXBzIHRvIHN1cHBvcnRlZCBtaW1lIHR5cGVzIGluCisgICAgICAgICAg ICAgICAgLy8gR1N0cmVhbWVyLCBzbyB3ZSBuZWVkIHRvIG1hbnVhbGx5IG1hcCBiZXR3ZWVuIHRo ZW0uIEF0IHNvbWUgcG9pbnQgaW4gdGhlIGZ1dHVyZSwKKyAgICAgICAgICAgICAgICAvLyBHU3Ry ZWFtZXIgbWF5IHJlZHVjZSB0aGUgZGlmZmVyZW5jZXMgYmV0d2VlbiBjYXBzIGFuZCBtaW1lIHR5 cGVzIGFuZCB3ZSBjYW4KKyAgICAgICAgICAgICAgICAvLyByZW1vdmUgbWFwcGluZ3MuCiAgICAg ICAgICAgICAgICAgaWYgKGdfc3RyX2VxdWFsKG5hbWUsICJ2aWRlby94LWgyNjQiKSkgewogICAg ICAgICAgICAgICAgICAgICBjYWNoZS5hZGQoU3RyaW5nKCJ2aWRlby9tcDQiKSk7CiAgICAgICAg ICAgICAgICAgICAgIGNhY2hlZCA9IHRydWU7CkBAIC0xNTIzLDYgKzE1MjUsNyBAQCBzdGF0aWMg SGFzaFNldDxTdHJpbmc+IG1pbWVUeXBlQ2FjaGUoKQogICAgICAgICAgICAgICAgIGlmIChnX3N0 cl9lcXVhbChuYW1lLCAiYXVkaW8veC12b3JiaXMiKSkgewogICAgICAgICAgICAgICAgICAgICBj YWNoZS5hZGQoU3RyaW5nKCJhdWRpby9vZ2ciKSk7CiAgICAgICAgICAgICAgICAgICAgIGNhY2hl LmFkZChTdHJpbmcoImF1ZGlvL3gtdm9yYmlzK29nZyIpKTsKKyAgICAgICAgICAgICAgICAgICAg Y2FjaGUuYWRkKFN0cmluZygiYXVkaW8vd2VibSIpKTsKICAgICAgICAgICAgICAgICAgICAgY2Fj aGVkID0gdHJ1ZTsKICAgICAgICAgICAgICAgICB9CiAK