129310 2014-02-25 08:28:04 -0800 [EME][Mac] Fix a few issues in CDMSessionMediaSourceAVFObjC. 2014-02-25 10:18:48 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson glenn philipj sergio oldest_to_newest 984323 0 jer.noble 2014-02-25 08:28:04 -0800 [EME][Mac] Fix a few issues in CDMSessionMediaSourceAVFObjC. 984325 1 225148 jer.noble 2014-02-25 08:33:20 -0800 Created attachment 225148 Patch 984388 2 jer.noble 2014-02-25 10:18:48 -0800 Committed r164656: <http://trac.webkit.org/changeset/164656> 225148 2014-02-25 08:33:20 -0800 2014-02-25 09:12:24 -0800 Patch bug-129310-20140225083323.patch text/plain 4163 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0NjI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTA2YmY1NDY5YWUyMjBh OGY1ZDIxN2U1NzZkZTY2ZDdhYTA1YzNlNi4uN2FhZDA2MDYwMjhhMGUxYmYyNDQzMDYxZDAyZjM5 MWMwYWUyY2Y5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTAyLTI1ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtFTUVdW01hY10gRml4IGEg ZmV3IGlzc3VlcyBpbiBDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5MzEwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT25seSBzZW5kIGEgJ2tleWVycm9y JyBldmVudCBpZiBhbiBhY3R1YWwgZXJyb3IgY29kZSB3YXMgcmV0dXJuZWQsIG5vdCBqdXN0Cisg ICAgICAgIHdoZW4gbm8ga2V5IHdhcyBhZGRlZDoKKyAgICAgICAgKiBNb2R1bGVzL2VuY3J5cHRl ZG1lZGlhL01lZGlhS2V5U2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUtleVNl c3Npb246OmFkZEtleVRpbWVyRmlyZWQpOgorCisgICAgICAgIFRoZSAnbGVuZ3RoJyBwYXJhbWV0 ZXIgdG8gYSB0eXBlZCBBcnJheUJ1ZmZlclZpZXcgaXMgdGhlIG51bWJlciBvZiBlbnRyaWVzCisg ICAgICAgIGluIHRoZSBhcnJheSwgbm90IHRoZSBieXRlIGxlbmd0aDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZP YmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6Q0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6 Z2VuZXJhdGVLZXlSZXF1ZXN0KToKKworICAgICAgICBUaGUgcmV0dXJuIHZhbHVlIG9mIHN0cmVh bWluZ0NvbnRlbnRLZXlSZXF1ZXN0RGF0YUZvckFwcDpjb250ZW50SWRlbnRpZmllcjp0cmFja0lk Om9wdGlvbnM6ZXJyb3IKKyAgICAgICAgaXMgYXV0b3JlbGVhc2VkOyBkbyBub3Qgd3JhcCBpdCBp biBhbiBhZG9wdE5TOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL0NETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpD RE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjp1cGRhdGUpOgorCiAyMDE0LTAyLTI0ICBNYXJr IExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBOZWVkIHRvIGluaXRpYWxpemUg Vk0gc3RhY2sgZGF0YSBldmVuIHdoZW4gdGhlIFZNIGlzIG9uIGFuIGV4Y2x1c2l2ZSB0aHJlYWQu CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01lZGlh S2V5U2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2VuY3J5cHRlZG1lZGlhL01l ZGlhS2V5U2Vzc2lvbi5jcHAKaW5kZXggNzBhNzNjZTBkNzliZmZiZjY4YzZlYmY5MTQxZDdhMDY5 NjhmNTRhNC4uNDQyZmQ3YmFkZDdhNDE3ZTNkNGI4MmQxNjQ3YzFhOWY4YWQ0OTg3YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9lbmNyeXB0ZWRtZWRpYS9NZWRpYUtleVNlc3Np b24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvZW5jcnlwdGVkbWVkaWEvTWVkaWFL ZXlTZXNzaW9uLmNwcApAQCAtMjAwLDcgKzIwMCw3IEBAIHZvaWQgTWVkaWFLZXlTZXNzaW9uOjph ZGRLZXlUaW1lckZpcmVkKFRpbWVyPE1lZGlhS2V5U2Vzc2lvbj4mKQogICAgICAgICB9CiAKICAg ICAgICAgLy8gMi44LiBJZiBhbnkgb2YgdGhlIHByZWNlZGluZyBzdGVwcyBpbiB0aGUgdGFzayBm YWlsZWQKLSAgICAgICAgaWYgKCFkaWRTdG9yZUtleSkgeworICAgICAgICBpZiAoZXJyb3JDb2Rl KSB7CiAgICAgICAgICAgICAvLyAyLjguMS4gQ3JlYXRlIGEgbmV3IE1lZGlhS2V5RXJyb3Igb2Jq ZWN0IHdpdGggdGhlIGZvbGxvd2luZyBhdHRyaWJ1dGVzOgogICAgICAgICAgICAgLy8gICAgICAg IGNvZGUgPSB0aGUgYXBwcm9wcmlhdGUgTWVkaWFLZXlFcnJvciBjb2RlCiAgICAgICAgICAgICAv LyAgICAgICAgc3lzdGVtQ29kZSA9IGEgS2V5IFN5c3RlbS1zcGVjaWZpYyB2YWx1ZSwgaWYgcHJv dmlkZWQsIGFuZCAwIG90aGVyd2lzZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2Jq Qy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L0NETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakMubW0KaW5kZXggZWE4YzA2ODZkMzNmYTI2ODBl NWJiMTIzODQxY2EzODdlMzlkMmRmMS4uZDc4ZGUyNzlhOWNmOTI3NTIwOWEwMjcxOTU1NjBmZDI5 ZTU2YTI0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQy5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9DRE1TZXNzaW9u TWVkaWFTb3VyY2VBVkZPYmpDLm1tCkBAIC03NCw3ICs3NCw3IEBAIFBhc3NSZWZQdHI8VWludDhB cnJheT4gQ0RNU2Vzc2lvbk1lZGlhU291cmNlQVZGT2JqQzo6Z2VuZXJhdGVLZXlSZXF1ZXN0KGNv bnN0IFN0CiAKICAgICBTdHJpbmcgY2VydGlmaWNhdGVTdHJpbmcoQVNDSUlMaXRlcmFsKCJjZXJ0 aWZpY2F0ZSIpKTsKICAgICBSZWZQdHI8QXJyYXlCdWZmZXI+IGJ1ZmZlciA9IEFycmF5QnVmZmVy OjpjcmVhdGUoY2VydGlmaWNhdGVTdHJpbmcubGVuZ3RoKCksIDIpOwotICAgIFJlZlB0cjxKU0M6 OlVpbnQxNkFycmF5PiBhcnJheSA9IEpTQzo6VWludDE2QXJyYXk6OmNyZWF0ZShidWZmZXIsIDAs IGJ1ZmZlci0+Ynl0ZUxlbmd0aCgpKTsKKyAgICBSZWZQdHI8SlNDOjpVaW50MTZBcnJheT4gYXJy YXkgPSBKU0M6OlVpbnQxNkFycmF5OjpjcmVhdGUoYnVmZmVyLCAwLCBjZXJ0aWZpY2F0ZVN0cmlu Zy5sZW5ndGgoKSk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMCwgbGVuZ3RoID0gY2VydGlmaWNh dGVTdHJpbmcubGVuZ3RoKCk7IGkgPCBsZW5ndGg7ICsraSkKICAgICAgICAgYXJyYXktPnNldChp LCBjZXJ0aWZpY2F0ZVN0cmluZ1tpXSk7CiAgICAgcmV0dXJuIFVpbnQ4QXJyYXk6OmNyZWF0ZShi dWZmZXIsIDAsIGJ1ZmZlci0+Ynl0ZUxlbmd0aCgpKTsKQEAgLTk2LDcgKzk2LDcgQEAgYm9vbCBD RE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDOjp1cGRhdGUoVWludDhBcnJheSoga2V5LCBSZWZQ dHI8VWludDhBcnJheT4mIG4KICAgICAgICAgUmV0YWluUHRyPE5TRGF0YT4gaW5pdERhdGEgPSBh ZG9wdE5TKFtbTlNEYXRhIGFsbG9jXSBpbml0V2l0aEJ5dGVzOm1faW5pdERhdGEtPmRhdGEoKSBs ZW5ndGg6bV9pbml0RGF0YS0+bGVuZ3RoKCldKTsKIAogICAgICAgICBOU0Vycm9yKiBlcnJvciA9 IG5pbDsKLSAgICAgICAgUmV0YWluUHRyPE5TRGF0YT4gcmVxdWVzdCA9IGFkb3B0TlMoW21fcGFy ZW50LT5wYXJzZXIoKSBzdHJlYW1pbmdDb250ZW50S2V5UmVxdWVzdERhdGFGb3JBcHA6Y2VydGlm aWNhdGVEYXRhLmdldCgpIGNvbnRlbnRJZGVudGlmaWVyOmluaXREYXRhLmdldCgpIHRyYWNrSUQ6 bV9wYXJlbnQtPnByb3RlY3RlZFRyYWNrSUQoKSBvcHRpb25zOm5pbCBlcnJvcjomZXJyb3JdKTsK KyAgICAgICAgUmV0YWluUHRyPE5TRGF0YT4gcmVxdWVzdCA9IFttX3BhcmVudC0+cGFyc2VyKCkg c3RyZWFtaW5nQ29udGVudEtleVJlcXVlc3REYXRhRm9yQXBwOmNlcnRpZmljYXRlRGF0YS5nZXQo KSBjb250ZW50SWRlbnRpZmllcjppbml0RGF0YS5nZXQoKSB0cmFja0lEOm1fcGFyZW50LT5wcm90 ZWN0ZWRUcmFja0lEKCkgb3B0aW9uczpuaWwgZXJyb3I6JmVycm9yXTsKIAogICAgICAgICBpZiAo ZXJyb3IpIHsKICAgICAgICAgICAgIExPRyhNZWRpYSwgIkNETVNlc3Npb25NZWRpYVNvdXJjZUFW Rk9iakM6OnVwZGF0ZSglcCkgLSBlcnJvcjolQCIsIHRoaXMsIFtlcnJvciBkZXNjcmlwdGlvbl0p Owo=