120335 2013-08-26 17:32:59 -0700 [Windows] some track language tags are not recognized 2013-08-27 09:01:18 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC Unspecified RESOLVED FIXED InRadar P2 Normal --- 119643 1 bfulgham bfulgham commit-queue eric.carlson glenn jer.noble oldest_to_newest 921252 0 bfulgham 2013-08-26 17:32:59 -0700 Port the Mac-only changes from Bug 119643 (landed in https://trac.webkit.org/r154527) to Windows. Specifically: If a movie's language code is stored as a QuickTime 5-bit packed code there aren't enough bits for a full RFC 4646 language tag. The AVFoundation API we use returns NULL in this case, so we have to try another to see if we can get the ISO 639-2/T language code. 921253 1 bfulgham 2013-08-26 17:33:25 -0700 <rdar://problem/14836284> 921255 2 209697 bfulgham 2013-08-26 17:37:16 -0700 Created attachment 209697 Patch 921256 3 commit-queue 2013-08-26 17:38:29 -0700 Attachment 209697 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp']" exit_code: 1 Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:1113: Use 0 or null instead of NULL (even in *comments*). [readability/null] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 921260 4 209697 eric.carlson 2013-08-26 17:49:15 -0700 Comment on attachment 209697 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=209697&action=review > Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:928 > if (!primaryAudioTrackLanguage.isNull() && primaryAudioTrackLanguage != languageOfPrimaryAudioTrack()) > player()->characteristicChanged(); This should be: if (primaryAudioTrackLanguage != languageOfPrimaryAudioTrack()) characteristicsChanged(); >> Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:1113 >> + // RFC 4646 language tag so extendedLanguageTag returns NULL. In this case languageCode will return the > > Use 0 or null instead of NULL (even in *comments*). [readability/null] [4] StyleQueue fail :-O 921551 5 bfulgham 2013-08-27 08:54:25 -0700 Committed r154693: <http://trac.webkit.org/changeset/154693> 921555 6 bfulgham 2013-08-27 09:01:18 -0700 Minor correction made in r154694: <http://trac.webkit.org/changeset/154694> 209697 2013-08-26 17:37:16 -0700 2013-08-26 17:49:15 -0700 Patch bug-120335-20130826173707.patch text/plain 2604 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDY1MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDEzLTA4LTI2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5kb3dzXSBzb21lIHRy YWNrIGxhbmd1YWdlIHRhZ3MgYXJlIG5vdCByZWNvZ25pemVkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjAzMzUKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRh dGlvbi9jZi9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRi5jcHA6IFJldmlzZSBpbXBs ZW1lbnRhdGlvbgorICAgICAgICB0byBtYXRjaCBsb2dpYyBpbiBwbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpjLm1tCisK IDIwMTMtMDgtMjYgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBXZSBzaG91bGQgcmVnZW5lcmF0ZSBJbnNwZWN0b3JCYWNrZW5k Q29tbWFuZHMuanMgZm9yIExlZ2FjeSBJbnNwZWN0b3IuanNvbiB2ZXJzaW9ucwpJbmRleDogU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL2NmL01lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbkNGLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3Vu ZGF0aW9uQ0YuY3BwCShyZXZpc2lvbiAxNTQ2MzcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9hdmZvdW5kYXRpb24vY2YvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u Q0YuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NDksNiArODQ5LDggQEAgdm9pZCBNZWRpYVBsYXll clByaXZhdGVBVkZvdW5kYXRpb25DRjo6dAogICAgIGlmICghYXZBc3NldChtX2F2ZldyYXBwZXIp KQogICAgICAgICByZXR1cm47CiAKKyAgICBzZXREZWxheUNoYXJhY3RlcmlzdGljc0NoYW5nZWRO b3RpZmljYXRpb24odHJ1ZSk7CisKICAgICBib29sIGhhdmVDQ1RyYWNrID0gZmFsc2U7CiAgICAg Ym9vbCBoYXNDYXB0aW9ucyA9IGZhbHNlOwogCkBAIC05MjQsNiArOTI2LDggQEAgdm9pZCBNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25DRjo6dAogCiAgICAgaWYgKCFwcmltYXJ5QXVkaW9U cmFja0xhbmd1YWdlLmlzTnVsbCgpICYmIHByaW1hcnlBdWRpb1RyYWNrTGFuZ3VhZ2UgIT0gbGFu Z3VhZ2VPZlByaW1hcnlBdWRpb1RyYWNrKCkpCiAgICAgICAgIHBsYXllcigpLT5jaGFyYWN0ZXJp c3RpY0NoYW5nZWQoKTsKKworICAgIHNldERlbGF5Q2hhcmFjdGVyaXN0aWNzQ2hhbmdlZE5vdGlm aWNhdGlvbihmYWxzZSk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9u Q0Y6OnNpemVDaGFuZ2VkKCkKQEAgLTExMDUsNiArMTEwOSwxMiBAQCBTdHJpbmcgTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uQ0Y6CiAgICAgQVZDRkFzc2V0VHJhY2tSZWYgdHJhY2sgPSAo QVZDRkFzc2V0VHJhY2tSZWYpQ0ZBcnJheUdldFZhbHVlQXRJbmRleCh0cmFja3MuZ2V0KCksIDAp OwogICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gbGFuZ3VhZ2UgPSBhZG9wdENGKEFWQ0ZBc3Nl dFRyYWNrQ29weUV4dGVuZGVkTGFuZ3VhZ2VUYWcodHJhY2spKTsKIAorICAgIC8vIElmIHRoZSBs YW5ndWFnZSBjb2RlIGlzIHN0b3JlZCBhcyBhIFF1aWNrVGltZSA1LWJpdCBwYWNrZWQgY29kZSB0 aGVyZSBhcmVuJ3QgZW5vdWdoIGJpdHMgZm9yIGEgZnVsbAorICAgIC8vIFJGQyA0NjQ2IGxhbmd1 YWdlIHRhZyBzbyBleHRlbmRlZExhbmd1YWdlVGFnIHJldHVybnMgTlVMTC4gSW4gdGhpcyBjYXNl IGxhbmd1YWdlQ29kZSB3aWxsIHJldHVybiB0aGUKKyAgICAvLyBJU08gNjM5LTIvVCBsYW5ndWFn ZSBjb2RlIHNvIGNoZWNrIGl0LgorICAgIGlmICghbGFuZ3VhZ2UpCisgICAgICAgIGxhbmd1YWdl ID0gYWRvcHRDRihBVkNGQXNzZXRUcmFja0NvcHlMYW5ndWFnZUNvZGUodHJhY2spKTsKKwogICAg IC8vIFNvbWUgbGVnYWN5IHRyYWNrcyBoYXZlICJ1bmQiIGFzIGEgbGFuZ3VhZ2UsIHRyZWF0IHRo YXQgdGhlIHNhbWUgYXMgbm8gbGFuZ3VhZ2UgYXQgYWxsLgogICAgIGlmIChsYW5ndWFnZSAmJiBD RlN0cmluZ0NvbXBhcmUobGFuZ3VhZ2UuZ2V0KCksIENGU1RSKCJ1bmQiKSwga0NGQ29tcGFyZUNh c2VJbnNlbnNpdGl2ZSkgIT0ga0NGQ29tcGFyZUVxdWFsVG8pIHsKICAgICAgICAgbV9sYW5ndWFn ZU9mUHJpbWFyeUF1ZGlvVHJhY2sgPSBsYW5ndWFnZS5nZXQoKTsK