229799 2021-09-02 04:40:47 -0700 Safari TP 131 audio canPlayType() reports false negatives 2024-10-23 07:52:00 -0700 1 1 1 Unclassified WebKit Media Safari Technology Preview Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=226922 https://bugs.webkit.org/show_bug.cgi?id=227110 InRadar P2 Normal --- 1 ashley jean-yves.avenard bvibber calvaris cdumez changseok eric.carlson esprehn+autocc ews-watchlist gatewail09 glenn gyuyoung.kim hartman.wiki jean-yves.avenard jer.noble moonlight philipj sergio webkit-bug-importer youennf oldest_to_newest 1789663 0 ashley 2021-09-02 04:40:47 -0700 In Safari TP 131, three audio formats can play with both <audio> and Web Audio, but report an empty string (indicating no support) via the canPlayType method. Test URL: https://downloads.scirra.com/labs/audioCodecTests/ For the formats PCM WAV, WebM Vorbis and WebM Opus, observe the reported result for "HTML5 audio support". Observed result: all three cases report an empty string, even though it is supported. Expected result: "probably" or "maybe" result, indicating support. 1789685 1 gsnedders 2021-09-02 06:19:17 -0700 The lie was added in bug 226922 (to deal with the disparity between <audio> and decodeAudioData), but its fix said "Will be reverted once bug 227110 lands". however, bug 227110 has now landed and it's not been reverted. 1790567 2 webkit-bug-importer 2021-09-05 13:34:26 -0700 <rdar://problem/82776747> 1791309 3 bvibber 2021-09-07 18:47:16 -0700 This affects video codecs as well as audio; canPlayType() reports '' for 'video/webm; codecs="vp8"' and 'video/webm; codecs="vp9"' even if they play back just fine in <video>. Same behavior on TP 131 and the current beta of Monterey. This is a hard blocker for us being able to switch from WebAssembly decoding to native playback of WebM video on Wikipedia. 1791357 4 jean-yves.avenard 2021-09-07 22:11:07 -0700 (In reply to Brion Vibber from comment #3) > This affects video codecs as well as audio; canPlayType() reports '' for > 'video/webm; codecs="vp8"' and 'video/webm; codecs="vp9"' even if they play > back just fine in <video>. > > Same behavior on TP 131 and the current beta of Monterey. > > This is a hard blocker for us being able to switch from WebAssembly decoding > to native playback of WebM video on Wikipedia. canPlayType will only return "" if either "opus" or "vorbis" was specified in the codec string. It wouldn't affect type with just video. Here are the results for the various queries https://jyavenard.github.io/htmltests/tests/canPlayType.html v.canPlayType("video/mp4; codecs="avc1.42E01E") = probably v.canPlayType("video/mp4; codecs="vp9") = v.canPlayType("video/mp4; codecs="av1") = v.canPlayType("video/mp4; codecs="opus") = v.canPlayType("video/mp4; codecs="vorbis") = v.canPlayType("video/mp4; codecs="vp8") = v.canPlayType("video/webm; codecs="avc1.42E01E") = v.canPlayType("video/webm; codecs="vp9") = probably v.canPlayType("video/webm; codecs="av1") = v.canPlayType("video/webm; codecs="opus") = v.canPlayType("video/webm; codecs="vorbis") = v.canPlayType("video/webm; codecs="vp8") = probably as you can see, when you specify vp8 and vp9 codec, the answer is "probably" 1791359 5 jean-yves.avenard 2021-09-07 22:13:04 -0700 Note that when checking for MediaSource.isTypeSupported() the answer will be correct. 1791364 6 437595 jean-yves.avenard 2021-09-07 22:41:03 -0700 Created attachment 437595 Patch 1791397 7 437595 youennf 2021-09-08 00:39:17 -0700 Comment on attachment 437595 Patch EWS WK1 errors seem unrelated. Relaunching bots to be sure. 1791426 8 437595 jean-yves.avenard 2021-09-08 03:41:11 -0700 Comment on attachment 437595 Patch Thanks for the review. Yes, errors were unrelated. 1791427 9 ews-feeder 2021-09-08 04:01:25 -0700 Committed r282137 (241434@main): <https://commits.webkit.org/241434@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437595. 1795017 10 ashley 2021-09-20 04:12:33 -0700 This still reproduces in Safari TP 132. It will be a shame if Safari ships new audio codec support but they all feature detect as unavailable. 1795037 11 jean-yves.avenard 2021-09-20 06:01:29 -0700 (In reply to Ashley Gullen from comment #10) > This still reproduces in Safari TP 132. It will be a shame if Safari ships > new audio codec support but they all feature detect as unavailable. Until the code makes its way to Safari TP; you will need to check in the experimental features "WebM Web Audio" 1795135 12 ashley 2021-09-20 10:16:37 -0700 Sorry, I'm confused - the actual support for playback of the codecs already works. The only thing not working is the feature detection, i.e. whether canPlayType() indicates support. Why would that still be marked an experimental feature or not have arrived in Safari TP yet? 1795357 13 bvibber 2021-09-20 16:49:31 -0700 On Safari 15.0 shipped today; tested both Intel and ARM: document.createElement('video').canPlayType('video/webm; codecs="vp8, vorbis"') == '' However, Vorbis+VP8 WebM files seem to play in a <video> just fine. 1795372 14 jean-yves.avenard 2021-09-20 17:32:45 -0700 It didn't make it for STP 132 (https://webkit.org/blog/11971/release-notes-for-safari-technology-preview-132/) should be in STP 133 1795373 15 jean-yves.avenard 2021-09-20 17:39:07 -0700 (In reply to Ashley Gullen from comment #12) > Sorry, I'm confused - the actual support for playback of the codecs already > works. The only thing not working is the feature detection, i.e. whether > canPlayType() indicates support. Why would that still be marked an > experimental feature or not have arrived in Safari TP yet? Because while the video and audio element do support webm; web audio however didn't and broke major sites as web audio doesn't have its own canPlayType() method. So the decision was made to make canPlayType returns false if vorbis or opus codec was specified so that sites wouldn't attempt to use web audio with this content while allowing playback to still works. It's an unfortunate set of circumstances, and as with all workarounds bring other set of issues. We've worked hard to fix as early as we could and with STP 133, web audio works with webm content and the workaround is removed. 1795377 16 bvibber 2021-09-20 18:02:41 -0700 Will this ship in a point release to Safari in the near future, or should I plan to have a workaround that patches HTMLMediaElement.prototype.canPlayType so that regular video playback libraries start working again? Thanks for your time. 1795380 17 bvibber 2021-09-20 18:06:47 -0700 (In the worst case, for now I can rewrite my input data to remove the codec string for VP8+Vorbis files, since canPlayType('video/webm') returns 'probably' and that's the assumed-default codec selection for WebM.) 1827705 18 ashley 2022-01-03 06:40:50 -0800 In Safari 15.2 the WebM tests now match canPlayType() (indicating it is not supported, and actually trying it also fails), but the PCM WAV support is still inconsistent: canPlayType() indicates it is not supported, but it does work when it is actually used. My original issue did mention this. Should I file a new issue? 1827743 19 ashley 2022-01-03 08:19:04 -0800 Actually it looks like it still reproduces in macOS. It's consistent on an iPad but in Safari 15.2 on macOS it can play the WebM formats but canPlayType() reports it cannot via an empty string. So this does not appear to be fixed. 1827813 20 jean-yves.avenard 2022-01-03 13:41:10 -0800 (In reply to Ashley Gullen from comment #18) > In Safari 15.2 the WebM tests now match canPlayType() (indicating it is not > supported, and actually trying it also fails), but the PCM WAV support is > still inconsistent: canPlayType() indicates it is not supported, but it does > work when it is actually used. My original issue did mention this. Should I > file a new issue? Please file a new bug for PCM support For webm, which macOS version are you using? 1827914 21 ashley 2022-01-04 05:50:06 -0800 I used macOS 12.1 on a M1 Macbook. I filed bug 234840 for PCM WAV. 1827920 22 hartman.wiki 2022-01-04 06:14:35 -0800 Yes Safari 15.2 is STILL broken, but WTP is fixed. I guess knowing Apple this means that this fix won't arrive before spring now. Very much a shame that the feature test for something as important as VP9 is broken for over a YEAR after the feature got released. In the mean time.. if you use feature detection to load a player, you can consider testing for: video/webm: codecs="vp9" AND audio/webm: codecs="opus". This works around the bug. 1829036 23 hartman.wiki 2022-01-07 12:50:01 -0800 BTW, eventually I settled on MediaSource.isTypeSupported( 'video/webm; codecs="vp9, opus"' ) as the workaround and patched that into the canPlayType function of videojs. So somewhere next week if all things go right, Wikipedia will finally be able to use native VP9 decoding on Desktop Safari for Macs from 2018 and later. (rest will still use wasm software decoder) 2051606 24 gatewail09 2024-08-08 21:59:36 -0700 Yes Safari 15.2 is STILL broken, but WTP is fixed. I guess knowing Apple this means that this fix won't arrive before spring now. Very much a shame that the feature test for something as important as VP9 is broken for over a YEAR after the feature got released. In the mean time.. if you use feature detection to load a player, you can consider testing for: video/webm: codecs="vp9" AND audio/webm: codecs="opus". This works around the bug. https://leveldevildash.com/ 2070077 25 moonlight 2024-10-23 07:52:00 -0700 The issue you've mentioned regarding Safari TP 131's audio canPlayType() function reporting false negatives seems to be a bug or a limitation in the Technology Preview version of Safari. It's important to note that Technology Previews are beta versions of Safari meant for developers to test upcoming features and updates. https://jfif2.com/ 437595 2021-09-07 22:41:03 -0700 2021-09-08 04:01:26 -0700 Patch bug-229799-20210908154101.patch text/plain 8900 jean-yves.avenard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDJiYzJlYmI2MjIyNGJiZTExNGU5Yzgx YjEzOWIwMTYzYmFiMjBiODAuLmE2YjZlNWJjMjlmYWI4OGFmMTZhYzA0ODYzOTkyMjE1NmJkMGFm M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDktMDcgIEplYW4tWXZlcyBBdmVuYXJkICA8 anlhQGFwcGxlLmNvbT4KKworICAgICAgICBTYWZhcmkgVFAgMTMxIGF1ZGlvIGNhblBsYXlUeXBl KCkgcmVwb3J0cyBmYWxzZSBuZWdhdGl2ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyOTc5OQorICAgICAgICByZGFyOi8vcHJvYmxlbS84Mjc3Njc0 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2Ny aXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0V4cGVyaW1lbnRhbC55YW1sOiBSZW1vdmUg cHJlZmVyZW5jZS4KKwogMjAyMS0wOC0yNCAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUu Y29tPgogCiAgICAgICAgIFtKU0NdIEFkZCBJbnRsIEVudW1lcmF0aW9uIEFQSXMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCA0YjFjMzlhOThiYjYzZGQzOGI3ZDQ5ZTQzMWU3MTU1YjY2YzFkY2VkLi41NzNjMjZlMmY2 NWI4ODRjMmQ0MzVkOTJkYzA1YTE4ZGVkZTQ1ZGRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMjEtMDktMDcgIEplYW4tWXZlcyBBdmVuYXJkICA8anlhQGFwcGxlLmNvbT4KKworICAg ICAgICBTYWZhcmkgVFAgMTMxIGF1ZGlvIGNhblBsYXlUeXBlKCkgcmVwb3J0cyBmYWxzZSBuZWdh dGl2ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy OTc5OQorICAgICAgICByZGFyOi8vcHJvYmxlbS84Mjc3Njc0NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHdlYmF1ZGlvIG5vdyBzdXBwb3J0cyB0aGUg c2FtZSB3ZWJtIGNvbnRlbnQgYXMgdGhlIHZpZGVvIGFuZCBhdWRpbyBlbGVtZW50LAorICAgICAg ICBtYWtpbmcgdGhpcyB3b3JrYXJvdW5kIG5vIGxvbmdlciBuZWNlc3NhcnkuCisKKyAgICAgICAg KiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlh RWxlbWVudDo6Y2FuUGxheVR5cGUgY29uc3QpOiBSZW1vdmUgd29yayBhcm91bmQKKyAgICAgICAg KiBwYWdlL1J1bnRpbWVFbmFibGVkRmVhdHVyZXMuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJ1bnRp bWVFbmFibGVkRmVhdHVyZXM6OndlYk1QYXJzZXJFbmFibGVkIGNvbnN0KTogUmVtb3ZlIG5vdyB1 bnVzZWQgbWV0aG9kLgorCiAyMDIxLTA5LTA3ICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBs ZS5jb20+CiAKICAgICAgICAgRGVjb2Rpbmcgd2VibSBmaWxlIHdpdGggbW9yZSB0aGFuIDIgY2hh bm5lbHMgd2lsbCBmYWlsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM3ZGI4NGMzNmJlNGQ5NmU5MzNjM2RhYzI5ZTdm ZmU4MGFjYTMxZjIuLmZhZGQzNjVjMzc4ZDgzODJjNjA4MmMyOWYzMTU5MWIyYzNmOGY0ODQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDktMDcgIEplYW4tWXZlcyBBdmVuYXJkICA8 anlhQGFwcGxlLmNvbT4KKworICAgICAgICBTYWZhcmkgVFAgMTMxIGF1ZGlvIGNhblBsYXlUeXBl KCkgcmVwb3J0cyBmYWxzZSBuZWdhdGl2ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyOTc5OQorICAgICAgICByZGFyOi8vcHJvYmxlbS84Mjc3Njc0 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hh cmVkL1dlYlByZWZlcmVuY2VzRGVmYXVsdFZhbHVlcy5jcHA6CisgICAgICAgICogU2hhcmVkL1dl YlByZWZlcmVuY2VzRGVmYXVsdFZhbHVlcy5oOiBSZW1vdmUgbm8gbG9uZ2VyIHVzZWQgbWV0aG9k LgorCiAyMDIxLTA4LTI0ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgW1dLMl0gSW1wbGVtZW50IHByb2Nlc3Mtc3dhcHBpbmcgYmFzZWQgb24gQ3Jvc3MtT3JpZ2lu LU9wZW5lci1Qb2xpY3kgSFRUUCBoZWFkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdh Y3kvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwppbmRl eCA0NWE1NDg2ZTA1ODA1ZDk3YmMxZTQ4YjQ0ZjkzZGEzMDMyOGE2YTFkLi4wYzdmOTIxMTdkNDRj MmQzMjlhZDBiMGI2YzRiYmVmMWFkYTYwYjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVn YWN5L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDktMDcgIEplYW4tWXZlcyBBdmVuYXJkICA8anlhQGFw cGxlLmNvbT4KKworICAgICAgICBTYWZhcmkgVFAgMTMxIGF1ZGlvIGNhblBsYXlUeXBlKCkgcmVw b3J0cyBmYWxzZSBuZWdhdGl2ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyOTc5OQorICAgICAgICByZGFyOi8vcHJvYmxlbS84Mjc3Njc0NworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViVmlldy9X ZWJQcmVmZXJlbmNlc0RlZmF1bHRWYWx1ZXMuaDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYlByZWZl cmVuY2VzRGVmYXVsdFZhbHVlcy5tbTogUmVtb3ZlIG5vIGxvbmdlciB1c2VkIG1ldGhvZC4KKwog MjAyMS0wOC0yNCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFtX SzJdIEltcGxlbWVudCBwcm9jZXNzLXN3YXBwaW5nIGJhc2VkIG9uIENyb3NzLU9yaWdpbi1PcGVu ZXItUG9saWN5IEhUVFAgaGVhZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL1NjcmlwdHMvUHJl ZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNFeHBlcmltZW50YWwueWFtbCBiL1NvdXJjZS9XVEYvU2Ny aXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0V4cGVyaW1lbnRhbC55YW1sCmluZGV4IDE4 NWE1YWMwZjQ1NGM3NmMwMzQ3OTJhZDE4NTc2MWZjY2E2OTQ5OTEuLjUxMjM4NDA5MDQ2ZjBmZDQ3 Yjk5NGU2NmY5MjAyZjJkNTZmODI2ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvU2NyaXB0cy9Q cmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0V4cGVyaW1lbnRhbC55YW1sCisrKyBiL1NvdXJjZS9X VEYvU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0V4cGVyaW1lbnRhbC55YW1sCkBA IC0xMzA4LDE4ICsxMzA4LDYgQEAgV2ViTVBhcnNlckVuYWJsZWQ6CiAgICAgV2ViS2l0OgogICAg ICAgZGVmYXVsdDogV2ViS2l0OjpkZWZhdWx0V2ViTVBhcnNlckVuYWJsZWQoKQogCi1XZWJNV2Vi QXVkaW9FbmFibGVkOgotICB0eXBlOiBib29sCi0gIHdlYmNvcmVCaW5kaW5nOiBSdW50aW1lRW5h YmxlZEZlYXR1cmVzCi0gIGh1bWFuUmVhZGFibGVOYW1lOiAiV2ViTSBXZWIgQXVkaW8iCi0gIGh1 bWFuUmVhZGFibGVEZXNjcmlwdGlvbjogIkVuYWJsZSBXZWJNIFdlYiBBdWRpbyIKLSAgY29uZGl0 aW9uOiBFTkFCTEUoTUVESUFfU09VUkNFKQotICBkZWZhdWx0VmFsdWU6Ci0gICAgV2ViS2l0TGVn YWN5OgotICAgICAgZGVmYXVsdDogV2ViS2l0OjpkZWZhdWx0V2ViTVdlYkF1ZGlvRW5hYmxlZCgp Ci0gICAgV2ViS2l0OgotICAgICAgZGVmYXVsdDogV2ViS2l0OjpkZWZhdWx0V2ViTVdlYkF1ZGlv RW5hYmxlZCgpCi0KICMgRklYTUU6IElzIHRoaXMgaW1wbGVtZW50ZWQgZm9yIFdlYktpdExlZ2Fj eT8gSWYgbm90LCB0aGlzIHNob3VsZCBiZSBleGNsdWRlZCBmcm9tIFdlYktpdExlZ2FjeSBlbnRp cmVseS4KIFdlYlJUQ0gyNjRMb3dMYXRlbmN5RW5jb2RlckVuYWJsZWQ6CiAgIHR5cGU6IGJvb2wK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IGNiOWRlNzE0ZDgw OTlhMjFiYTFmY2I1ZDRiMTAzYzBlNWRmMzUyZDUuLmY5YTM2ZTY0MWFiOWY0ZGUzMDkwNzhlMmIw OTk5NzAxNTc5YTA1OTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNw cApAQCAtMTA2MCwxNSArMTA2MCw2IEBAIEhUTUxNZWRpYUVsZW1lbnQ6Ok5ldHdvcmtTdGF0ZSBI VE1MTWVkaWFFbGVtZW50OjpuZXR3b3JrU3RhdGUoKSBjb25zdAogICAgIHJldHVybiBtX25ldHdv cmtTdGF0ZTsKIH0KIAotc3RhdGljIGlubGluZSBib29sIHdlYk1XZWJBdWRpb0VuYWJsZWQoKQot ewotI2lmIEVOQUJMRShNRURJQV9TT1VSQ0UpCi0gICAgcmV0dXJuIFJ1bnRpbWVFbmFibGVkRmVh dHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkud2ViTVdlYkF1ZGlvRW5hYmxlZCgpOwotI2Vsc2UKLSAg ICByZXR1cm4gZmFsc2U7Ci0jZW5kaWYKLX0KLQogU3RyaW5nIEhUTUxNZWRpYUVsZW1lbnQ6OmNh blBsYXlUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpIGNvbnN0CiB7CiAgICAgTWVkaWFFbmdp bmVTdXBwb3J0UGFyYW1ldGVycyBwYXJhbWV0ZXJzOwpAQCAtMTA3OCwxNCArMTA2OSw2IEBAIFN0 cmluZyBIVE1MTWVkaWFFbGVtZW50OjpjYW5QbGF5VHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBl KSBjb25zdAogICAgIE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgc3VwcG9ydCA9IE1lZGlhUGxh eWVyOjpzdXBwb3J0c1R5cGUocGFyYW1ldGVycyk7CiAgICAgU3RyaW5nIGNhblBsYXk7CiAKLSNp ZiBQTEFURk9STShDT0NPQSkKLSAgICAvLyBUZW1wb3JhcmlseSB3b3JrIGFyb3VuZCBidWcgMjI2 OTIyLiBGb3Igbm93IGNsYWltIHRoYXQgdGhlIG9wdXMgYW5kIHZvcmJpcyBjb2RlY3MgYXJlbid0 IHN1cHBvcnRlZAotICAgIC8vIHNvIHRoYXQgc2l0ZXMgcmVseWluZyBvbiB0aGlzIHRlc3QgdG8g ZGV0ZXJtaW5lIGlmIHdlYmF1ZGlvIHVzZSBvZiBvcHVzIG9yIHZvcmJpcyB3b24ndCBlcnJvci4K LSAgICBhdXRvIGNvZGVjcyA9IGNvbnRlbnRUeXBlLmNvZGVjcygpOwotICAgIGlmIChzdXBwb3J0 ID09IE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGU6OklzU3VwcG9ydGVkICYmICgoY29kZWNzLmNv bnRhaW5zKCJvcHVzIikgfHwgY29kZWNzLmNvbnRhaW5zKCJ2b3JiaXMiKSkgJiYgIXdlYk1XZWJB dWRpb0VuYWJsZWQoKSkpCi0gICAgICAgIHN1cHBvcnQgPSBNZWRpYVBsYXllcjo6U3VwcG9ydHNU eXBlOjpJc05vdFN1cHBvcnRlZDsKLSNlbmRpZgotCiAgICAgLy8gNC44LjEwLjMKICAgICBzd2l0 Y2ggKHN1cHBvcnQpCiAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9SdW50 aW1lRW5hYmxlZEZlYXR1cmVzLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1J1bnRpbWVFbmFibGVk RmVhdHVyZXMuaAppbmRleCBjOTczODZmZTkxMTg5NDM2MTIyM2VlYTA5YzYxMmViYjRiY2U4ZTk1 Li4yYzU1NDg3OTk3OGY3ZTUwOTcxNWVjMWNmNmE0ZmQyZDcxZTdkMjUwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1J1bnRpbWVFbmFibGVkRmVhdHVyZXMuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1J1bnRpbWVFbmFibGVkRmVhdHVyZXMuaApAQCAtMjM1LDggKzIzNSw2IEBA IHB1YmxpYzoKICNpZiBFTkFCTEUoTUVESUFfU09VUkNFKQogICAgIHZvaWQgc2V0V2ViTVBhcnNl ckVuYWJsZWQoYm9vbCBpc0VuYWJsZWQpIHsgbV93ZWJNUGFyc2VyRW5hYmxlZCA9IGlzRW5hYmxl ZDsgfQogICAgIGJvb2wgd2ViTVBhcnNlckVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX3dlYk1Q YXJzZXJFbmFibGVkOyB9Ci0gICAgdm9pZCBzZXRXZWJNV2ViQXVkaW9FbmFibGVkKGJvb2wgaXNF bmFibGVkKSB7IG1fd2ViTVdlYkF1ZGlvRW5hYmxlZCA9IGlzRW5hYmxlZDsgfQotICAgIGJvb2wg d2ViTVdlYkF1ZGlvRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fd2ViTVdlYkF1ZGlvRW5hYmxl ZDsgfQogI2VuZGlmCiAKICNpZiBIQVZFKENFTEVTVElBTCkKQEAgLTM3Nyw3ICszNzUsNiBAQCBw cml2YXRlOgogCiAjaWYgRU5BQkxFKE1FRElBX1NPVVJDRSkKICAgICBib29sIG1fd2ViTVBhcnNl ckVuYWJsZWQgeyBmYWxzZSB9OwotICAgIGJvb2wgbV93ZWJNV2ViQXVkaW9FbmFibGVkIHsgZmFs c2UgfTsKICNlbmRpZgogCiAjaWYgSEFWRShDRUxFU1RJQUwpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmF1bHRWYWx1ZXMuY3BwIGIvU291cmNlL1dl YktpdC9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZhdWx0VmFsdWVzLmNwcAppbmRleCA4YjI0MDYx ODAzMDRhYzRmMTNiM2ExYjYwY2UxNTBlOWM1MzViYjA4Li5mNmZhMTJlODYxZmY0ZjBhZTYxNDVi NzM3YWE5NjI1ODA2NTc5MTk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQ cmVmZXJlbmNlc0RlZmF1bHRWYWx1ZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dl YlByZWZlcmVuY2VzRGVmYXVsdFZhbHVlcy5jcHAKQEAgLTMxNCwxMSArMzE0LDYgQEAgYm9vbCBk ZWZhdWx0V2ViTVBhcnNlckVuYWJsZWQoKQogICAgIHJldHVybiBpc0ZlYXR1cmVGbGFnRW5hYmxl ZCgid2VibV9wYXJzZXIiLCB0cnVlKTsKIH0KIAotYm9vbCBkZWZhdWx0V2ViTVdlYkF1ZGlvRW5h YmxlZCgpCi17Ci0gICAgcmV0dXJuIGlzRmVhdHVyZUZsYWdFbmFibGVkKCJ3ZWJtX3dlYmF1ZGlv IiwgZmFsc2UpOwotfQotCiAjZW5kaWYgLy8gRU5BQkxFKE1FRElBX1NPVVJDRSkKIAogI2lmIEVO QUJMRShNRURJQV9TRVNTSU9OX0NPT1JESU5BVE9SKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZhdWx0VmFsdWVzLmggYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9XZWJQcmVmZXJlbmNlc0RlZmF1bHRWYWx1ZXMuaAppbmRleCBjN2FmMGNiODE2NjRkZTAw NGVmMzRmY2VjN2QxN2M4N2FkMTJjYTY5Li5hYzFiN2RhNjVhNmZjOGNkZWMzMmYwY2FmNDc5ZmRl OWU3ZGNlZjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNl c0RlZmF1bHRWYWx1ZXMuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNl c0RlZmF1bHRWYWx1ZXMuaApAQCAtMTAzLDcgKzEwMyw2IEBAIGJvb2wgZGVmYXVsdFZQOVNXRGVj b2RlckVuYWJsZWRPbkJhdHRlcnkoKTsKIAogI2lmIEVOQUJMRShNRURJQV9TT1VSQ0UpCiBib29s IGRlZmF1bHRXZWJNUGFyc2VyRW5hYmxlZCgpOwotYm9vbCBkZWZhdWx0V2ViTVdlYkF1ZGlvRW5h YmxlZCgpOwogI2VuZGlmCiAKICNpZiBFTkFCTEUoTUVESUFfU0VTU0lPTl9DT09SRElOQVRPUikK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5j ZXNEZWZhdWx0VmFsdWVzLmggYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlBy ZWZlcmVuY2VzRGVmYXVsdFZhbHVlcy5oCmluZGV4IDE4MjA5ZDRiMzlhNGYyMGQ2M2EzN2I2MTE3 YzU3MjVjZWZmMjkxZDYuLjk5NmQ2M2E3YTA0NDNiMTFmNzI5YzhmNmY5OWIxMjQwNzBhYjNkYWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5j ZXNEZWZhdWx0VmFsdWVzLmgKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9X ZWJQcmVmZXJlbmNlc0RlZmF1bHRWYWx1ZXMuaApAQCAtODMsNyArODMsNiBAQCBib29sIGRlZmF1 bHRXaGVlbEV2ZW50R2VzdHVyZXNCZWNvbWVOb25CbG9ja2luZygpOwogCiAjaWYgRU5BQkxFKE1F RElBX1NPVVJDRSkKIGJvb2wgZGVmYXVsdFdlYk1QYXJzZXJFbmFibGVkKCk7Ci1ib29sIGRlZmF1 bHRXZWJNV2ViQXVkaW9FbmFibGVkKCk7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShWUDkpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzRGVm YXVsdFZhbHVlcy5tbSBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVy ZW5jZXNEZWZhdWx0VmFsdWVzLm1tCmluZGV4IDliNWJjOTdmMzczMGM2N2UyZDU4MmVhZTQwZWI2 NzVkNjA0MGIwNWEuLjFlMTZlMWZkZDJjYTNiMGZlOGM5ODY5MzViZGMxZDRmODA3Y2IzYTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNE ZWZhdWx0VmFsdWVzLm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZpZXcvV2Vi UHJlZmVyZW5jZXNEZWZhdWx0VmFsdWVzLm1tCkBAIC0yODIsMTEgKzI4Miw2IEBAIGJvb2wgZGVm YXVsdFdlYk1QYXJzZXJFbmFibGVkKCkKICAgICByZXR1cm4gaXNGZWF0dXJlRmxhZ0VuYWJsZWQo IndlYm1fcGFyc2VyIiwgdHJ1ZSk7CiB9CiAKLWJvb2wgZGVmYXVsdFdlYk1XZWJBdWRpb0VuYWJs ZWQoKQotewotICAgIHJldHVybiBpc0ZlYXR1cmVGbGFnRW5hYmxlZCgid2VibV93ZWJhdWRpbyIs IGZhbHNlKTsKLX0KLQogI2VuZGlmIC8vIEVOQUJMRShNRURJQV9TT1VSQ0UpCiAKICNpZiBFTkFC TEUoVlA5KQo=