169131 2017-03-03 06:59:15 -0800 [MediaStream] Remove #if USE(VIDEOTOOLBOX) from AVVideoCaptureSource 2017-03-03 10:19:03 -0800 1 1 1 Unclassified WebKit Media Other Unspecified Unspecified ASSIGNED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue webkit-bug-importer youennf oldest_to_newest 1283145 0 eric.carlson 2017-03-03 06:59:15 -0800 Remove #if USE(VIDEOTOOLBOX) from AVVideoCaptureSource, it isn't needed. 1283146 1 webkit-bug-importer 2017-03-03 07:04:45 -0800 <rdar://problem/30831526> 1283147 2 303316 eric.carlson 2017-03-03 07:05:02 -0800 Created attachment 303316 Proposed patch. 1283166 3 303321 eric.carlson 2017-03-03 08:47:55 -0800 Created attachment 303321 Patch for landing. 1283191 4 303321 commit-queue 2017-03-03 10:19:03 -0800 Comment on attachment 303321 Patch for landing. Clearing flags on attachment: 303321 Committed r213372: <http://trac.webkit.org/changeset/213372> 303316 2017-03-03 07:05:02 -0800 2017-03-03 08:04:11 -0800 Proposed patch. avvideo_capture_cleanup_patch.txt text/plain 1868 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMzE0OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE3LTAzLTAzICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV0g UmVtb3ZlICNpZiBVU0UoVklERU9UT09MQk9YKSBmcm9tIEFWVmlkZW9DYXB0dXJlU291cmNlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkxMzEKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3Jt L21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5tbToKKyAgICAgICAgKFdlYkNv cmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjpjdXJyZW50RnJhbWVDR0ltYWdlKToKKwpJbmRleDog U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291 cmNlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt L21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5tbQkocmV2aXNpb24gMjEzMTQ4KQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1t CSh3b3JraW5nIGNvcHkpCkBAIC00NjMsMTQgKzQ4MCwxMiBAQCBSZXRhaW5QdHI8Q0dJbWFnZVJl Zj4gQVZWaWRlb0NhcHR1cmVTb3VyCiAgICAgQ1ZQaXhlbEJ1ZmZlclJlZiBwaXhlbEJ1ZmZlciA9 IHN0YXRpY19jYXN0PENWUGl4ZWxCdWZmZXJSZWY+KENNU2FtcGxlQnVmZmVyR2V0SW1hZ2VCdWZm ZXIobV9idWZmZXIuZ2V0KCkpKTsKICAgICBBU1NFUlQoQ1ZQaXhlbEJ1ZmZlckdldFBpeGVsRm9y bWF0VHlwZShwaXhlbEJ1ZmZlcikgPT0gdmlkZW9DYXB0dXJlRm9ybWF0KTsKIAotICAgIGlmICgh bV9waXhlbEJ1ZmZlckNvbmZvcm1lcikgewotI2lmIFVTRShWSURFT1RPT0xCT1gpCi0gICAgICAg IE5TRGljdGlvbmFyeSAqYXR0cmlidXRlcyA9IEB7IChOU1N0cmluZyAqKWtDVlBpeGVsQnVmZmVy UGl4ZWxGb3JtYXRUeXBlS2V5OiBAKGtDVlBpeGVsRm9ybWF0VHlwZV8zMkJHUkEpIH07Ci0jZWxz ZQotICAgICAgICBOU0RpY3Rpb25hcnkgKmF0dHJpYnV0ZXMgPSBuaWw7Ci0jZW5kaWYKLSAgICAg ICAgbV9waXhlbEJ1ZmZlckNvbmZvcm1lciA9IHN0ZDo6bWFrZV91bmlxdWU8UGl4ZWxCdWZmZXJD b25mb3JtZXJDVj4oKENGRGljdGlvbmFyeVJlZilhdHRyaWJ1dGVzKTsKLSAgICB9CisgICAgaWYg KCFtX3BpeGVsQnVmZmVyQ29uZm9ybWVyKQorICAgICAgICBtX3BpeGVsQnVmZmVyQ29uZm9ybWVy ID0gc3RkOjptYWtlX3VuaXF1ZTxQaXhlbEJ1ZmZlckNvbmZvcm1lckNWPigoQ0ZEaWN0aW9uYXJ5 UmVmKUB7IChOU1N0cmluZyAqKWtDVlBpeGVsQnVmZmVyUGl4ZWxGb3JtYXRUeXBlS2V5OiBAKGtD VlBpeGVsRm9ybWF0VHlwZV8zMkJHUkEpIH0pOworCisgICAgQVNTRVJUKG1fcGl4ZWxCdWZmZXJD b25mb3JtZXIpOworICAgIGlmICghbV9waXhlbEJ1ZmZlckNvbmZvcm1lcikKKyAgICAgICAgcmV0 dXJuIG51bGxwdHI7CiAKICAgICBtX2xhc3RJbWFnZSA9IG1fcGl4ZWxCdWZmZXJDb25mb3JtZXIt PmNyZWF0ZUltYWdlRnJvbVBpeGVsQnVmZmVyKHBpeGVsQnVmZmVyKTsKIAo= 303321 2017-03-03 08:47:55 -0800 2017-03-03 10:19:03 -0800 Patch for landing. avvideo_capture_cleanup_patch.txt text/plain 1978 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxMzE0OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE3LTAzLTAzICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNZWRpYVN0cmVhbV0g UmVtb3ZlICNpZiBVU0UoVklERU9UT09MQk9YKSBmcm9tIEFWVmlkZW9DYXB0dXJlU291cmNlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkxMzEKKwor ICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4gRmFibGV0LgorCisgICAgICAgICogcGxhdGZvcm0v bWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tOgorICAgICAgICAoV2ViQ29y ZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OmN1cnJlbnRGcmFtZUNHSW1hZ2UpOgorCiAyMDE3LTAy LTI4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgTWFpbiByZXNvdXJjZSByZXF1ZXN0cyBuZWVkIGNhY2hlUGFydGl0aW9uCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2Uu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFj L0FWVmlkZW9DYXB0dXJlU291cmNlLm1tCShyZXZpc2lvbiAyMTMxNDgpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UubW0JKHdv cmtpbmcgY29weSkKQEAgLTQ2MywxNCArNDgwLDEyIEBAIFJldGFpblB0cjxDR0ltYWdlUmVmPiBB VlZpZGVvQ2FwdHVyZVNvdXIKICAgICBDVlBpeGVsQnVmZmVyUmVmIHBpeGVsQnVmZmVyID0gc3Rh dGljX2Nhc3Q8Q1ZQaXhlbEJ1ZmZlclJlZj4oQ01TYW1wbGVCdWZmZXJHZXRJbWFnZUJ1ZmZlciht X2J1ZmZlci5nZXQoKSkpOwogICAgIEFTU0VSVChDVlBpeGVsQnVmZmVyR2V0UGl4ZWxGb3JtYXRU eXBlKHBpeGVsQnVmZmVyKSA9PSB2aWRlb0NhcHR1cmVGb3JtYXQpOwogCi0gICAgaWYgKCFtX3Bp eGVsQnVmZmVyQ29uZm9ybWVyKSB7Ci0jaWYgVVNFKFZJREVPVE9PTEJPWCkKLSAgICAgICAgTlNE aWN0aW9uYXJ5ICphdHRyaWJ1dGVzID0gQHsgKE5TU3RyaW5nICopa0NWUGl4ZWxCdWZmZXJQaXhl bEZvcm1hdFR5cGVLZXk6IEAoa0NWUGl4ZWxGb3JtYXRUeXBlXzMyQkdSQSkgfTsKLSNlbHNlCi0g ICAgICAgIE5TRGljdGlvbmFyeSAqYXR0cmlidXRlcyA9IG5pbDsKLSNlbmRpZgotICAgICAgICBt X3BpeGVsQnVmZmVyQ29uZm9ybWVyID0gc3RkOjptYWtlX3VuaXF1ZTxQaXhlbEJ1ZmZlckNvbmZv cm1lckNWPigoQ0ZEaWN0aW9uYXJ5UmVmKWF0dHJpYnV0ZXMpOwotICAgIH0KKyAgICBpZiAoIW1f cGl4ZWxCdWZmZXJDb25mb3JtZXIpCisgICAgICAgIG1fcGl4ZWxCdWZmZXJDb25mb3JtZXIgPSBz dGQ6Om1ha2VfdW5pcXVlPFBpeGVsQnVmZmVyQ29uZm9ybWVyQ1Y+KChDRkRpY3Rpb25hcnlSZWYp QHsgKE5TU3RyaW5nICopa0NWUGl4ZWxCdWZmZXJQaXhlbEZvcm1hdFR5cGVLZXk6IEAoa0NWUGl4 ZWxGb3JtYXRUeXBlXzMyQkdSQSkgfSk7CisKKyAgICBBU1NFUlQobV9waXhlbEJ1ZmZlckNvbmZv cm1lcik7CisgICAgaWYgKCFtX3BpeGVsQnVmZmVyQ29uZm9ybWVyKQorICAgICAgICByZXR1cm4g bnVsbHB0cjsKIAogICAgIG1fbGFzdEltYWdlID0gbV9waXhlbEJ1ZmZlckNvbmZvcm1lci0+Y3Jl YXRlSW1hZ2VGcm9tUGl4ZWxCdWZmZXIocGl4ZWxCdWZmZXIpOwogCg==