143332 2015-04-02 03:30:37 -0700 [Mac][WebAudio] Update the AVAudioMix in the AudioSourceProviderAVFObjC when the list of enabled audio tracks change. 2015-04-10 01:23:06 -0700 1 1 1 Unclassified WebKit Web Audio 528+ (Nightly build) Mac (Intel) OS X 10.10 RESOLVED FIXED P2 Normal --- 1 isaacshinman jer.noble benjamin commit-queue crogers eric.carlson jer.noble jonlee mail oldest_to_newest 1082202 0 isaacshinman 2015-04-02 03:30:37 -0700 I am in the process of developing an HTML5 canvas interactive piece that uses Createjs and the Web Audio API. I've managed to get audio working in Chrome/Firefox/Safari despite the deprecation of webkitAudioContext by Chrome and FF but not Safari. However, filters for some reason are not working in Safari, but sound still plays. Filters DO work in Chrome/FF. I have my filters set up like this: var sound = new Audio(); sound.src = './sounds/sound.mp3'; sound.autoplay = false; sound.loop = true; soundSource = context.createMediaElementSource(sound); var soundFilter = context.createBiquadFilter(); soundFilter.type = "lowpass"; soundFilter.frequency.value = 500; soundSource.connect(soundFilter); soundFilter.connect(context.destination); I found [this](http://webaudioapi.com/samples/filter/) example of a lowpass which works in Safari, but I've no idea. I have a hunch this has to do with "createMediaElementSource". Any help would be appreciated! Live project can be found [here](http://playground.eca.ed.ac.uk/~s1463054/darksound_interactive/index.html). 1082350 1 jer.noble 2015-04-02 15:16:34 -0700 Dup of bug #135042. *** This bug has been marked as a duplicate of bug 135042 *** 1082354 2 jer.noble 2015-04-02 15:18:08 -0700 Please try this against a WebKit nightly build on Mac OS X Yosemite. 1082708 3 benjamin 2015-04-03 15:54:16 -0700 Reopening. The test case still does not work on Nightly. 1083535 4 jer.noble 2015-04-07 21:08:05 -0700 That test case uses a .mp3, which (for whatever reason) does not have an initially enabled audio track. I'll upload a patch shortly. 1083583 5 isaacshinman 2015-04-08 02:38:55 -0700 @Jer Noble: what do you mean by an "initially enabled audio track"? I have not seen a single working example anywhere on the web of filters working successfully on a createMediaElementSource. 1083618 6 jer.noble 2015-04-08 08:36:45 -0700 (In reply to comment #5) > @Jer Noble: what do you mean by an "initially enabled audio track"? I mean, when the AVAsset posts a notification that the asset's metadata is completely loaded, the single AVAssetTrack in the asset's tracks array is disabled. > I have > not seen a single working example anywhere on the web of filters working > successfully on a createMediaElementSource. I've got a few. I'm not saying there's not a bug here; just stating the nature of it. 1083622 7 jer.noble 2015-04-08 08:41:57 -0700 *** Bug 143510 has been marked as a duplicate of this bug. *** 1083623 8 250354 jer.noble 2015-04-08 08:43:55 -0700 Created attachment 250354 Patch 1083665 9 250354 commit-queue 2015-04-08 11:13:52 -0700 Comment on attachment 250354 Patch Clearing flags on attachment: 250354 Committed r182555: <http://trac.webkit.org/changeset/182555> 1083666 10 commit-queue 2015-04-08 11:13:57 -0700 All reviewed patches have been landed. Closing bug. 250354 2015-04-08 08:43:55 -0700 2015-04-08 11:13:52 -0700 Patch bug-143332-20150408084305.patch text/plain 9084 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyMzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjlhZjFiODg3ODdhNTc0 MTk4NWM5NDJjMzk1ZDY5YTlmMWM3NDA3NC4uNDJiYjIzYmVmYjMyODZkYTFmMWQ5ZmVhNTM5NGE0 Mzk1N2IzZTQwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDE1LTA0LTA3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCisgICAgICAgIFtNYWNdW1dlYkF1ZGlvXSBV cGRhdGUgdGhlIEFWQXVkaW9NaXggaW4gdGhlIEF1ZGlvU291cmNlUHJvdmlkZXJBVkZPYmpDIHdo ZW4gdGhlIGxpc3Qgb2YgZW5hYmxlZCBhdWRpbyB0cmFja3MgY2hhbmdlLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQzMzMyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU29tZSBtZWRpYSBhc3NldHMgKG5v dGFibHksIG1wM3MpIHdpbGwgbm90IGhhdmUgYW4gZW5hYmxlZCBhdWRpbyB0cmFjayB3aGVuIHRo ZSBBVkFzc2V0IGlzCisgICAgICAgIGZpcnN0IGxvYWRlZCwgc28gdGhlIEFWQXVkaW9NaXggd2ls bCBoYXZlIG5vIHRyYWNrSUQgaW4gaXQncyBwYXJhbWV0ZXJzLiBXaGVuZXZlciB0aGUgbGlzdAor ICAgICAgICBvZiBlbmFibGVkIHRyYWNrcyBjaGFuZ2UsIHJlY3JlYXRlIHRoZSBBVkF1ZGlvTWl4 IHdpdGggdGhlIG5ldyBmaXJzdCBlbmFibGVkIGF1ZGlvIHRyYWNrSUQuCisKKyAgICAgICAgVG8g ZmFjaWxpdGF0ZSB0aGlzLCBhZGQgYSBuZXcgc2V0dGVyIHRvIEF1ZGlvU291cmNlUHJvdmlkZXJB VkZPYmpDIHRha2luZyBhbiBBVkFzc2V0VHJhY2sgdG8KKyAgICAgICAgdXNlIHdpdGggdGhlIEFW QXVkaW9NaXguIFdoZW5ldmVyIHRoaXMgcGFyYW1ldGVyIGNoYW5nZXMsIHRoZSBBVkF1ZGlvTWl4 IGlzIGRlc3Ryb3llZCBhbmQKKyAgICAgICAgcmVjcmVhdGVkLgorCisgICAgICAgICogaHRtbC9I VE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6 Om1lZGlhUGxheWVyRW5naW5lVXBkYXRlZCk6IERyaXZlLWJ5IGZpeDogd2hlbiB0aGUgbWVkaWEK KyAgICAgICAgICAgIHBsYXllciBzd2l0Y2hlcyBlbmdpbmVzLCByZS1hc3NvY2lhdGUgdGhlIGF1 ZGlvIHNvdXJjZSBub2RlIHdpdGggaXRzIHByb3ZpZGVyLgorICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9BdWRpb1NvdXJjZVByb3ZpZGVyQVZGT2JqQy5oOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9BdWRpb1NvdXJjZVByb3ZpZGVyQVZG T2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvU291cmNlUHJvdmlkZXJBVkZPYmpDOjpz ZXRQbGF5ZXJJdGVtKTogT25seSBjcmVhdGUgdGhlIG1peCBpZiB0aGVyZSBpcyBhIHZhbGlkIEFW UGxheWVySXRlbSBhbmQgQVZBc3NldFRyYWNrCisgICAgICAgIChXZWJDb3JlOjpBdWRpb1NvdXJj ZVByb3ZpZGVyQVZGT2JqQzo6c2V0QXVkaW9UcmFjayk6IERpdHRvLgorICAgICAgICAoV2ViQ29y ZTo6QXVkaW9Tb3VyY2VQcm92aWRlckFWRk9iakM6OmNyZWF0ZU1peCk6IERvbid0IGl0ZXJhdGUg b3ZlciB0aGUgQVZQbGF5ZXJJdGVtJ3MgdHJhY2tzLAorICAgICAgICAgICAganVzdCB1c2UgdGhl IG9uZSBwYXNzZWQgaW4gdGhyb3VnaCBzZXRBdWRpb1RyYWNrKCkuCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0 aW9uT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRh dGlvbk9iakM6OmNhbmNlbExvYWQpOiBDbGVhciB0aGUgcHJvdmlkZXIncyB0cmFjay4KKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZUFW UGxheWVySXRlbSk6IFNldCB0aGUgcHJvdmlkZXIncyB0cmFjay4KKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnRyYWNrc0NoYW5nZWQpOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6 OmF1ZGlvU291cmNlUHJvdmlkZXIpOiBEaXR0by4KKworMjAxNS0wNC0wNyAgSmVyIE5vYmxlICA8 amVyLm5vYmxlQGFwcGxlLmNvbT4KKwogICAgICAgICBBZGQgYSBzZXR0aW5nICYgcmVzdHJpY3Rp b24gd2hpY2ggcHJldmVudHMgbm9uLWludGVyYWN0aXZ0ZSBwbGF5YmFjayBvZiBhdWRpYmxlIG1l ZGlhIGVsZW1lbnRzLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQzNDg2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmlu ZGV4IGFhZDVkZDJmNzYxMTc1ZDE1NDZjYzUzYTAxM2Y1YTAyMDQ2MGYwMDguLjZmMGEwMzM2YThm MTNkN2E5YWQ3MTEwZjM1N2M2Mzk4Y2Q5OTYyYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M TWVkaWFFbGVtZW50LmNwcApAQCAtNDI2OCw2ICs0MjY4LDE0IEBAIHZvaWQgSFRNTE1lZGlhRWxl bWVudDo6bWVkaWFQbGF5ZXJFbmdpbmVVcGRhdGVkKE1lZGlhUGxheWVyKikKIAogICAgIG1fbWVk aWFTZXNzaW9uLT5hcHBseU1lZGlhUGxheWVyUmVzdHJpY3Rpb25zKCp0aGlzKTsKIAorI2lmIEVO QUJMRShXRUJfQVVESU8pCisgICAgaWYgKG1fYXVkaW9Tb3VyY2VOb2RlICYmIGF1ZGlvU291cmNl UHJvdmlkZXIoKSkgeworICAgICAgICBtX2F1ZGlvU291cmNlTm9kZS0+bG9jaygpOworICAgICAg ICBhdWRpb1NvdXJjZVByb3ZpZGVyKCktPnNldENsaWVudChtX2F1ZGlvU291cmNlTm9kZSk7Cisg ICAgICAgIG1fYXVkaW9Tb3VyY2VOb2RlLT51bmxvY2soKTsKKyAgICB9CisjZW5kaWYKKwogI2lm IFBMQVRGT1JNKElPUykKICAgICBpZiAoIW1fcGxheWVyKQogICAgICAgICByZXR1cm47CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vQXVk aW9Tb3VyY2VQcm92aWRlckFWRk9iakMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2F2Zm91bmRhdGlvbi9BdWRpb1NvdXJjZVByb3ZpZGVyQVZGT2JqQy5oCmluZGV4IDkxY2Ux NjNhYzlhMzcyYjhlYjMyZjRlMjA2ZDE5ZTY1ZTMzYWZhMWQuLjJkMTc4ODVmMTc4Y2VlM2Y0MmYy ZjYyMWM1NWExZmJmZGEyNjVmZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9BdWRpb1NvdXJjZVByb3ZpZGVyQVZGT2JqQy5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9BdWRpb1NvdXJj ZVByb3ZpZGVyQVZGT2JqQy5oCkBAIC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSA8d3RmL1JlZlB0 ci5oPgogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KIAorT0JKQ19DTEFTUyBBVkFzc2V0VHJh Y2s7CiBPQkpDX0NMQVNTIEFWUGxheWVySXRlbTsKIE9CSkNfQ0xBU1MgQVZNdXRhYmxlQXVkaW9N aXg7CiAKQEAgLTU0LDYgKzU1LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgfkF1ZGlvU291cmNl UHJvdmlkZXJBVkZPYmpDKCk7CiAKICAgICB2b2lkIHNldFBsYXllckl0ZW0oQVZQbGF5ZXJJdGVt ICopOworICAgIHZvaWQgc2V0QXVkaW9UcmFjayhBVkFzc2V0VHJhY2sgKik7CiAKIHByaXZhdGU6 CiAgICAgQXVkaW9Tb3VyY2VQcm92aWRlckFWRk9iakMoQVZQbGF5ZXJJdGVtICopOwpAQCAtNzgs NiArODAsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcHJvY2VzcyhDTUl0ZW1Db3VudCBudW1iZXJG cmFtZXMsIE1UQXVkaW9Qcm9jZXNzaW5nVGFwRmxhZ3MgZmxhZ3NJbiwgQXVkaW9CdWZmZXJMaXN0 ICpidWZmZXJMaXN0SW5PdXQsIENNSXRlbUNvdW50ICpudW1iZXJGcmFtZXNPdXQsIE1UQXVkaW9Q cm9jZXNzaW5nVGFwRmxhZ3MgKmZsYWdzT3V0KTsKIAogICAgIFJldGFpblB0cjxBVlBsYXllckl0 ZW0+IG1fYXZQbGF5ZXJJdGVtOworICAgIFJldGFpblB0cjxBVkFzc2V0VHJhY2s+IG1fYXZBc3Nl dFRyYWNrOwogICAgIFJldGFpblB0cjxBVk11dGFibGVBdWRpb01peD4gbV9hdkF1ZGlvTWl4Owog ICAgIFJldGFpblB0cjxNVEF1ZGlvUHJvY2Vzc2luZ1RhcFJlZj4gbV90YXA7CiAgICAgUmV0YWlu UHRyPEF1ZGlvQ29udmVydGVyUmVmPiBtX2NvbnZlcnRlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9BdWRpb1NvdXJjZVByb3ZpZGVy QVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9BdWRpb1NvdXJjZVByb3ZpZGVyQVZGT2JqQy5tbQppbmRleCA0MTk0MjViM2U5MDg0MDYyOGNk YzZkZjQ1ZmZjZmYxNmI2YWQ3MDdiLi41N2ExMjI4ZDRmZGYwOGJkZDQ1YTgzZmFjNDliZTdlYzM5 ZDlmMjFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vQXVkaW9Tb3VyY2VQcm92aWRlckFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL0F1ZGlvU291cmNlUHJvdmlkZXJBVkZP YmpDLm1tCkBAIC0zOCw3ICszOCw2IEBACiAjaW1wb3J0IDxBVkZvdW5kYXRpb24vQVZBdWRpb01p eC5oPgogI2ltcG9ydCA8QVZGb3VuZGF0aW9uL0FWTWVkaWFGb3JtYXQuaD4KICNpbXBvcnQgPEFW Rm91bmRhdGlvbi9BVlBsYXllckl0ZW0uaD4KLSNpbXBvcnQgPEFWRm91bmRhdGlvbi9BVlBsYXll ckl0ZW1UcmFjay5oPgogI2ltcG9ydCA8b2JqYy9ydW50aW1lLmg+CiAjaW1wb3J0IDx3dGYvTWFp blRocmVhZC5oPgogCkBAIC0xNTEsNyArMTUwLDIxIEBAIHZvaWQgQXVkaW9Tb3VyY2VQcm92aWRl ckFWRk9iakM6OnNldFBsYXllckl0ZW0oQVZQbGF5ZXJJdGVtICphdlBsYXllckl0ZW0pCiAKICAg ICBtX2F2UGxheWVySXRlbSA9IGF2UGxheWVySXRlbTsKIAotICAgIGlmIChtX2NsaWVudCAmJiBt X2F2UGxheWVySXRlbSkKKyAgICBpZiAobV9jbGllbnQgJiYgbV9hdlBsYXllckl0ZW0gJiYgbV9h dkFzc2V0VHJhY2spCisgICAgICAgIGNyZWF0ZU1peCgpOworfQorCit2b2lkIEF1ZGlvU291cmNl UHJvdmlkZXJBVkZPYmpDOjpzZXRBdWRpb1RyYWNrKEFWQXNzZXRUcmFjayAqYXZBc3NldFRyYWNr KQoreworICAgIGlmIChtX2F2QXNzZXRUcmFjayA9PSBhdkFzc2V0VHJhY2spCisgICAgICAgIHJl dHVybjsKKworICAgIGlmIChtX2F2QXVkaW9NaXgpCisgICAgICAgIGRlc3Ryb3lNaXgoKTsKKwor ICAgIG1fYXZBc3NldFRyYWNrID0gYXZBc3NldFRyYWNrOworCisgICAgaWYgKG1fY2xpZW50ICYm IG1fYXZQbGF5ZXJJdGVtICYmIG1fYXZBc3NldFRyYWNrKQogICAgICAgICBjcmVhdGVNaXgoKTsK IH0KIApAQCAtMTkwLDE1ICsyMDMsOCBAQCB2b2lkIEF1ZGlvU291cmNlUHJvdmlkZXJBVkZPYmpD OjpjcmVhdGVNaXgoKQogICAgIFJldGFpblB0cjxBVk11dGFibGVBdWRpb01peElucHV0UGFyYW1l dGVycz4gcGFyYW1ldGVycyA9IGFkb3B0TlMoW2FsbG9jQVZNdXRhYmxlQXVkaW9NaXhJbnB1dFBh cmFtZXRlcnNJbnN0YW5jZSgpIGluaXRdKTsKICAgICBbcGFyYW1ldGVycyBzZXRBdWRpb1RhcFBy b2Nlc3NvcjptX3RhcC5nZXQoKV07CiAKLSAgICBDTVBlcnNpc3RlbnRUcmFja0lEIGZpcnN0RW5h YmxlZEF1ZGlvVHJhY2tJRCA9IGtDTVBlcnNpc3RlbnRUcmFja0lEX0ludmFsaWQ7Ci0gICAgTlNB cnJheSogdHJhY2tzID0gW21fYXZQbGF5ZXJJdGVtIHRyYWNrc107Ci0gICAgZm9yIChBVlBsYXll ckl0ZW1UcmFjayogdHJhY2sgaW4gdHJhY2tzKSB7Ci0gICAgICAgIGlmIChbdHJhY2suYXNzZXRU cmFjayBoYXNNZWRpYUNoYXJhY3RlcmlzdGljOkFWTWVkaWFDaGFyYWN0ZXJpc3RpY0F1ZGlibGVd ICYmIHRyYWNrLmVuYWJsZWQpIHsKLSAgICAgICAgICAgIGZpcnN0RW5hYmxlZEF1ZGlvVHJhY2tJ RCA9IHRyYWNrLmFzc2V0VHJhY2sudHJhY2tJRDsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICB9Ci0gICAgfQotICAgIFtwYXJhbWV0ZXJzIHNldFRyYWNrSUQ6Zmlyc3RFbmFibGVkQXVkaW9U cmFja0lEXTsKKyAgICBDTVBlcnNpc3RlbnRUcmFja0lEIHRyYWNrSUQgPSBtX2F2QXNzZXRUcmFj ay5nZXQoKS50cmFja0lEOworICAgIFtwYXJhbWV0ZXJzIHNldFRyYWNrSUQ6dHJhY2tJRF07CiAg ICAgCiAgICAgW21fYXZBdWRpb01peCBzZXRJbnB1dFBhcmFtZXRlcnM6QFtwYXJhbWV0ZXJzLmdl dCgpXV07CiAgICAgW21fYXZQbGF5ZXJJdGVtIHNldEF1ZGlvTWl4Om1fYXZBdWRpb01peC5nZXQo KV07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQppbmRleCBlNGFkZGNmNWRkOGZiYTdmMjA3ZThjZDc1 OWRhMGU5MjE2M2RmYmQxLi5hYWVkMmVkY2NjYzlkYTg0ODg2N2E3ZWM1MWE3MmQ4MTM2ZDg5Yzgw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRp b24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KQEAgLTM0OSw2ICszNDksNyBAQCBzdGF0aWMgTlNB cnJheSAqYXNzZXRNZXRhZGF0YUtleU5hbWVzKCk7CiBzdGF0aWMgTlNBcnJheSAqaXRlbUtWT1By b3BlcnRpZXMoKTsKIHN0YXRpYyBOU0FycmF5ICphc3NldFRyYWNrTWV0YWRhdGFLZXlOYW1lcygp Owogc3RhdGljIE5TQXJyYXkgKnBsYXllcktWT1Byb3BlcnRpZXMoKTsKK3N0YXRpYyBBVkFzc2V0 VHJhY2sqIGZpcnN0RW5hYmxlZFRyYWNrKE5TQXJyYXkqIHRyYWNrcyk7CiAKICNpZiAhTE9HX0RJ U0FCTEVECiBzdGF0aWMgY29uc3QgY2hhciAqYm9vbFN0cmluZyhib29sIHZhbCkKQEAgLTU2Niw4 ICs1NjcsMTAgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjYW5j ZWxMb2FkKCkKICAgICBtX2NhY2hlZFRyYWNrcyA9IG51bGxwdHI7CiAKICNpZiBFTkFCTEUoV0VC X0FVRElPKSAmJiBVU0UoTUVESUFUT09MQk9YKQotICAgIGlmIChtX3Byb3ZpZGVyKQorICAgIGlm IChtX3Byb3ZpZGVyKSB7CiAgICAgICAgIG1fcHJvdmlkZXItPnNldFBsYXllckl0ZW0obnVsbHB0 cik7CisgICAgICAgIG1fcHJvdmlkZXItPnNldEF1ZGlvVHJhY2sobnVsbHB0cik7CisgICAgfQog I2VuZGlmCiAKICAgICBzZXRJZ25vcmVMb2FkU3RhdGVDaGFuZ2VzKGZhbHNlKTsKQEAgLTk5OCw4 ICsxMDAxLDEwIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3Jl YXRlQVZQbGF5ZXJJdGVtKCkKICNlbmRpZgogCiAjaWYgRU5BQkxFKFdFQl9BVURJTykgJiYgVVNF KE1FRElBVE9PTEJPWCkKLSAgICBpZiAobV9wcm92aWRlcikKKyAgICBpZiAobV9wcm92aWRlcikg ewogICAgICAgICBtX3Byb3ZpZGVyLT5zZXRQbGF5ZXJJdGVtKG1fYXZQbGF5ZXJJdGVtLmdldCgp KTsKKyAgICAgICAgbV9wcm92aWRlci0+c2V0QXVkaW9UcmFjayhmaXJzdEVuYWJsZWRUcmFjayhb bV9hdkFzc2V0IHRyYWNrc1dpdGhNZWRpYUNoYXJhY3RlcmlzdGljOkFWTWVkaWFDaGFyYWN0ZXJp c3RpY0F1ZGlibGVdKSk7CisgICAgfQogI2VuZGlmCiAKICAgICBzZXREZWxheUNhbGxiYWNrcyhm YWxzZSk7CkBAIC0xOTE3LDYgKzE5MjIsMTEgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDOjp0cmFja3NDaGFuZ2VkKCkKICAgICBpZiAocHJpbWFyeUF1ZGlvVHJhY2tM YW5ndWFnZSAhPSBsYW5ndWFnZU9mUHJpbWFyeUF1ZGlvVHJhY2soKSkKICAgICAgICAgY2hhcmFj dGVyaXN0aWNzQ2hhbmdlZCgpOwogCisjaWYgRU5BQkxFKFdFQl9BVURJTykgJiYgVVNFKE1FRElB VE9PTEJPWCkKKyAgICBpZiAobV9wcm92aWRlcikKKyAgICAgICAgbV9wcm92aWRlci0+c2V0QXVk aW9UcmFjayhmaXJzdEVuYWJsZWRUcmFjayhbbV9hdkFzc2V0IHRyYWNrc1dpdGhNZWRpYUNoYXJh Y3RlcmlzdGljOkFWTWVkaWFDaGFyYWN0ZXJpc3RpY0F1ZGlibGVdKSk7CisjZW5kaWYKKwogICAg IHNldERlbGF5Q2hhcmFjdGVyaXN0aWNzQ2hhbmdlZE5vdGlmaWNhdGlvbihmYWxzZSk7CiB9CiAK QEAgLTIxMjcsOCArMjEzNywxMSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlv bk9iakM6OnNldFRleHRUcmFja1JlcHJlc2VudGF0aW9uKFRleHRUcmFja1JlcAogI2lmIEVOQUJM RShXRUJfQVVESU8pICYmIFVTRShNRURJQVRPT0xCT1gpCiBBdWRpb1NvdXJjZVByb3ZpZGVyKiBN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjphdWRpb1NvdXJjZVByb3ZpZGVyKCkK IHsKLSAgICBpZiAoIW1fcHJvdmlkZXIpCisgICAgaWYgKCFtX3Byb3ZpZGVyKSB7CiAgICAgICAg IG1fcHJvdmlkZXIgPSBBdWRpb1NvdXJjZVByb3ZpZGVyQVZGT2JqQzo6Y3JlYXRlKG1fYXZQbGF5 ZXJJdGVtLmdldCgpKTsKKyAgICAgICAgbV9wcm92aWRlci0+c2V0QXVkaW9UcmFjayhmaXJzdEVu YWJsZWRUcmFjayhbbV9hdkFzc2V0IHRyYWNrc1dpdGhNZWRpYUNoYXJhY3RlcmlzdGljOkFWTWVk aWFDaGFyYWN0ZXJpc3RpY0F1ZGlibGVdKSk7CisgICAgfQorCiAgICAgcmV0dXJuIG1fcHJvdmlk ZXIuZ2V0KCk7CiB9CiAjZW5kaWYK