147647 2015-08-04 13:19:13 -0700 [Mac] Do not require a video track for AirPlay 2015-08-04 14:46:56 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue webkit-bug-importer oldest_to_newest 1114732 0 eric.carlson 2015-08-04 13:19:13 -0700 Allow files without a video track to AirPlay. 1114734 1 eric.carlson 2015-08-04 13:20:25 -0700 <rdar://problem/21932187> 1114743 2 258204 eric.carlson 2015-08-04 13:31:11 -0700 Created attachment 258204 Proposed patch 1114750 3 258206 eric.carlson 2015-08-04 13:45:43 -0700 Created attachment 258206 Updated patch that might compile. 1114781 4 258206 commit-queue 2015-08-04 14:46:52 -0700 Comment on attachment 258206 Updated patch that might compile. Clearing flags on attachment: 258206 Committed r187892: <http://trac.webkit.org/changeset/187892> 1114782 5 commit-queue 2015-08-04 14:46:56 -0700 All reviewed patches have been landed. Closing bug. 258204 2015-08-04 13:31:11 -0700 2015-08-04 13:45:43 -0700 Proposed patch dont_require_video_patch.txt text/plain 4657 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4Nzg4MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA4LTA0ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIERvIG5vdCBy ZXF1aXJlIGEgdmlkZW8gdHJhY2sgZm9yIEFpclBsYXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzY0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29u dHJvbHNBcHBsZS5qczoKKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLmhhbmRsZVJlYWR5 U3RhdGVDaGFuZ2UpOiBDYWxsIHVwZGF0ZVdpcmVsZXNzVGFyZ2V0QXZhaWxhYmxlKCkuCisgICAg ICAgIChDb250cm9sbGVyLnByb3RvdHlwZS51cGRhdGVIYXNWaWRlbyk6IERvbid0IGNhbGwgdXBk YXRlV2lyZWxlc3NUYXJnZXRBdmFpbGFibGUoKS4KKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90 eXBlLnVwZGF0ZVdpcmVsZXNzVGFyZ2V0QXZhaWxhYmxlKTogRG9uJ3QgcmVxdWlyZSB2aWRlby4K KworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50OjpzZXRSZWFkeVN0YXRlKTogQ2FsbCB1cGRhdGVNZWRpYVN0YXRl IHdoZW4gd2UgcmVhY2ggSEFWRV9NRVRBREFUQS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRp YUVsZW1lbnQ6Om1lZGlhU3RhdGUpOiBEb24ndCByZXF1aXJlIHZpZGVvLCBvbmx5IHRoYXQgdGhl IGZpbGUgY2FuIHBsYXkuCisKKyAgICAgICAgKiBodG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFFbGVtZW50U2Vzc2lvbjo6c2hvd1BsYXliYWNrVGFy Z2V0UGlja2VyKTogQ2hlY2sgcmVhZHlTdGF0ZSBpbnN0ZWFkIG9mIGhhc1ZpZGVvLgorCiAyMDE1 LTA4LTA0ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuZGVy VGhlbWU6OmJhc2VsaW5lUG9zaXRpb24oKSBzaG91bGQgdGFrZSBSZW5kZXJCb3ggaW5zdGVhZCBv ZiBSZW5kZXJPYmplY3QuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJv bHMvbWVkaWFDb250cm9sc0FwcGxlLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanMJKHJldmlzaW9uIDE4Nzg2 MykKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xz QXBwbGUuanMJKHdvcmtpbmcgY29weSkKQEAgLTY4OCw2ICs2ODgsNyBAQCBDb250cm9sbGVyLnBy b3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy51cGRhdGVDYXB0aW9uQnV0dG9uKCk7CiAgICAgICAg IHRoaXMudXBkYXRlQ2FwdGlvbkNvbnRhaW5lcigpOwogICAgICAgICB0aGlzLnVwZGF0ZUZ1bGxz Y3JlZW5CdXR0b25zKCk7CisgICAgICAgIHRoaXMudXBkYXRlV2lyZWxlc3NUYXJnZXRBdmFpbGFi bGUoKTsKICAgICAgICAgdGhpcy51cGRhdGVXaXJlbGVzc1RhcmdldFBpY2tlckJ1dHRvbigpOwog ICAgICAgICB0aGlzLnVwZGF0ZVByb2dyZXNzKCk7CiAgICAgICAgIHRoaXMudXBkYXRlQ29udHJv bHMoKTsKQEAgLTE4NzAsOSArMTg3MSw2IEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAg ICAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbC5jbGFzc0xpc3QucmVtb3ZlKHRoaXMuQ2xhc3NO YW1lcy5ub1ZpZGVvKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5jb250cm9scy5w YW5lbC5jbGFzc0xpc3QuYWRkKHRoaXMuQ2xhc3NOYW1lcy5ub1ZpZGVvKTsKLQotICAgICAgICAv LyBUaGUgd2lyZWxlc3MgdGFyZ2V0IHBpY2tlciBpcyBvbmx5IHZpc2libGUgZm9yIGZpbGVzIHdp dGggdmlkZW8sIGZvcmNlIGFuIHVwZGF0ZS4KLSAgICAgICAgdGhpcy51cGRhdGVXaXJlbGVzc1Rh cmdldEF2YWlsYWJsZSgpOwogICAgIH0sCiAKICAgICB1cGRhdGVWb2x1bWU6IGZ1bmN0aW9uKCkK QEAgLTE5ODYsNyArMTk4NCw3IEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICBp ZiAodGhpcy53aXJlbGVzc1BsYXliYWNrRGlzYWJsZWQpCiAgICAgICAgICAgICB3aXJlbGVzc1Bs YXliYWNrVGFyZ2V0c0F2YWlsYWJsZSA9IGZhbHNlOwogCi0gICAgICAgIGlmICh3aXJlbGVzc1Bs YXliYWNrVGFyZ2V0c0F2YWlsYWJsZSAmJiB0aGlzLmlzUGxheWFibGUoKSAmJiB0aGlzLmhhc1Zp ZGVvKCkpCisgICAgICAgIGlmICh3aXJlbGVzc1BsYXliYWNrVGFyZ2V0c0F2YWlsYWJsZSAmJiB0 aGlzLmlzUGxheWFibGUoKSkKICAgICAgICAgICAgIHRoaXMuY29udHJvbHMud2lyZWxlc3NUYXJn ZXRQaWNrZXIuY2xhc3NMaXN0LnJlbW92ZSh0aGlzLkNsYXNzTmFtZXMuaGlkZGVuKTsKICAgICAg ICAgZWxzZQogICAgICAgICAgICAgdGhpcy5jb250cm9scy53aXJlbGVzc1RhcmdldFBpY2tlci5j bGFzc0xpc3QuYWRkKHRoaXMuQ2xhc3NOYW1lcy5oaWRkZW4pOwpJbmRleDogU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZpc2lvbiAxODc4NjMpCisrKyBTb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTQz LDYgKzIxNDMsOCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnNldFJlYWR5U3RhdGUoTWVkCiAg ICAgICAgICAgICBkb3duY2FzdDxNZWRpYURvY3VtZW50Pihkb2N1bWVudCgpKS5tZWRpYUVsZW1l bnROYXR1cmFsU2l6ZUNoYW5nZWQoZXhwYW5kZWRJbnRTaXplKG1fcGxheWVyLT5uYXR1cmFsU2l6 ZSgpKSk7CiAKICAgICAgICAgbG9nTWVkaWFMb2FkUmVxdWVzdChkb2N1bWVudCgpLnBhZ2UoKSwg bV9wbGF5ZXItPmVuZ2luZURlc2NyaXB0aW9uKCksIFN0cmluZygpLCB0cnVlKTsKKworICAgICAg ICB1cGRhdGVNZWRpYVN0YXRlKFVwZGF0ZU1lZGlhU3RhdGU6OkFzeW5jaHJvbm91c2x5KTsKICAg ICB9CiAKICAgICBib29sIHNob3VsZFVwZGF0ZURpc3BsYXlTdGF0ZSA9IGZhbHNlOwpAQCAtNjQ2 Niw3ICs2NDY4LDcgQEAgTWVkaWFQcm9kdWNlcjo6TWVkaWFTdGF0ZUZsYWdzIEhUTUxNZWRpYQog ICAgICAgICBzdGF0ZSB8PSBSZXF1aXJlc1BsYXliYWNrVGFyZ2V0TW9uaXRvcmluZzsKIAogICAg IGJvb2wgcmVxdWlyZVVzZXJHZXN0dXJlID0gbV9tZWRpYVNlc3Npb24tPmhhc0JlaGF2aW9yUmVz dHJpY3Rpb24oTWVkaWFFbGVtZW50U2Vzc2lvbjo6UmVxdWlyZVVzZXJHZXN0dXJlVG9BdXRvcGxh eVRvRXh0ZXJuYWxEZXZpY2UpOwotICAgIGlmIChoYXNBY3RpdmVWaWRlbyAmJiAhcmVxdWlyZVVz ZXJHZXN0dXJlICYmICFtX2ZhaWxlZFRvUGxheVRvV2lyZWxlc3NUYXJnZXQpCisgICAgaWYgKG1f cmVhZHlTdGF0ZSA+PSBIQVZFX01FVEFEQVRBICYmICFyZXF1aXJlVXNlckdlc3R1cmUgJiYgIW1f ZmFpbGVkVG9QbGF5VG9XaXJlbGVzc1RhcmdldCkKICAgICAgICAgc3RhdGUgfD0gRXh0ZXJuYWxE ZXZpY2VBdXRvUGxheUNhbmRpZGF0ZTsKIAogICAgIGlmIChoYXNBY3RpdmVWaWRlbyAmJiBlbmRl ZFBsYXliYWNrKCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL01lZGlhRWxlbWVudFNlc3Np b24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vz c2lvbi5jcHAJKHJldmlzaW9uIDE4Nzg2MykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFF bGVtZW50U2Vzc2lvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwMCw4ICsyMDAsOCBAQCB2b2lk IE1lZGlhRWxlbWVudFNlc3Npb246OnNob3dQbGF5YmFja1RhCiAgICAgfQogCiAjaWYgIVBMQVRG T1JNKElPUykKLSAgICBpZiAoIWVsZW1lbnQuaGFzVmlkZW8oKSkgewotICAgICAgICBMT0coTWVk aWEsICJNZWRpYUVsZW1lbnRTZXNzaW9uOjpzaG93UGxheWJhY2tUYXJnZXRQaWNrZXIgLSByZXR1 cm5pbmcgZWFybHkgYmVjYXVzZSBlbGVtZW50IGhhcyBubyB2aWRlbyIpOworICAgIGlmIChlbGVt ZW50LnJlYWR5U3RhdGUoKSA8IEhUTUxNZWRpYUVsZW1lbnRFbnVtczo6SEFWRV9NRVRBREFUQSkg eworICAgICAgICBMT0coTWVkaWEsICJNZWRpYUVsZW1lbnRTZXNzaW9uOjpzaG93UGxheWJhY2tU YXJnZXRQaWNrZXIgLSByZXR1cm5pbmcgZWFybHkgYmVjYXVzZSBlbGVtZW50IGlzIG5vdCBwbGF5 YWJsZSIpOwogICAgICAgICByZXR1cm47CiAgICAgfQogI2VuZGlmCg== 258206 2015-08-04 13:45:43 -0700 2015-08-04 14:46:52 -0700 Updated patch that might compile. dont_require_video_patch.txt text/plain 4704 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4Nzg4MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE1LTA4LTA0ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIERvIG5vdCBy ZXF1aXJlIGEgdmlkZW8gdHJhY2sgZm9yIEFpclBsYXkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzY0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYWNvbnRyb2xzL21lZGlhQ29u dHJvbHNBcHBsZS5qczoKKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90eXBlLmhhbmRsZVJlYWR5 U3RhdGVDaGFuZ2UpOiBDYWxsIHVwZGF0ZVdpcmVsZXNzVGFyZ2V0QXZhaWxhYmxlKCkuCisgICAg ICAgIChDb250cm9sbGVyLnByb3RvdHlwZS51cGRhdGVIYXNWaWRlbyk6IERvbid0IGNhbGwgdXBk YXRlV2lyZWxlc3NUYXJnZXRBdmFpbGFibGUoKS4KKyAgICAgICAgKENvbnRyb2xsZXIucHJvdG90 eXBlLnVwZGF0ZVdpcmVsZXNzVGFyZ2V0QXZhaWxhYmxlKTogRG9uJ3QgcmVxdWlyZSB2aWRlby4K KworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50OjpzZXRSZWFkeVN0YXRlKTogQ2FsbCB1cGRhdGVNZWRpYVN0YXRl IHdoZW4gd2UgcmVhY2ggSEFWRV9NRVRBREFUQS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRp YUVsZW1lbnQ6Om1lZGlhU3RhdGUpOiBEb24ndCByZXF1aXJlIHZpZGVvLCBvbmx5IHRoYXQgdGhl IGZpbGUgY2FuIHBsYXkuCisKKyAgICAgICAgKiBodG1sL01lZGlhRWxlbWVudFNlc3Npb24uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFFbGVtZW50U2Vzc2lvbjo6c2hvd1BsYXliYWNrVGFy Z2V0UGlja2VyKTogQ2hlY2sgcmVhZHlTdGF0ZSBpbnN0ZWFkIG9mIGhhc1ZpZGVvLgorCiAyMDE1 LTA4LTA0ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuZGVy VGhlbWU6OmJhc2VsaW5lUG9zaXRpb24oKSBzaG91bGQgdGFrZSBSZW5kZXJCb3ggaW5zdGVhZCBv ZiBSZW5kZXJPYmplY3QuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJv bHMvbWVkaWFDb250cm9sc0FwcGxlLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xzQXBwbGUuanMJKHJldmlzaW9uIDE4Nzg2 MykKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250cm9scy9tZWRpYUNvbnRyb2xz QXBwbGUuanMJKHdvcmtpbmcgY29weSkKQEAgLTY4OCw2ICs2ODgsNyBAQCBDb250cm9sbGVyLnBy b3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy51cGRhdGVDYXB0aW9uQnV0dG9uKCk7CiAgICAgICAg IHRoaXMudXBkYXRlQ2FwdGlvbkNvbnRhaW5lcigpOwogICAgICAgICB0aGlzLnVwZGF0ZUZ1bGxz Y3JlZW5CdXR0b25zKCk7CisgICAgICAgIHRoaXMudXBkYXRlV2lyZWxlc3NUYXJnZXRBdmFpbGFi bGUoKTsKICAgICAgICAgdGhpcy51cGRhdGVXaXJlbGVzc1RhcmdldFBpY2tlckJ1dHRvbigpOwog ICAgICAgICB0aGlzLnVwZGF0ZVByb2dyZXNzKCk7CiAgICAgICAgIHRoaXMudXBkYXRlQ29udHJv bHMoKTsKQEAgLTE4NzAsOSArMTg3MSw2IEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAg ICAgICAgICAgdGhpcy5jb250cm9scy5wYW5lbC5jbGFzc0xpc3QucmVtb3ZlKHRoaXMuQ2xhc3NO YW1lcy5ub1ZpZGVvKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgdGhpcy5jb250cm9scy5w YW5lbC5jbGFzc0xpc3QuYWRkKHRoaXMuQ2xhc3NOYW1lcy5ub1ZpZGVvKTsKLQotICAgICAgICAv LyBUaGUgd2lyZWxlc3MgdGFyZ2V0IHBpY2tlciBpcyBvbmx5IHZpc2libGUgZm9yIGZpbGVzIHdp dGggdmlkZW8sIGZvcmNlIGFuIHVwZGF0ZS4KLSAgICAgICAgdGhpcy51cGRhdGVXaXJlbGVzc1Rh cmdldEF2YWlsYWJsZSgpOwogICAgIH0sCiAKICAgICB1cGRhdGVWb2x1bWU6IGZ1bmN0aW9uKCkK QEAgLTE5ODYsNyArMTk4NCw3IEBAIENvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICBp ZiAodGhpcy53aXJlbGVzc1BsYXliYWNrRGlzYWJsZWQpCiAgICAgICAgICAgICB3aXJlbGVzc1Bs YXliYWNrVGFyZ2V0c0F2YWlsYWJsZSA9IGZhbHNlOwogCi0gICAgICAgIGlmICh3aXJlbGVzc1Bs YXliYWNrVGFyZ2V0c0F2YWlsYWJsZSAmJiB0aGlzLmlzUGxheWFibGUoKSAmJiB0aGlzLmhhc1Zp ZGVvKCkpCisgICAgICAgIGlmICh3aXJlbGVzc1BsYXliYWNrVGFyZ2V0c0F2YWlsYWJsZSAmJiB0 aGlzLmlzUGxheWFibGUoKSkKICAgICAgICAgICAgIHRoaXMuY29udHJvbHMud2lyZWxlc3NUYXJn ZXRQaWNrZXIuY2xhc3NMaXN0LnJlbW92ZSh0aGlzLkNsYXNzTmFtZXMuaGlkZGVuKTsKICAgICAg ICAgZWxzZQogICAgICAgICAgICAgdGhpcy5jb250cm9scy53aXJlbGVzc1RhcmdldFBpY2tlci5j bGFzc0xpc3QuYWRkKHRoaXMuQ2xhc3NOYW1lcy5oaWRkZW4pOwpJbmRleDogU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZpc2lvbiAxODc4NjMpCisrKyBTb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTQz LDYgKzIxNDMsMTAgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpzZXRSZWFkeVN0YXRlKE1lZAog ICAgICAgICAgICAgZG93bmNhc3Q8TWVkaWFEb2N1bWVudD4oZG9jdW1lbnQoKSkubWVkaWFFbGVt ZW50TmF0dXJhbFNpemVDaGFuZ2VkKGV4cGFuZGVkSW50U2l6ZShtX3BsYXllci0+bmF0dXJhbFNp emUoKSkpOwogCiAgICAgICAgIGxvZ01lZGlhTG9hZFJlcXVlc3QoZG9jdW1lbnQoKS5wYWdlKCks IG1fcGxheWVyLT5lbmdpbmVEZXNjcmlwdGlvbigpLCBTdHJpbmcoKSwgdHJ1ZSk7CisKKyNpZiBF TkFCTEUoV0lSRUxFU1NfUExBWUJBQ0tfVEFSR0VUKQorICAgICAgICB1cGRhdGVNZWRpYVN0YXRl KFVwZGF0ZU1lZGlhU3RhdGU6OkFzeW5jaHJvbm91c2x5KTsKKyNlbmRpZgogICAgIH0KIAogICAg IGJvb2wgc2hvdWxkVXBkYXRlRGlzcGxheVN0YXRlID0gZmFsc2U7CkBAIC02NDY2LDcgKzY0NzAs NyBAQCBNZWRpYVByb2R1Y2VyOjpNZWRpYVN0YXRlRmxhZ3MgSFRNTE1lZGlhCiAgICAgICAgIHN0 YXRlIHw9IFJlcXVpcmVzUGxheWJhY2tUYXJnZXRNb25pdG9yaW5nOwogCiAgICAgYm9vbCByZXF1 aXJlVXNlckdlc3R1cmUgPSBtX21lZGlhU2Vzc2lvbi0+aGFzQmVoYXZpb3JSZXN0cmljdGlvbihN ZWRpYUVsZW1lbnRTZXNzaW9uOjpSZXF1aXJlVXNlckdlc3R1cmVUb0F1dG9wbGF5VG9FeHRlcm5h bERldmljZSk7Ci0gICAgaWYgKGhhc0FjdGl2ZVZpZGVvICYmICFyZXF1aXJlVXNlckdlc3R1cmUg JiYgIW1fZmFpbGVkVG9QbGF5VG9XaXJlbGVzc1RhcmdldCkKKyAgICBpZiAobV9yZWFkeVN0YXRl ID49IEhBVkVfTUVUQURBVEEgJiYgIXJlcXVpcmVVc2VyR2VzdHVyZSAmJiAhbV9mYWlsZWRUb1Bs YXlUb1dpcmVsZXNzVGFyZ2V0KQogICAgICAgICBzdGF0ZSB8PSBFeHRlcm5hbERldmljZUF1dG9Q bGF5Q2FuZGlkYXRlOwogCiAgICAgaWYgKGhhc0FjdGl2ZVZpZGVvICYmIGVuZGVkUGxheWJhY2so KSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvTWVkaWFFbGVtZW50U2Vzc2lvbi5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNzaW9uLmNwcAko cmV2aXNpb24gMTg3ODYzKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9NZWRpYUVsZW1lbnRTZXNz aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjAwLDggKzIwMCw4IEBAIHZvaWQgTWVkaWFFbGVt ZW50U2Vzc2lvbjo6c2hvd1BsYXliYWNrVGEKICAgICB9CiAKICNpZiAhUExBVEZPUk0oSU9TKQot ICAgIGlmICghZWxlbWVudC5oYXNWaWRlbygpKSB7Ci0gICAgICAgIExPRyhNZWRpYSwgIk1lZGlh RWxlbWVudFNlc3Npb246OnNob3dQbGF5YmFja1RhcmdldFBpY2tlciAtIHJldHVybmluZyBlYXJs eSBiZWNhdXNlIGVsZW1lbnQgaGFzIG5vIHZpZGVvIik7CisgICAgaWYgKGVsZW1lbnQucmVhZHlT dGF0ZSgpIDwgSFRNTE1lZGlhRWxlbWVudEVudW1zOjpIQVZFX01FVEFEQVRBKSB7CisgICAgICAg IExPRyhNZWRpYSwgIk1lZGlhRWxlbWVudFNlc3Npb246OnNob3dQbGF5YmFja1RhcmdldFBpY2tl ciAtIHJldHVybmluZyBlYXJseSBiZWNhdXNlIGVsZW1lbnQgaXMgbm90IHBsYXlhYmxlIik7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAjZW5kaWYK