152890 2016-01-08 06:24:31 -0800 [WinCairo] Support more video formats. 2016-01-08 13:44:39 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 peavo webkit-unassigned achristensen bfulgham oldest_to_newest 1153809 0 peavo 2016-01-08 06:24:31 -0800 Use MediaFoundation api to detect all supported video/audio formats. 1153811 1 268541 peavo 2016-01-08 06:28:33 -0800 Created attachment 268541 Patch 1153848 2 268541 achristensen 2016-01-08 09:59:21 -0800 Comment on attachment 268541 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268541&action=review Functionality looks good, there are just a few optimizations and reorganizations we need to do. > Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:124 > + static HashSet<String> cachedTypes; Use NeverDestroyed instead of static. Also, you should probably make this in a separate function like gstreamer's mimeTypeCache(), except have it just return a reference, not a whole HashSet. > Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:134 > + HRESULT hr = MFGetSupportedMimeTypesPtr()(&propVarMimeTypeArray); This will crash on WindowsXP. I don't think that's a problem, because we don't support XP any more. > Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:156 > + HashSet<String> types; > + getSupportedTypes(types); We should't copy the whole HashSet every time we want to check if one type is supported. > Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:158 > + for (HashSet<String>::iterator it = types.begin(); it != types.end(); ++it) { This is what HashSet.contains is for. No need to iterate. 1153852 3 peavo 2016-01-08 10:16:35 -0800 Thanks for reviewing, will update the patch :) 1153936 4 268569 peavo 2016-01-08 12:05:12 -0800 Created attachment 268569 Patch 1153940 5 268569 achristensen 2016-01-08 12:08:53 -0800 Comment on attachment 268569 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=268569&action=review > Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:142 > + for (int i = 0; i < mimeTypeArray.cElems; i++) cElems is an unsigned int. Please use unsigned for i. 1153991 6 peavo 2016-01-08 13:44:39 -0800 Committed r194787: <http://trac.webkit.org/changeset/194787>. 268541 2016-01-08 06:28:33 -0800 2016-01-08 12:05:04 -0800 Patch bug-152890-20160108152801.patch text/plain 3259 peavo SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NDc2MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE2LTAxLTA4ICBQZXIgQXJu ZSBWb2xsYW4gIDxwZWF2b0BvdXRsb29rLmNvbT4KKworICAgICAgICBbV2luQ2Fpcm9dIFN1cHBv cnQgbW9yZSB2aWRlbyBmb3JtYXRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTUyODkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXNlIE1lZGlhRm91bmRhdGlvbiBhcGkgdG8gZGV0ZWN0IGFsbCBzdXBw b3J0ZWQgdmlkZW8vYXVkaW8gZm9ybWF0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L3dpbi9NZWRpYVBsYXllclByaXZhdGVNZWRpYUZvdW5kYXRpb24uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFGb3VuZGF0aW9uOjpnZXRTdXBwb3J0ZWRUeXBl cyk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYUZvdW5kYXRpb246 OnN1cHBvcnRzVHlwZSk6CisKIDIwMTYtMDEtMDcgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBw bGUuY29tPgogCiAgICAgICAgIEVuYWJsZSBzZWxlY3RvciBmaWx0ZXJpbmcgZm9yIHNoYWRvdyB0 cmVlcwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhRm91bmRhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhRm91bmRhdGlv bi5jcHAJKHJldmlzaW9uIDE5NDc2MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVNZWRpYUZvdW5kYXRpb24uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC01MSw2ICs1MSw3IEBAIFNPRlRfTElOS19PUFRJT05BTChNZiwgTUZHZXRTZXJ2aWNl LCBIUkUKIFNPRlRfTElOS19PUFRJT05BTChNZiwgTUZDcmVhdGVBdWRpb1JlbmRlcmVyQWN0aXZh dGUsIEhSRVNVTFQsIFNUREFQSUNBTExUWVBFLCAoSU1GQWN0aXZhdGUqKikpOwogU09GVF9MSU5L X09QVElPTkFMKE1mLCBNRkNyZWF0ZVZpZGVvUmVuZGVyZXJBY3RpdmF0ZSwgSFJFU1VMVCwgU1RE QVBJQ0FMTFRZUEUsIChIV05ELCBJTUZBY3RpdmF0ZSoqKSk7CiBTT0ZUX0xJTktfT1BUSU9OQUwo TWYsIE1GQ3JlYXRlU2FtcGxlR3JhYmJlclNpbmtBY3RpdmF0ZSwgSFJFU1VMVCwgU1REQVBJQ0FM TFRZUEUsIChJTUZNZWRpYVR5cGUqLCBJTUZTYW1wbGVHcmFiYmVyU2lua0NhbGxiYWNrKiwgSU1G QWN0aXZhdGUqKikpOworU09GVF9MSU5LX09QVElPTkFMKE1mLCBNRkdldFN1cHBvcnRlZE1pbWVU eXBlcywgSFJFU1VMVCwgU1REQVBJQ0FMTFRZUEUsIChQUk9QVkFSSUFOVCopKTsKIAogU09GVF9M SU5LX0xJQlJBUlkoTWZwbGF0KTsKIFNPRlRfTElOS19PUFRJT05BTChNZnBsYXQsIE1GU3RhcnR1 cCwgSFJFU1VMVCwgU1REQVBJQ0FMTFRZUEUsIChVTE9ORywgRFdPUkQpKTsKQEAgLTEyMCw3ICsx MjEsMzAgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVNZWRpYUZvdW5kYXRpb246OgogCiB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhRm91bmRhdGlvbjo6Z2V0U3VwcG9ydGVkVHlwZXMoSGFz aFNldDxTdHJpbmc+JiB0eXBlcykKIHsKLSAgICB0eXBlcy5hZGQoU3RyaW5nKCJ2aWRlby9tcDQi KSk7CisgICAgc3RhdGljIEhhc2hTZXQ8U3RyaW5nPiBjYWNoZWRUeXBlczsKKyAgICBpZiAoY2Fj aGVkVHlwZXMuc2l6ZSgpID4gMCkgeworICAgICAgICB0eXBlcyA9IGNhY2hlZFR5cGVzOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgY2FjaGVkVHlwZXMuYWRkKFN0cmluZygidmlkZW8v bXA0IikpOworCisgICAgUFJPUFZBUklBTlQgcHJvcFZhck1pbWVUeXBlQXJyYXk7CisgICAgUHJv cFZhcmlhbnRJbml0KCZwcm9wVmFyTWltZVR5cGVBcnJheSk7CisgICAgSFJFU1VMVCBociA9IE1G R2V0U3VwcG9ydGVkTWltZVR5cGVzUHRyKCkoJnByb3BWYXJNaW1lVHlwZUFycmF5KTsKKyAgICBp ZiAoRkFJTEVEKGhyKSkgeworICAgICAgICB0eXBlcyA9IGNhY2hlZFR5cGVzOworICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgQ0FMUFdTVFIgbWltZVR5cGVBcnJheSA9IHByb3BWYXJNaW1l VHlwZUFycmF5LmNhbHB3c3RyOworCisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBtaW1lVHlwZUFy cmF5LmNFbGVtczsgaSsrKQorICAgICAgICBjYWNoZWRUeXBlcy5hZGQobWltZVR5cGVBcnJheS5w RWxlbXNbaV0pOworCisgICAgUHJvcFZhcmlhbnRDbGVhcigmcHJvcFZhck1pbWVUeXBlQXJyYXkp OworCisgICAgdHlwZXMgPSBjYWNoZWRUeXBlczsKIH0KIAogTWVkaWFQbGF5ZXI6OlN1cHBvcnRz VHlwZSBNZWRpYVBsYXllclByaXZhdGVNZWRpYUZvdW5kYXRpb246OnN1cHBvcnRzVHlwZShjb25z dCBNZWRpYUVuZ2luZVN1cHBvcnRQYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQpAQCAtMTI4LDggKzE1 MiwxMyBAQCBNZWRpYVBsYXllcjo6U3VwcG9ydHNUeXBlIE1lZGlhUGxheWVyUHJpCiAgICAgaWYg KHBhcmFtZXRlcnMudHlwZS5pc051bGwoKSB8fCBwYXJhbWV0ZXJzLnR5cGUuaXNFbXB0eSgpKQog ICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6OklzTm90U3VwcG9ydGVkOwogCi0gICAgaWYgKHBh cmFtZXRlcnMudHlwZSA9PSAidmlkZW8vbXA0IikKLSAgICAgICAgcmV0dXJuIE1lZGlhUGxheWVy OjpJc1N1cHBvcnRlZDsKKyAgICBIYXNoU2V0PFN0cmluZz4gdHlwZXM7CisgICAgZ2V0U3VwcG9y dGVkVHlwZXModHlwZXMpOworCisgICAgZm9yIChIYXNoU2V0PFN0cmluZz46Oml0ZXJhdG9yIGl0 ID0gdHlwZXMuYmVnaW4oKTsgaXQgIT0gdHlwZXMuZW5kKCk7ICsraXQpIHsKKyAgICAgICAgaWYg KHBhcmFtZXRlcnMudHlwZSA9PSAqaXQpCisgICAgICAgICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6 OklzU3VwcG9ydGVkOworICAgIH0KIAogICAgIHJldHVybiBNZWRpYVBsYXllcjo6SXNOb3RTdXBw b3J0ZWQ7CiB9Cg== 268569 2016-01-08 12:05:12 -0800 2016-01-08 12:08:53 -0800 Patch bug-152890-20160108210441.patch text/plain 3458 peavo SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NDc2MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE2LTAxLTA4ICBQZXIgQXJu ZSBWb2xsYW4gIDxwZWF2b0BvdXRsb29rLmNvbT4KKworICAgICAgICBbV2luQ2Fpcm9dIFN1cHBv cnQgbW9yZSB2aWRlbyBmb3JtYXRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTUyODkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXNlIE1lZGlhRm91bmRhdGlvbiBhcGkgdG8gZGV0ZWN0IGFsbCBzdXBw b3J0ZWQgdmlkZW8vYXVkaW8gZm9ybWF0cy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L3dpbi9NZWRpYVBsYXllclByaXZhdGVNZWRpYUZvdW5kYXRpb24uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFGb3VuZGF0aW9uOjpnZXRTdXBwb3J0ZWRUeXBl cyk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVNZWRpYUZvdW5kYXRpb246 OnN1cHBvcnRzVHlwZSk6CisKIDIwMTYtMDEtMDcgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBw bGUuY29tPgogCiAgICAgICAgIEVuYWJsZSBzZWxlY3RvciBmaWx0ZXJpbmcgZm9yIHNoYWRvdyB0 cmVlcwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhRm91bmRhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhRm91bmRhdGlv bi5jcHAJKHJldmlzaW9uIDE5NDc2MikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVNZWRpYUZvdW5kYXRpb24uY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00MSw2ICs0MSw3IEBACiAjaWYgVVNFKE1FRElBX0ZPVU5EQVRJT04pCiAKICNpbmNs dWRlIDx3dGYvTWFpblRocmVhZC5oPgorI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgog CiBTT0ZUX0xJTktfTElCUkFSWShNZik7CiBTT0ZUX0xJTktfT1BUSU9OQUwoTWYsIE1GQ3JlYXRl U291cmNlUmVzb2x2ZXIsIEhSRVNVTFQsIFNUREFQSUNBTExUWVBFLCAoSU1GU291cmNlUmVzb2x2 ZXIqKikpOwpAQCAtNTEsNiArNTIsNyBAQCBTT0ZUX0xJTktfT1BUSU9OQUwoTWYsIE1GR2V0U2Vy dmljZSwgSFJFCiBTT0ZUX0xJTktfT1BUSU9OQUwoTWYsIE1GQ3JlYXRlQXVkaW9SZW5kZXJlckFj dGl2YXRlLCBIUkVTVUxULCBTVERBUElDQUxMVFlQRSwgKElNRkFjdGl2YXRlKiopKTsKIFNPRlRf TElOS19PUFRJT05BTChNZiwgTUZDcmVhdGVWaWRlb1JlbmRlcmVyQWN0aXZhdGUsIEhSRVNVTFQs IFNUREFQSUNBTExUWVBFLCAoSFdORCwgSU1GQWN0aXZhdGUqKikpOwogU09GVF9MSU5LX09QVElP TkFMKE1mLCBNRkNyZWF0ZVNhbXBsZUdyYWJiZXJTaW5rQWN0aXZhdGUsIEhSRVNVTFQsIFNUREFQ SUNBTExUWVBFLCAoSU1GTWVkaWFUeXBlKiwgSU1GU2FtcGxlR3JhYmJlclNpbmtDYWxsYmFjayos IElNRkFjdGl2YXRlKiopKTsKK1NPRlRfTElOS19PUFRJT05BTChNZiwgTUZHZXRTdXBwb3J0ZWRN aW1lVHlwZXMsIEhSRVNVTFQsIFNUREFQSUNBTExUWVBFLCAoUFJPUFZBUklBTlQqKSk7CiAKIFNP RlRfTElOS19MSUJSQVJZKE1mcGxhdCk7CiBTT0ZUX0xJTktfT1BUSU9OQUwoTWZwbGF0LCBNRlN0 YXJ0dXAsIEhSRVNVTFQsIFNUREFQSUNBTExUWVBFLCAoVUxPTkcsIERXT1JEKSk7CkBAIC0xMTgs OSArMTIwLDM3IEBAIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFGb3VuZGF0aW9uOjoKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIAorc3RhdGljIGNvbnN0IEhhc2hTZXQ8U3RyaW5nPiYgbWltZVR5 cGVDYWNoZSgpCit7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hTZXQ8U3RyaW5nPj4g Y2FjaGVkVHlwZXM7CisKKyAgICBpZiAoY2FjaGVkVHlwZXMuZ2V0KCkuc2l6ZSgpID4gMCkKKyAg ICAgICAgcmV0dXJuIGNhY2hlZFR5cGVzOworCisgICAgY2FjaGVkVHlwZXMuZ2V0KCkuYWRkKFN0 cmluZygidmlkZW8vbXA0IikpOworCisgICAgaWYgKCFNRkdldFN1cHBvcnRlZE1pbWVUeXBlc1B0 cigpKQorICAgICAgICByZXR1cm4gY2FjaGVkVHlwZXM7CisKKyAgICBQUk9QVkFSSUFOVCBwcm9w VmFyTWltZVR5cGVBcnJheTsKKyAgICBQcm9wVmFyaWFudEluaXQoJnByb3BWYXJNaW1lVHlwZUFy cmF5KTsKKworICAgIEhSRVNVTFQgaHIgPSBNRkdldFN1cHBvcnRlZE1pbWVUeXBlc1B0cigpKCZw cm9wVmFyTWltZVR5cGVBcnJheSk7CisKKyAgICBpZiAoU1VDQ0VFREVEKGhyKSkgeworICAgICAg ICBDQUxQV1NUUiBtaW1lVHlwZUFycmF5ID0gcHJvcFZhck1pbWVUeXBlQXJyYXkuY2FscHdzdHI7 CisgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbWltZVR5cGVBcnJheS5jRWxlbXM7IGkrKykK KyAgICAgICAgICAgIGNhY2hlZFR5cGVzLmdldCgpLmFkZChtaW1lVHlwZUFycmF5LnBFbGVtc1tp XSk7CisgICAgfQorCisgICAgUHJvcFZhcmlhbnRDbGVhcigmcHJvcFZhck1pbWVUeXBlQXJyYXkp OworCisgICAgcmV0dXJuIGNhY2hlZFR5cGVzOworfQorCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZU1lZGlhRm91bmRhdGlvbjo6Z2V0U3VwcG9ydGVkVHlwZXMoSGFzaFNldDxTdHJpbmc+JiB0eXBl cykKIHsKLSAgICB0eXBlcy5hZGQoU3RyaW5nKCJ2aWRlby9tcDQiKSk7CisgICAgdHlwZXMgPSBt aW1lVHlwZUNhY2hlKCk7CiB9CiAKIE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGUgTWVkaWFQbGF5 ZXJQcml2YXRlTWVkaWFGb3VuZGF0aW9uOjpzdXBwb3J0c1R5cGUoY29uc3QgTWVkaWFFbmdpbmVT dXBwb3J0UGFyYW1ldGVycyYgcGFyYW1ldGVycykKQEAgLTEyOCw3ICsxNTgsNyBAQCBNZWRpYVBs YXllcjo6U3VwcG9ydHNUeXBlIE1lZGlhUGxheWVyUHJpCiAgICAgaWYgKHBhcmFtZXRlcnMudHlw ZS5pc051bGwoKSB8fCBwYXJhbWV0ZXJzLnR5cGUuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4g TWVkaWFQbGF5ZXI6OklzTm90U3VwcG9ydGVkOwogCi0gICAgaWYgKHBhcmFtZXRlcnMudHlwZSA9 PSAidmlkZW8vbXA0IikKKyAgICBpZiAobWltZVR5cGVDYWNoZSgpLmNvbnRhaW5zKHBhcmFtZXRl cnMudHlwZSkpCiAgICAgICAgIHJldHVybiBNZWRpYVBsYXllcjo6SXNTdXBwb3J0ZWQ7CiAKICAg ICByZXR1cm4gTWVkaWFQbGF5ZXI6OklzTm90U3VwcG9ydGVkOwo=