145989 2015-06-15 14:34:22 -0700 REGRESSION(r175251, Mavericks Only): Playback may stall 2015-06-15 22:07:57 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham webkit-bug-importer oldest_to_newest 1102044 0 bfulgham 2015-06-15 14:34:22 -0700 During testing, we found that playback on Mavericks could stall for some types of content. This was due to some changes in how the underlying media system works in more recent Operating System releases. Consequently, we will revert Mavericks to work as it had before r175251 introduced this Mavericks-specific regression. 1102045 1 bfulgham 2015-06-15 14:36:13 -0700 <rdar://problem/21271919> 1102046 2 254897 bfulgham 2015-06-15 14:37:44 -0700 Created attachment 254897 Patch 1102048 3 254897 dino 2015-06-15 14:40:48 -0700 Comment on attachment 254897 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254897&action=review > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:656 > +#if USE(VIDEOTOOLBOX) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 10100 I think you want 101000, here and below. Although I'm quite confused, because we seem inconsistent with this. 1102049 4 254899 bfulgham 2015-06-15 14:44:05 -0700 Created attachment 254899 Patch 1102058 5 254902 bfulgham 2015-06-15 15:06:16 -0700 Created attachment 254902 Patch 1102076 6 bfulgham 2015-06-15 15:49:08 -0700 Committed r185569: <http://trac.webkit.org/changeset/185569> 1102148 7 254902 ddkilzer 2015-06-15 21:41:46 -0700 Comment on attachment 254902 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=254902&action=review > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:2270 > +#if USE(VIDEOTOOLBOX) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED < 101000) Is this correct? Should the clause after "USE(VIDEOTOOLBOX) be the "opposite" of "!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)", which would be: #if USE(VIDEOTOOLBOX) && (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000) Actually, it currently does not matter here because USE(VIDEOTOOLBOX) is only true on PLATFORM(MAC) at the moment, although I think this is still (more) correct given the other changes. 1102152 8 bfulgham 2015-06-15 21:57:54 -0700 (In reply to comment #7) > Comment on attachment 254902 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=254902&action=review > > > Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:2270 > > +#if USE(VIDEOTOOLBOX) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED < 101000) > > Is this correct? Should the clause after "USE(VIDEOTOOLBOX) be the > "opposite" of "!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || > __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000)", which would be: Oh! Yes, you are right. I got a little carried away with some copy/paste. It should actually be: #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101000 I'll try to land a fix ASAP. 1102156 9 bfulgham 2015-06-15 22:07:57 -0700 Corrected macro in follow-up patch: Committed r185580: <http://trac.webkit.org/changeset/185580> 254897 2015-06-15 14:37:44 -0700 2015-06-15 14:44:03 -0700 Patch bug-145989-20150615143713.patch text/plain 2826 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NTU2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA2LTE1ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjE3NTI1 MSwgTWF2ZXJpY2tzIE9ubHkpOiBQbGF5YmFjayBtYXkgc3RhbGwKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTk4OQorICAgICAgICA8cmRhcjovL3By b2JsZW0vMjEyNzE5MTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUmV2ZXJ0IHIxNzUyNTEgZm9yIE1hdmVyaWNrcyBidWlsZCB0YXJnZXRzLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZVZpZGVvTGF5ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRlVmlkZW9PdXRw dXQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qzo6cGFpbnRXaXRoVmlkZW9PdXRwdXQpOgorCiAyMDE1LTA2LTE1ICBNYXR0IFJhamNhICA8bXJh amNhQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYSBTZXNzaW9uOiBBY3RpdmUgcGFydGljaXBh dGluZyBlbGVtZW50cyBjYW4gY2hhbmdlIHdoaWxlIGJlaW5nIGl0ZXJhdGVkIApJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDLm1tCShyZXZpc2lvbiAxODU1NDEpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02NTMsNyArNjUzLDcgQEAgdm9pZCBN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOgogICAgICAgICBpZiAoIW1fdmlkZW9M YXllcikKICAgICAgICAgICAgIGNyZWF0ZUFWUGxheWVyTGF5ZXIoKTsKIAotI2lmIFVTRShWSURF T1RPT0xCT1gpCisjaWYgVVNFKFZJREVPVE9PTEJPWCkgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01J Tl9SRVFVSVJFRCA+PSAxMDEwMAogICAgICAgICBpZiAoIW1fdmlkZW9PdXRwdXQpCiAgICAgICAg ICAgICBjcmVhdGVWaWRlb091dHB1dCgpOwogI2VuZGlmCkBAIC0yMjU0LDcgKzIyNTQsNyBAQCB2 b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6CiAgICAgaWYgKCFtX2F2UGxh eWVySXRlbSB8fCBtX3ZpZGVvT3V0cHV0KQogICAgICAgICByZXR1cm47CiAKLSNpZiBVU0UoVklE RU9UT09MQk9YKQorI2lmIFVTRShWSURFT1RPT0xCT1gpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9N SU5fUkVRVUlSRUQgPj0gMTAxMDAKICAgICBOU0RpY3Rpb25hcnkqIGF0dHJpYnV0ZXMgPSBuaWw7 CiAjZWxzZQogICAgIE5TRGljdGlvbmFyeSogYXR0cmlidXRlcyA9IFtOU0RpY3Rpb25hcnkgZGlj dGlvbmFyeVdpdGhPYmplY3RzQW5kS2V5czpbTlNOdW1iZXIgbnVtYmVyV2l0aFVuc2lnbmVkSW50 OmtDVlBpeGVsRm9ybWF0VHlwZV8zMkJHUkFdLCBrQ1ZQaXhlbEJ1ZmZlclBpeGVsRm9ybWF0VHlw ZUtleSwKQEAgLTIyNjcsNiArMjI2NywxMCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbk9iakM6CiAKICAgICBbbV9hdlBsYXllckl0ZW0uZ2V0KCkgYWRkT3V0cHV0Om1fdmlk ZW9PdXRwdXQuZ2V0KCldOwogCisjaWYgVVNFKFZJREVPVE9PTEJPWCkgJiYgX19NQUNfT1NfWF9W RVJTSU9OX01JTl9SRVFVSVJFRCA8IDEwMTAwCisgICAgd2FpdEZvclZpZGVvT3V0cHV0TWVkaWFE YXRhV2lsbENoYW5nZSgpOworI2VuZGlmCisKICAgICBMT0coTWVkaWEsICJNZWRpYVBsYXllclBy aXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb091dHB1dCglcCkgLSByZXR1cm5pbmcg JXAiLCB0aGlzLCBtX3ZpZGVvT3V0cHV0LmdldCgpKTsKIH0KIApAQCAtMjM4Nyw4ICsyMzkxLDEw IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzoKIAogdm9pZCBNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpwYWludFdpdGhWaWRlb091dHB1dChHcmFw aGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgb3V0cHV0UmVjdCkKIHsKKyNp ZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwCiAgICAgaWYgKG1fdmlk ZW9PdXRwdXQgJiYgIW1fbGFzdEltYWdlICYmICF2aWRlb091dHB1dEhhc0F2YWlsYWJsZUZyYW1l KCkpCiAgICAgICAgIHdhaXRGb3JWaWRlb091dHB1dE1lZGlhRGF0YVdpbGxDaGFuZ2UoKTsKKyNl bmRpZgogCiAgICAgdXBkYXRlTGFzdEltYWdlKCk7CiAK 254899 2015-06-15 14:44:05 -0700 2015-06-15 15:06:13 -0700 Patch bug-145989-20150615144334.patch text/plain 2830 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NTU2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA2LTE1ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjE3NTI1 MSwgTWF2ZXJpY2tzIE9ubHkpOiBQbGF5YmFjayBtYXkgc3RhbGwKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTk4OQorICAgICAgICA8cmRhcjovL3By b2JsZW0vMjEyNzE5MTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUmV2ZXJ0IHIxNzUyNTEgZm9yIE1hdmVyaWNrcyBidWlsZCB0YXJnZXRzLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZVZpZGVvTGF5ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRlVmlkZW9PdXRw dXQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qzo6cGFpbnRXaXRoVmlkZW9PdXRwdXQpOgorCiAyMDE1LTA2LTE1ICBNYXR0IFJhamNhICA8bXJh amNhQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYSBTZXNzaW9uOiBBY3RpdmUgcGFydGljaXBh dGluZyBlbGVtZW50cyBjYW4gY2hhbmdlIHdoaWxlIGJlaW5nIGl0ZXJhdGVkIApJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDLm1tCShyZXZpc2lvbiAxODU1NDEpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02NTMsNyArNjUzLDcgQEAgdm9pZCBN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOgogICAgICAgICBpZiAoIW1fdmlkZW9M YXllcikKICAgICAgICAgICAgIGNyZWF0ZUFWUGxheWVyTGF5ZXIoKTsKIAotI2lmIFVTRShWSURF T1RPT0xCT1gpCisjaWYgVVNFKFZJREVPVE9PTEJPWCkgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01J Tl9SRVFVSVJFRCA+PSAxMDEwMDAKICAgICAgICAgaWYgKCFtX3ZpZGVvT3V0cHV0KQogICAgICAg ICAgICAgY3JlYXRlVmlkZW9PdXRwdXQoKTsKICNlbmRpZgpAQCAtMjI1NCw3ICsyMjU0LDcgQEAg dm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOgogICAgIGlmICghbV9hdlBs YXllckl0ZW0gfHwgbV92aWRlb091dHB1dCkKICAgICAgICAgcmV0dXJuOwogCi0jaWYgVVNFKFZJ REVPVE9PTEJPWCkKKyNpZiBVU0UoVklERU9UT09MQk9YKSAmJiBfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEwMTAwMAogICAgIE5TRGljdGlvbmFyeSogYXR0cmlidXRlcyA9IG5p bDsKICNlbHNlCiAgICAgTlNEaWN0aW9uYXJ5KiBhdHRyaWJ1dGVzID0gW05TRGljdGlvbmFyeSBk aWN0aW9uYXJ5V2l0aE9iamVjdHNBbmRLZXlzOltOU051bWJlciBudW1iZXJXaXRoVW5zaWduZWRJ bnQ6a0NWUGl4ZWxGb3JtYXRUeXBlXzMyQkdSQV0sIGtDVlBpeGVsQnVmZmVyUGl4ZWxGb3JtYXRU eXBlS2V5LApAQCAtMjI2Nyw2ICsyMjY3LDEwIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZG b3VuZGF0aW9uT2JqQzoKIAogICAgIFttX2F2UGxheWVySXRlbS5nZXQoKSBhZGRPdXRwdXQ6bV92 aWRlb091dHB1dC5nZXQoKV07CiAKKyNpZiBVU0UoVklERU9UT09MQk9YKSAmJiBfX01BQ19PU19Y X1ZFUlNJT05fTUlOX1JFUVVJUkVEIDwgMTAxMDAwCisgICAgd2FpdEZvclZpZGVvT3V0cHV0TWVk aWFEYXRhV2lsbENoYW5nZSgpOworI2VuZGlmCisKICAgICBMT0coTWVkaWEsICJNZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVhdGVWaWRlb091dHB1dCglcCkgLSByZXR1cm5p bmcgJXAiLCB0aGlzLCBtX3ZpZGVvT3V0cHV0LmdldCgpKTsKIH0KIApAQCAtMjM4Nyw4ICsyMzkx LDEwIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzoKIAogdm9pZCBN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpwYWludFdpdGhWaWRlb091dHB1dChH cmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgb3V0cHV0UmVjdCkKIHsK KyNpZiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAwMAogICAgIGlmICht X3ZpZGVvT3V0cHV0ICYmICFtX2xhc3RJbWFnZSAmJiAhdmlkZW9PdXRwdXRIYXNBdmFpbGFibGVG cmFtZSgpKQogICAgICAgICB3YWl0Rm9yVmlkZW9PdXRwdXRNZWRpYURhdGFXaWxsQ2hhbmdlKCk7 CisjZW5kaWYKIAogICAgIHVwZGF0ZUxhc3RJbWFnZSgpOwogCg== 254902 2015-06-15 15:06:16 -0700 2015-06-15 15:39:45 -0700 Patch bug-145989-20150615150545.patch text/plain 3018 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NTU2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA2LTE1ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjE3NTI1 MSwgTWF2ZXJpY2tzIE9ubHkpOiBQbGF5YmFjayBtYXkgc3RhbGwKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTk4OQorICAgICAgICA8cmRhcjovL3By b2JsZW0vMjEyNzE5MTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUmV2ZXJ0IHIxNzUyNTEgZm9yIE1hdmVyaWNrcyBidWlsZCB0YXJnZXRzLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQ cml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OmNyZWF0ZVZpZGVvTGF5ZXIpOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzo6Y3JlYXRlVmlkZW9PdXRw dXQpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2Jq Qzo6cGFpbnRXaXRoVmlkZW9PdXRwdXQpOgorCiAyMDE1LTA2LTE1ICBNYXR0IFJhamNhICA8bXJh amNhQGFwcGxlLmNvbT4KIAogICAgICAgICBNZWRpYSBTZXNzaW9uOiBBY3RpdmUgcGFydGljaXBh dGluZyBlbGVtZW50cyBjYW4gY2hhbmdlIHdoaWxlIGJlaW5nIGl0ZXJhdGVkIApJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDLm1tCShyZXZpc2lvbiAxODU1NDEpCisrKyBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02NTMsNyArNjUzLDcgQEAgdm9pZCBN ZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOgogICAgICAgICBpZiAoIW1fdmlkZW9M YXllcikKICAgICAgICAgICAgIGNyZWF0ZUFWUGxheWVyTGF5ZXIoKTsKIAotI2lmIFVTRShWSURF T1RPT0xCT1gpCisjaWYgVVNFKFZJREVPVE9PTEJPWCkgJiYgKCFkZWZpbmVkKF9fTUFDX09TX1hf VkVSU0lPTl9NSU5fUkVRVUlSRUQpIHx8IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQg Pj0gMTAxMDAwKQogICAgICAgICBpZiAoIW1fdmlkZW9PdXRwdXQpCiAgICAgICAgICAgICBjcmVh dGVWaWRlb091dHB1dCgpOwogI2VuZGlmCkBAIC0yMjU0LDcgKzIyNTQsNyBAQCB2b2lkIE1lZGlh UGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6CiAgICAgaWYgKCFtX2F2UGxheWVySXRlbSB8 fCBtX3ZpZGVvT3V0cHV0KQogICAgICAgICByZXR1cm47CiAKLSNpZiBVU0UoVklERU9UT09MQk9Y KQorI2lmIFVTRShWSURFT1RPT0xCT1gpICYmICghZGVmaW5lZChfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEKSB8fCBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTAw MCkKICAgICBOU0RpY3Rpb25hcnkqIGF0dHJpYnV0ZXMgPSBuaWw7CiAjZWxzZQogICAgIE5TRGlj dGlvbmFyeSogYXR0cmlidXRlcyA9IFtOU0RpY3Rpb25hcnkgZGljdGlvbmFyeVdpdGhPYmplY3Rz QW5kS2V5czpbTlNOdW1iZXIgbnVtYmVyV2l0aFVuc2lnbmVkSW50OmtDVlBpeGVsRm9ybWF0VHlw ZV8zMkJHUkFdLCBrQ1ZQaXhlbEJ1ZmZlclBpeGVsRm9ybWF0VHlwZUtleSwKQEAgLTIyNjcsNiAr MjI2NywxMCBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6CiAKICAg ICBbbV9hdlBsYXllckl0ZW0uZ2V0KCkgYWRkT3V0cHV0Om1fdmlkZW9PdXRwdXQuZ2V0KCldOwog CisjaWYgVVNFKFZJREVPVE9PTEJPWCkgJiYgKCFkZWZpbmVkKF9fTUFDX09TX1hfVkVSU0lPTl9N SU5fUkVRVUlSRUQpIHx8IF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPCAxMDEwMDAp CisgICAgd2FpdEZvclZpZGVvT3V0cHV0TWVkaWFEYXRhV2lsbENoYW5nZSgpOworI2VuZGlmCisK ICAgICBMT0coTWVkaWEsICJNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjpjcmVh dGVWaWRlb091dHB1dCglcCkgLSByZXR1cm5pbmcgJXAiLCB0aGlzLCBtX3ZpZGVvT3V0cHV0Lmdl dCgpKTsKIH0KIApAQCAtMjM4Nyw4ICsyMzkxLDEwIEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl QVZGb3VuZGF0aW9uT2JqQzoKIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25P YmpDOjpwYWludFdpdGhWaWRlb091dHB1dChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0 IEZsb2F0UmVjdCYgb3V0cHV0UmVjdCkKIHsKKyNpZiAoIWRlZmluZWQoX19NQUNfT1NfWF9WRVJT SU9OX01JTl9SRVFVSVJFRCkgfHwgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAx MDEwMDApCiAgICAgaWYgKG1fdmlkZW9PdXRwdXQgJiYgIW1fbGFzdEltYWdlICYmICF2aWRlb091 dHB1dEhhc0F2YWlsYWJsZUZyYW1lKCkpCiAgICAgICAgIHdhaXRGb3JWaWRlb091dHB1dE1lZGlh RGF0YVdpbGxDaGFuZ2UoKTsKKyNlbmRpZgogCiAgICAgdXBkYXRlTGFzdEltYWdlKCk7CiAK