109323 2013-02-08 13:51:29 -0800 [Mac] In-band closed caption tracks are not always initialized correctly 2013-02-08 17:35:54 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric.carlson eric.carlson dino feature-media-reviews webkit.review.bot oldest_to_newest 828750 0 eric.carlson 2013-02-08 13:51:29 -0800 A logic error can cause an in-band closed caption track to be disabled inadvertently. 828822 1 187382 eric.carlson 2013-02-08 16:17:33 -0800 Created attachment 187382 Proposed patch 828855 2 eric.carlson 2013-02-08 17:35:45 -0800 Committed http://trac.webkit.org/r142334 187382 2013-02-08 16:17:33 -0800 2013-02-08 17:35:54 -0800 Proposed patch patch_3.txt text/plain 6285 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MjMyNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAyLTA4ICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtNYWNdIEluLWJhbmQg Y2xvc2VkIGNhcHRpb24gdHJhY2tzIGFyZSBub3QgYWx3YXlzIGluaXRpYWxpemVkIGNvcnJlY3Rs eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA5MzIz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzLCBtYWtlcyBleGlzdGluZyB0ZXN0cyBsZXNzIGZsYWtleS4KKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91 bmRhdGlvbk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVBVkZv dW5kYXRpb25PYmpDOjpjcmVhdGVBVlBsYXllckl0ZW0pOiBDcmVhdGUgYW5kIGNvbmZpZ3VyZSBs ZWdpYmxlIG91dHB1dAorICAgICAgICAgICAgaGVyZSBpbnN0YWQgb2YgaW4gdHJhY2tzQ2hhbmdl ZC4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6 OnNldENsb3NlZENhcHRpb25zVmlzaWJsZSk6IERvIG5vdGhpbmcgaW4gYSBidWlsZCB3aXRoCisg ICAgICAgICAgICBpbi1iYW5kIHRyYWNrIHN1cHBvcnQuCisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGVBVkZvdW5kYXRpb25PYmpDOjp0cmFja3NDaGFuZ2VkKTogTW92ZSBsZWdp YmxlIG91dHB1dCBjcmVhdGlvbiB0byAKKyAgICAgICAgICAgIGNyZWF0ZUFWUGxheWVySXRlbSwg ZG9uJ3Qgc2V0IGxvb2sgYXQgdHJhY2sgbWVkaWEgdHlwZSB0byBzZWUgaWYgdGhlIG1vdmllIGhh cyBjYXB0aW9ucyAKKyAgICAgICAgICAgIHdoZW4gd2UgaGF2ZSBzdXBwb3J0IGZvciBpbi1iYW5k IGNhcHRpb25zLgorCiAyMDEzLTAyLTA4ICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBs ZS5jb20+CiAKICAgICAgICAgUmVmYWN0b3IgcGxhdGZvcm0tc3BlY2lmaWMgY29kZSBpbiBTcGVl Y2hTeW50aGVzaXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakMubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvTWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQkocmV2aXNpb24gMTQyMzA0 KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv TWVkaWFQbGF5ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQy5tbQkod29ya2luZyBjb3B5KQpAQCAt NDM3LDYgKzQzNywyMiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6 CiAgICAgaWYgKG1fYXZQbGF5ZXIpCiAgICAgICAgIFttX2F2UGxheWVyLmdldCgpIHJlcGxhY2VD dXJyZW50SXRlbVdpdGhQbGF5ZXJJdGVtOm1fYXZQbGF5ZXJJdGVtLmdldCgpXTsKIAorI2lmIEhB VkUoQVZGT1VOREFUSU9OX1RFWFRfVFJBQ0tfU1VQUE9SVCkKKyAgICBjb25zdCBOU1RpbWVJbnRl cnZhbCBsZWdpYmxlT3V0cHV0QWR2YW5jZUludGVydmFsID0gMjsKKworICAgIG1fbGVnaWJsZU91 dHB1dCA9IGFkb3B0TlMoW1tBVlBsYXllckl0ZW1MZWdpYmxlT3V0cHV0IGFsbG9jXSBpbml0V2l0 aE1lZGlhU3VidHlwZXNGb3JOYXRpdmVSZXByZXNlbnRhdGlvbjpbTlNBcnJheSBhcnJheV1dKTsK KyAgICBbbV9sZWdpYmxlT3V0cHV0LmdldCgpIHNldFN1cHByZXNzZXNQbGF5ZXJSZW5kZXJpbmc6 WUVTXTsKKworICAgIC8vIFdlIGVuYWJsZWQgYXV0b21hdGljIG1lZGlhIHNlbGVjdGlvbiBiZWNh dXNlIHdlIHdhbnQgYWx0ZXJuYXRlIGF1ZGlvIHRyYWNrcyB0byBiZSBlbmFibGVkL2Rpc2FibGVk IGF1dG9tYXRpY2FsbHksCisgICAgLy8gYnV0IHNldCB0aGUgc2VsZWN0ZWQgbGVnaWJsZSB0cmFj ayB0byBuaWwgc28gdGV4dCB0cmFja3Mgd2lsbCBub3QgYmUgYXV0b21hdGljYWxseSBjb25maWd1 cmVkLgorICAgIFttX2F2UGxheWVySXRlbS5nZXQoKSBzZWxlY3RNZWRpYU9wdGlvbjpuaWwgaW5N ZWRpYVNlbGVjdGlvbkdyb3VwOlttX2F2QXNzZXQuZ2V0KCkgbWVkaWFTZWxlY3Rpb25Hcm91cEZv ck1lZGlhQ2hhcmFjdGVyaXN0aWM6QVZNZWRpYUNoYXJhY3RlcmlzdGljTGVnaWJsZV1dOworCisg ICAgW21fbGVnaWJsZU91dHB1dC5nZXQoKSBzZXREZWxlZ2F0ZTptX29iamNPYnNlcnZlci5nZXQo KSBxdWV1ZTpkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpXTsKKyAgICBbbV9sZWdpYmxlT3V0cHV0 LmdldCgpIHNldEFkdmFuY2VJbnRlcnZhbEZvckRlbGVnYXRlSW52b2NhdGlvbjpsZWdpYmxlT3V0 cHV0QWR2YW5jZUludGVydmFsXTsKKyAgICBbbV9sZWdpYmxlT3V0cHV0LmdldCgpIHNldFRleHRT dHlsaW5nUmVzb2x1dGlvbjpBVlBsYXllckl0ZW1MZWdpYmxlT3V0cHV0VGV4dFN0eWxpbmdSZXNv bHV0aW9uU291cmNlQW5kUnVsZXNPbmx5XTsKKyAgICBbbV9hdlBsYXllckl0ZW0uZ2V0KCkgYWRk T3V0cHV0Om1fbGVnaWJsZU91dHB1dC5nZXQoKV07CisjZW5kaWYKKwogICAgIHNldERlbGF5Q2Fs bGJhY2tzKGZhbHNlKTsKIH0KIApAQCAtNTk1LDggKzYxMSwxMiBAQCB2b2lkIE1lZGlhUGxheWVy UHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6CiAgICAgaWYgKCFtZXRhRGF0YUF2YWlsYWJsZSgpKQog ICAgICAgICByZXR1cm47CiAKKyNpZiBIQVZFKEFWRk9VTkRBVElPTl9URVhUX1RSQUNLX1NVUFBP UlQpCisgICAgVU5VU0VEX1BBUkFNKGNsb3NlZENhcHRpb25zVmlzaWJsZSk7CisjZWxzZQogICAg IExPRyhNZWRpYSwgIk1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnNldENsb3Nl ZENhcHRpb25zVmlzaWJsZSglcCkgLSBzZXR0aW5nIHRvICVzIiwgdGhpcywgYm9vbFN0cmluZyhj bG9zZWRDYXB0aW9uc1Zpc2libGUpKTsKICAgICBbbV9hdlBsYXllci5nZXQoKSBzZXRDbG9zZWRD YXB0aW9uRGlzcGxheUVuYWJsZWQ6Y2xvc2VkQ2FwdGlvbnNWaXNpYmxlXTsKKyNlbmRpZgogfQog CiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6OnVwZGF0ZVJhdGUoKQpA QCAtOTA0LDI0ICs5MjQsNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9i akM6CiAgICAgaWYgKCFtX2F2QXNzZXQpCiAgICAgICAgIHJldHVybjsKIAotI2lmIEhBVkUoQVZG T1VOREFUSU9OX1RFWFRfVFJBQ0tfU1VQUE9SVCkKLSAgICBjb25zdCBOU1RpbWVJbnRlcnZhbCBs ZWdpYmxlT3V0cHV0QWR2YW5jZUludGVydmFsID0gMjsKLQotICAgIGlmIChtX2F2UGxheWVySXRl bSAmJiAhbV9sZWdpYmxlT3V0cHV0KSB7Ci0gICAgICAgIG1fbGVnaWJsZU91dHB1dCA9IGFkb3B0 TlMoW1tBVlBsYXllckl0ZW1MZWdpYmxlT3V0cHV0IGFsbG9jXSBpbml0V2l0aE1lZGlhU3VidHlw ZXNGb3JOYXRpdmVSZXByZXNlbnRhdGlvbjpbTlNBcnJheSBhcnJheV1dKTsKLSAgICAgICAgW21f bGVnaWJsZU91dHB1dC5nZXQoKSBzZXRTdXBwcmVzc2VzUGxheWVyUmVuZGVyaW5nOllFU107Ci0K LSAgICAgICAgLy8gV2UgZW5hYmxlZCBhdXRvbWF0aWMgbWVkaWEgc2VsZWN0aW9uIGJlY2F1c2Ug d2Ugd2FudCBhbHRlcm5hdGUgYXVkaW8gdHJhY2tzIHRvIGJlIGVuYWJsZWQvZGlzYWJsZWQgYXV0 b21hdGljYWxseSwKLSAgICAgICAgLy8gYnV0IHNldCB0aGUgc2VsZWN0ZWQgbGVnaWJsZSB0cmFj ayB0byBuaWwgc28gdGV4dCB0cmFja3Mgd2lsbCBub3QgYmUgYXV0b21hdGljYWxseSBjb25maWd1 cmVkLgotICAgICAgICBbbV9hdlBsYXllckl0ZW0uZ2V0KCkgc2VsZWN0TWVkaWFPcHRpb246bmls IGluTWVkaWFTZWxlY3Rpb25Hcm91cDpbbV9hdkFzc2V0LmdldCgpIG1lZGlhU2VsZWN0aW9uR3Jv dXBGb3JNZWRpYUNoYXJhY3RlcmlzdGljOkFWTWVkaWFDaGFyYWN0ZXJpc3RpY0xlZ2libGVdXTsK LQotICAgICAgICBbbV9sZWdpYmxlT3V0cHV0LmdldCgpIHNldERlbGVnYXRlOm1fb2JqY09ic2Vy dmVyLmdldCgpIHF1ZXVlOmRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCldOwotICAgICAgICBbbV9s ZWdpYmxlT3V0cHV0LmdldCgpIHNldEFkdmFuY2VJbnRlcnZhbEZvckRlbGVnYXRlSW52b2NhdGlv bjpsZWdpYmxlT3V0cHV0QWR2YW5jZUludGVydmFsXTsKLSAgICAgICAgW21fbGVnaWJsZU91dHB1 dC5nZXQoKSBzZXRUZXh0U3R5bGluZ1Jlc29sdXRpb246QVZQbGF5ZXJJdGVtTGVnaWJsZU91dHB1 dFRleHRTdHlsaW5nUmVzb2x1dGlvblNvdXJjZUFuZFJ1bGVzT25seV07Ci0gICAgICAgIFttX2F2 UGxheWVySXRlbS5nZXQoKSBhZGRPdXRwdXQ6bV9sZWdpYmxlT3V0cHV0LmdldCgpXTsKLSAgICB9 Ci0jZW5kaWYKLQogICAgIGJvb2wgaGFzQ2FwdGlvbnMgPSBmYWxzZTsKIAogICAgIC8vIFRoaXMg aXMgY2FsbGVkIHdoZW5ldmVyIHRoZSB0cmFja3MgY29sbGVjdGlvbiBjaGFuZ2VzIHNvIGNhY2hl IGhhc1ZpZGVvIGFuZCBoYXNBdWRpbyBzaW5jZSB3ZSBhcmUKQEAgLTkzMSw3ICs5MzMsOSBAQCB2 b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUFWRm91bmRhdGlvbk9iakM6CiAgICAgICAgIC8vIHByaW9y IHRvIGJlY29taW5nIHJlYWR5IHRvIHBsYXkuCiAgICAgICAgIHNldEhhc1ZpZGVvKFtbbV9hdkFz c2V0LmdldCgpIHRyYWNrc1dpdGhNZWRpYUNoYXJhY3RlcmlzdGljOkFWTWVkaWFDaGFyYWN0ZXJp c3RpY1Zpc3VhbF0gY291bnRdKTsKICAgICAgICAgc2V0SGFzQXVkaW8oW1ttX2F2QXNzZXQuZ2V0 KCkgdHJhY2tzV2l0aE1lZGlhQ2hhcmFjdGVyaXN0aWM6QVZNZWRpYUNoYXJhY3RlcmlzdGljQXVk aWJsZV0gY291bnRdKTsKKyNpZiAhSEFWRShBVkZPVU5EQVRJT05fVEVYVF9UUkFDS19TVVBQT1JU KQogICAgICAgICBoYXNDYXB0aW9ucyA9IFtbbV9hdkFzc2V0LmdldCgpIHRyYWNrc1dpdGhNZWRp YVR5cGU6QVZNZWRpYVR5cGVDbG9zZWRDYXB0aW9uXSBjb3VudF07CisjZW5kaWYKICAgICB9IGVs c2UgewogICAgICAgICBib29sIGhhc1ZpZGVvID0gZmFsc2U7CiAgICAgICAgIGJvb2wgaGFzQXVk aW8gPSBmYWxzZTsKQEAgLTk0Myw4ICs5NDcsMTAgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVB VkZvdW5kYXRpb25PYmpDOgogICAgICAgICAgICAgICAgICAgICBoYXNWaWRlbyA9IHRydWU7CiAg ICAgICAgICAgICAgICAgZWxzZSBpZiAoW1thc3NldFRyYWNrIG1lZGlhVHlwZV0gaXNFcXVhbFRv U3RyaW5nOkFWTWVkaWFUeXBlQXVkaW9dKQogICAgICAgICAgICAgICAgICAgICBoYXNBdWRpbyA9 IHRydWU7CisjaWYgIUhBVkUoQVZGT1VOREFUSU9OX1RFWFRfVFJBQ0tfU1VQUE9SVCkKICAgICAg ICAgICAgICAgICBlbHNlIGlmIChbW2Fzc2V0VHJhY2sgbWVkaWFUeXBlXSBpc0VxdWFsVG9TdHJp bmc6QVZNZWRpYVR5cGVDbG9zZWRDYXB0aW9uXSkKICAgICAgICAgICAgICAgICAgICAgaGFzQ2Fw dGlvbnMgPSB0cnVlOworI2VuZGlmCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAg c2V0SGFzVmlkZW8oaGFzVmlkZW8pOwpAQCAtOTUyLDcgKzk1OCw3IEBAIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlQVZGb3VuZGF0aW9uT2JqQzoKICAgICB9CiAKICNpZiBIQVZFKEFWRk9VTkRBVElP Tl9URVhUX1RSQUNLX1NVUFBPUlQpCi0gICAgaWYgKCFoYXNDYXB0aW9ucykgeworICAgIGlmICgh aGFzQ2FwdGlvbnMgJiYgbV9sZWdpYmxlT3V0cHV0KSB7CiAgICAgICAgIEFWTWVkaWFTZWxlY3Rp b25Hcm91cFR5cGUgKmxlZ2libGVHcm91cCA9IFttX2F2QXNzZXQuZ2V0KCkgbWVkaWFTZWxlY3Rp b25Hcm91cEZvck1lZGlhQ2hhcmFjdGVyaXN0aWM6QVZNZWRpYUNoYXJhY3RlcmlzdGljTGVnaWJs ZV07CiAgICAgICAgIGhhc0NhcHRpb25zID0gW1tBVk1lZGlhU2VsZWN0aW9uR3JvdXAgcGxheWFi bGVNZWRpYVNlbGVjdGlvbk9wdGlvbnNGcm9tQXJyYXk6W2xlZ2libGVHcm91cCBvcHRpb25zXV0g Y291bnRdOwogICAgIH0K