158621 2016-06-10 10:10:29 -0700 WebRTC: Add test that verifies that RTCPeerConnection.addTrack can reuse an existing RTCRtpSender 2016-06-13 12:37:28 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 143211 1 adam.bergkvist webkit-unassigned commit-queue oldest_to_newest 1201262 0 adam.bergkvist 2016-06-10 10:10:29 -0700 This is behavior is detailed in the RTCPeerConnection.addTrack algorithm step 5 [1]. [1] https://w3c.github.io/webrtc-pc/archives/20160513/webrtc.html#dom-rtcpeerconnection-addtrack 1201263 1 281013 adam.bergkvist 2016-06-10 10:19:29 -0700 Created attachment 281013 Proposed patch 1201269 2 281013 eric.carlson 2016-06-10 10:37:58 -0700 Comment on attachment 281013 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=281013&action=review > LayoutTests/fast/mediastream/RTCPeerConnection-addTrack-reuse-sender.html:1 > +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> I just noticed that you are using the HTML 2.0 doctype for these tests. Why not just "<!DOCTYPE html>"? > LayoutTests/fast/mediastream/RTCPeerConnection-addTrack-reuse-sender.html:52 > + debug(""); Minor nit: you can get rid of all debug("")s by adding a '<br>' to the beginning of the next debug string. > LayoutTests/fast/mediastream/RTCPeerConnection-addTrack-reuse-sender.html:58 > + debug("*** An extra sender should have been added"); Another minor nit: why no blank line before this? > LayoutTests/fast/mediastream/RTCPeerConnection-addTrack-reuse-sender.html:69 > + debug("*** The number of senders should not have changed"); Ditto. 1201809 3 adam.bergkvist 2016-06-13 03:02:01 -0700 (In reply to comment #2) > Comment on attachment 281013 [details] > Proposed patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=281013&action=review > > > LayoutTests/fast/mediastream/RTCPeerConnection-addTrack-reuse-sender.html:1 > > +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> > > I just noticed that you are using the HTML 2.0 doctype for these tests. Why > not just "<!DOCTYPE html>"? I had not noticed that, but you're right. I based this on some other test which had this old doctype. Fixed now. > > LayoutTests/fast/mediastream/RTCPeerConnection-addTrack-reuse-sender.html:52 > > + debug(""); > > Minor nit: you can get rid of all debug("")s by adding a '<br>' to the > beginning of the next debug string. Let's use that. Fixed. > > LayoutTests/fast/mediastream/RTCPeerConnection-addTrack-reuse-sender.html:58 > > + debug("*** An extra sender should have been added"); > > Another minor nit: why no blank line before this? These lines belong to the same chunk as the ones above. I can see that the initial "***" on debug messages makes them look like "headers". I borrowed that style from some other test to highlight debug messages. > > LayoutTests/fast/mediastream/RTCPeerConnection-addTrack-reuse-sender.html:69 > > + debug("*** The number of senders should not have changed"); > > Ditto. 1201810 4 adam.bergkvist 2016-06-13 03:05:35 -0700 (In reply to comment #3) > > > LayoutTests/fast/mediastream/RTCPeerConnection-addTrack-reuse-sender.html:58 > > > + debug("*** An extra sender should have been added"); > > > > Another minor nit: why no blank line before this? > > These lines belong to the same chunk as the ones above. I can see that the > initial "***" on debug messages makes them look like "headers". I borrowed > that style from some other test to highlight debug messages. > But then again, looking at the actual test these sections are separated by newlines. Let's space them out in the results as well. :) 1201811 5 281163 adam.bergkvist 2016-06-13 03:08:46 -0700 Created attachment 281163 Updated patch Fixed review comments 1201898 6 281163 adam.bergkvist 2016-06-13 12:14:10 -0700 Comment on attachment 281163 Updated patch Thanks for reviewing Eric! 1201905 7 281163 commit-queue 2016-06-13 12:37:25 -0700 Comment on attachment 281163 Updated patch Clearing flags on attachment: 281163 Committed r201999: <http://trac.webkit.org/changeset/201999> 1201906 8 commit-queue 2016-06-13 12:37:28 -0700 All reviewed patches have been landed. Closing bug. 281013 2016-06-10 10:19:29 -0700 2016-06-13 03:08:46 -0700 Proposed patch add-track-reuse-sender_0.patch text/plain 6829 adam.bergkvist ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZmNlZDg0Li4xYWQ3M2QzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTYtMDYt MTAgIEFkYW0gQmVyZ2t2aXN0ICA8YWRhbS5iZXJna3Zpc3RAZXJpY3Nzb24uY29tPgogCisgICAg ICAgIFdlYlJUQzogQWRkIHRlc3QgdGhhdCB2ZXJpZmllcyB0aGF0IFJUQ1BlZXJDb25uZWN0aW9u LmFkZFRyYWNrIGNhbiByZXVzZSBhbiBleGlzdGluZyBSVENSdHBTZW5kZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODYyMQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0IHRvIHZlcmlmeSB0 aGF0IFJUQ1BlZXJDb25uZWN0aW9uLmFkZFRyYWNrIHJldXNlcyBhbiBleGlzdGluZyBSVENSdHBT ZW5kZXIKKyAgICAgICAgdW5kZXIgdGhlIHJpZ2h0IGNpcmN1bXN0YW5jZXMuCisKKyAgICAgICAg KiBmYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZFRyYWNrLXJldXNlLXNlbmRl ci1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0vUlRDUGVl ckNvbm5lY3Rpb24tYWRkVHJhY2stcmV1c2Utc2VuZGVyLmh0bWw6IEFkZGVkLgorICAgICAgICAq IHBsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zOgorICAgICAgICBUaGUgbWFjIHBvcnQgaXMg bm90IGJ1aWxkaW5nIHdpdGggV0VCX1JUQyB5ZXQuCisKKzIwMTYtMDYtMTAgIEFkYW0gQmVyZ2t2 aXN0ICA8YWRhbS5iZXJna3Zpc3RAZXJpY3Nzb24uY29tPgorCiAgICAgICAgIFdlYlJUQzogSW1s ZW1lbnQgTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uOjpjcmVhdGVBbnN3ZXIoKQogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4NTY2CiAKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tYWRk VHJhY2stcmV1c2Utc2VuZGVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFz dHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tYWRkVHJhY2stcmV1c2Utc2VuZGVyLWV4cGVjdGVkLnR4 dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5jODVhYmJmCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1h ZGRUcmFjay1yZXVzZS1zZW5kZXItZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMzMgQEAKK1Rlc3Qg dGhhdCBSVENQZWVyQ29ubmVjdGlvbi5hZGRUcmFjayByZXVzZXMgYW4gdW51c2VkIHNlbmRlciBv ZiB0aGUgc2FtZSBraW5kIGlmIHByZXNlbnQKKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEg c2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgor CisKKyoqKiBSZW1vdGUgZGVzY3JpcHRpb24gd2l0aCBhdWRpbyBvZmZlciBzZXQKK1BBU1MgcGMu Z2V0U2VuZGVycygpLmxlbmd0aCBpcyAxCitQQVNTIHBjLmdldFJlY2VpdmVycygpLmxlbmd0aCBp cyAxCitQQVNTIHBjLmdldFJlY2VpdmVycygpWzBdLnRyYWNrLmtpbmQgaXMgJ2F1ZGlvJworUEFT UyBwYy5nZXRUcmFuc2NlaXZlcnMoKS5sZW5ndGggaXMgMQorCisqKiogQ2hlY2sgdW51c2VkIHNl bmRlcgorYXVkaW9TZW5kZXIgPSBwYy5nZXRTZW5kZXJzKClbMF0KK1BBU1MgYXVkaW9TZW5kZXIu dHJhY2sgaXMgbnVsbAorCisqKiogQWRkaW5nIGEgdmlkZW8gdHJhY2sgc2hvdWxkIG5vdCByZXVz ZSBhdWRpb1NlbmRlciAod3Jvbmcga2luZCkKK3NlbmRlckZyb21BZGRUcmFjayA9IHBjLmFkZFRy YWNrKHZpZGVvVHJhY2ssIHN0cmVhbSkKK1BBU1Mgc2VuZGVyRnJvbUFkZFRyYWNrIGlzIG5vdCBh dWRpb1NlbmRlcgorKioqIEFuIGV4dHJhIHNlbmRlciBzaG91bGQgaGF2ZSBiZWVuIGFkZGVkCitQ QVNTIHBjLmdldFNlbmRlcnMoKS5sZW5ndGggaXMgMgorUEFTUyBwYy5nZXRTZW5kZXJzKCkuaW5j bHVkZXMoYXVkaW9TZW5kZXIpIGlzIHRydWUKK1BBU1MgcGMuZ2V0U2VuZGVycygpLmluY2x1ZGVz KHNlbmRlckZyb21BZGRUcmFjaykgaXMgdHJ1ZQorCisqKiogQWRkaW5nIGFuIGF1ZGlvIHRyYWNr IHNob3VsZCByZXVzZSBhdWRpb1NlbmRlcgorc2VuZGVyRnJvbUFkZFRyYWNrID0gcGMuYWRkVHJh Y2soYXVkaW9UcmFjaywgc3RyZWFtKQorUEFTUyBzZW5kZXJGcm9tQWRkVHJhY2sgaXMgYXVkaW9T ZW5kZXIKK1BBU1MgYXVkaW9TZW5kZXIudHJhY2sgaXMgYXVkaW9UcmFjaworKioqIFRoZSBudW1i ZXIgb2Ygc2VuZGVycyBzaG91bGQgbm90IGhhdmUgY2hhbmdlZAorUEFTUyBwYy5nZXRTZW5kZXJz KCkubGVuZ3RoIGlzIDIKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBD T01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L21lZGlhc3RyZWFtL1JUQ1Bl ZXJDb25uZWN0aW9uLWFkZFRyYWNrLXJldXNlLXNlbmRlci5odG1sIGIvTGF5b3V0VGVzdHMvZmFz dC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1hZGRUcmFjay1yZXVzZS1zZW5kZXIuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42OTIxYzhmCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1h ZGRUcmFjay1yZXVzZS1zZW5kZXIuaHRtbApAQCAtMCwwICsxLDg1IEBACis8IURPQ1RZUEUgSFRN TCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAg ICAgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3Jp cHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5PgorICAgICAgICA8c2NyaXB0PgorICAgICAgICAg ICAgbGV0IHN0cmVhbTsKKyAgICAgICAgICAgIGxldCBhdWRpb1RyYWNrOworICAgICAgICAgICAg bGV0IHZpZGVvVHJhY2s7CisKKyAgICAgICAgICAgIGxldCBhdWRpb1NlbmRlcjsKKyAgICAgICAg ICAgIGxldCBzZW5kZXJGcm9tQWRkVHJhY2s7CisKKyAgICAgICAgICAgIGRlc2NyaXB0aW9uKCJU ZXN0IHRoYXQgUlRDUGVlckNvbm5lY3Rpb24uYWRkVHJhY2sgcmV1c2VzIGFuIHVudXNlZCBzZW5k ZXIgb2YgdGhlIHNhbWUga2luZCBpZiBwcmVzZW50Iik7CisKKyAgICAgICAgICAgIGlmICh3aW5k b3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAgICAgICB0ZXN0UnVubmVyLnNldFVzZXJNZWRpYVBl cm1pc3Npb24odHJ1ZSk7CisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICBkZWJ1 ZygiVGhpcyB0ZXN0IGNhbiBub3QgYmUgcnVuIHdpdGhvdXQgdGhlIHRlc3RSdW5uZXIiKTsKKyAg ICAgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAg ICAgY29uc3QgcGMgPSBuZXcgd2Via2l0UlRDUGVlckNvbm5lY3Rpb24oe2ljZVNlcnZlcnM6W3t1 cmxzOidzdHVuOmZvby5jb20nfV19KTsKKyAgICAgICAgICAgIGNvbnN0IHJlbW90ZVBjID0gbmV3 IHdlYmtpdFJUQ1BlZXJDb25uZWN0aW9uKHtpY2VTZXJ2ZXJzOlt7dXJsczonc3R1bjpmb28uY29t J31dfSk7CisKKyAgICAgICAgICAgIG5hdmlnYXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlh KHsgImF1ZGlvIjogdHJ1ZSwgInZpZGVvIjogdHJ1ZSB9KQorICAgICAgICAgICAgLnRoZW4oZnVu Y3Rpb24gKHMpIHsKKyAgICAgICAgICAgICAgICBzdHJlYW0gPSBzOworCisgICAgICAgICAgICAg ICAgYXVkaW9UcmFjayA9IHN0cmVhbS5nZXRBdWRpb1RyYWNrcygpWzBdOworICAgICAgICAgICAg ICAgIHZpZGVvVHJhY2sgPSBzdHJlYW0uZ2V0VmlkZW9UcmFja3MoKVswXTsKKworICAgICAgICAg ICAgICAgIHJlbW90ZVBjLmFkZFRyYWNrKGF1ZGlvVHJhY2ssIHN0cmVhbSk7CisgICAgICAgICAg ICAgICAgcmV0dXJuIHJlbW90ZVBjLmNyZWF0ZU9mZmVyKCk7CisgICAgICAgICAgICB9KQorICAg ICAgICAgICAgLnRoZW4oZnVuY3Rpb24gKGF1ZGlvT2ZmZXIpIHsKKyAgICAgICAgICAgICAgICBy ZXR1cm4gcGMuc2V0UmVtb3RlRGVzY3JpcHRpb24oYXVkaW9PZmZlcik7CisgICAgICAgICAgICB9 KQorICAgICAgICAgICAgLnRoZW4oZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgICAgIGRlYnVn KCIqKiogUmVtb3RlIGRlc2NyaXB0aW9uIHdpdGggYXVkaW8gb2ZmZXIgc2V0Iik7CisKKyAgICAg ICAgICAgICAgICBzaG91bGRCZSgicGMuZ2V0U2VuZGVycygpLmxlbmd0aCIsICIxIik7CisgICAg ICAgICAgICAgICAgc2hvdWxkQmUoInBjLmdldFJlY2VpdmVycygpLmxlbmd0aCIsICIxIik7Cisg ICAgICAgICAgICAgICAgc2hvdWxkQmUoInBjLmdldFJlY2VpdmVycygpWzBdLnRyYWNrLmtpbmQi LCAiJ2F1ZGlvJyIpOworICAgICAgICAgICAgICAgIHNob3VsZEJlKCJwYy5nZXRUcmFuc2NlaXZl cnMoKS5sZW5ndGgiLCAiMSIpOworICAgICAgICAgICAgICAgIGRlYnVnKCIiKTsKKworICAgICAg ICAgICAgICAgIGRlYnVnKCIqKiogQ2hlY2sgdW51c2VkIHNlbmRlciIpOworICAgICAgICAgICAg ICAgIGV2YWxBbmRMb2coImF1ZGlvU2VuZGVyID0gcGMuZ2V0U2VuZGVycygpWzBdIik7CisgICAg ICAgICAgICAgICAgc2hvdWxkQmUoImF1ZGlvU2VuZGVyLnRyYWNrIiwgIm51bGwiKTsKKyAgICAg ICAgICAgICAgICBkZWJ1ZygiIik7CisKKyAgICAgICAgICAgICAgICBkZWJ1ZygiKioqIEFkZGlu ZyBhIHZpZGVvIHRyYWNrIHNob3VsZCBub3QgcmV1c2UgYXVkaW9TZW5kZXIgKHdyb25nIGtpbmQp Iik7CisgICAgICAgICAgICAgICAgZXZhbEFuZExvZygic2VuZGVyRnJvbUFkZFRyYWNrID0gcGMu YWRkVHJhY2sodmlkZW9UcmFjaywgc3RyZWFtKSIpOworICAgICAgICAgICAgICAgIHNob3VsZE5v dEJlKCJzZW5kZXJGcm9tQWRkVHJhY2siLCAiYXVkaW9TZW5kZXIiKTsKKworICAgICAgICAgICAg ICAgIGRlYnVnKCIqKiogQW4gZXh0cmEgc2VuZGVyIHNob3VsZCBoYXZlIGJlZW4gYWRkZWQiKTsK KyAgICAgICAgICAgICAgICBzaG91bGRCZSgicGMuZ2V0U2VuZGVycygpLmxlbmd0aCIsICIyIik7 CisgICAgICAgICAgICAgICAgc2hvdWxkQmVUcnVlKCJwYy5nZXRTZW5kZXJzKCkuaW5jbHVkZXMo YXVkaW9TZW5kZXIpIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmVUcnVlKCJwYy5nZXRTZW5k ZXJzKCkuaW5jbHVkZXMoc2VuZGVyRnJvbUFkZFRyYWNrKSIpOworICAgICAgICAgICAgICAgIGRl YnVnKCIiKTsKKworICAgICAgICAgICAgICAgIGRlYnVnKCIqKiogQWRkaW5nIGFuIGF1ZGlvIHRy YWNrIHNob3VsZCByZXVzZSBhdWRpb1NlbmRlciIpOworICAgICAgICAgICAgICAgIGV2YWxBbmRM b2coInNlbmRlckZyb21BZGRUcmFjayA9IHBjLmFkZFRyYWNrKGF1ZGlvVHJhY2ssIHN0cmVhbSki KTsKKyAgICAgICAgICAgICAgICBzaG91bGRCZSgic2VuZGVyRnJvbUFkZFRyYWNrIiwgImF1ZGlv U2VuZGVyIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoImF1ZGlvU2VuZGVyLnRyYWNrIiwg ImF1ZGlvVHJhY2siKTsKKworICAgICAgICAgICAgICAgIGRlYnVnKCIqKiogVGhlIG51bWJlciBv ZiBzZW5kZXJzIHNob3VsZCBub3QgaGF2ZSBjaGFuZ2VkIik7CisgICAgICAgICAgICAgICAgc2hv dWxkQmUoInBjLmdldFNlbmRlcnMoKS5sZW5ndGgiLCAiMiIpOworCisgICAgICAgICAgICAgICAg ZmluaXNoSlNUZXN0KCk7CisgICAgICAgICAgICB9KQorICAgICAgICAgICAgLmNhdGNoKGZ1bmN0 aW9uIChlcnJvcikgeworICAgICAgICAgICAgICAgIHRlc3RGYWlsZWQoIkVycm9yIGluIHByb21p c2UgY2hhaW46ICIgKyBlcnJvcik7CisgICAgICAgICAgICAgICAgZmluaXNoSlNUZXN0KCk7Cisg ICAgICAgICAgICB9KTsKKworICAgICAgICAgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVl OworICAgICAgICAgICAgd2luZG93LnN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CisKKyAgICAg ICAgPC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPSIuLi8uLi9yZXNvdXJjZXMvanMtdGVz dC1wb3N0LmpzIj48L3NjcmlwdD4KKyAgICA8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDUyYTIwNzIuLjljOTdmYWEgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zCkBAIC0xOTQsNiArMTk0LDcg QEAgZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1zZXRMb2NhbERlc2NyaXB0aW9u LW9mZmVyLmh0bWwKIGZhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tc2V0UmVtb3Rl RGVzY3JpcHRpb24tb2ZmZXIuaHRtbAogZmFzdC9tZWRpYXN0cmVhbS9SVENUcmFja0V2ZW50LWNv bnN0cnVjdG9yLmh0bWwKIGZhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24taW5zcGVj dC1hbnN3ZXIuaHRtbAorZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1hZGRUcmFj ay1yZXVzZS1zZW5kZXIuaHRtbAogCiAjIEFzc2VydHMgaW4gZGVidWcuCiBbIERlYnVnIF0gZmFz dC9pbWFnZXMvbGFyZ2Utc2l6ZS1pbWFnZS1jcmFzaC5odG1sIFsgU2tpcCBdCg== 281163 2016-06-13 03:08:46 -0700 2016-06-13 12:37:25 -0700 Updated patch add-track-reuse-sender_1.patch text/plain 6803 adam.bergkvist ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZmNlZDg0Li4xYWQ3M2QzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTYtMDYt MTAgIEFkYW0gQmVyZ2t2aXN0ICA8YWRhbS5iZXJna3Zpc3RAZXJpY3Nzb24uY29tPgogCisgICAg ICAgIFdlYlJUQzogQWRkIHRlc3QgdGhhdCB2ZXJpZmllcyB0aGF0IFJUQ1BlZXJDb25uZWN0aW9u LmFkZFRyYWNrIGNhbiByZXVzZSBhbiBleGlzdGluZyBSVENSdHBTZW5kZXIKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODYyMQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0ZXN0IHRvIHZlcmlmeSB0 aGF0IFJUQ1BlZXJDb25uZWN0aW9uLmFkZFRyYWNrIHJldXNlcyBhbiBleGlzdGluZyBSVENSdHBT ZW5kZXIKKyAgICAgICAgdW5kZXIgdGhlIHJpZ2h0IGNpcmN1bXN0YW5jZXMuCisKKyAgICAgICAg KiBmYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZFRyYWNrLXJldXNlLXNlbmRl ci1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbWVkaWFzdHJlYW0vUlRDUGVl ckNvbm5lY3Rpb24tYWRkVHJhY2stcmV1c2Utc2VuZGVyLmh0bWw6IEFkZGVkLgorICAgICAgICAq IHBsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zOgorICAgICAgICBUaGUgbWFjIHBvcnQgaXMg bm90IGJ1aWxkaW5nIHdpdGggV0VCX1JUQyB5ZXQuCisKKzIwMTYtMDYtMTAgIEFkYW0gQmVyZ2t2 aXN0ICA8YWRhbS5iZXJna3Zpc3RAZXJpY3Nzb24uY29tPgorCiAgICAgICAgIFdlYlJUQzogSW1s ZW1lbnQgTWVkaWFFbmRwb2ludFBlZXJDb25uZWN0aW9uOjpjcmVhdGVBbnN3ZXIoKQogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU4NTY2CiAKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tYWRk VHJhY2stcmV1c2Utc2VuZGVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFz dHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tYWRkVHJhY2stcmV1c2Utc2VuZGVyLWV4cGVjdGVkLnR4 dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kZTEyODE4Ci0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1h ZGRUcmFjay1yZXVzZS1zZW5kZXItZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMzUgQEAKK1Rlc3Qg dGhhdCBSVENQZWVyQ29ubmVjdGlvbi5hZGRUcmFjayByZXVzZXMgYW4gdW51c2VkIHNlbmRlciBv ZiB0aGUgc2FtZSBraW5kIGlmIHByZXNlbnQKKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEg c2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgor CisKKyoqKiBSZW1vdGUgZGVzY3JpcHRpb24gd2l0aCBhdWRpbyBvZmZlciBzZXQKK1BBU1MgcGMu Z2V0U2VuZGVycygpLmxlbmd0aCBpcyAxCitQQVNTIHBjLmdldFJlY2VpdmVycygpLmxlbmd0aCBp cyAxCitQQVNTIHBjLmdldFJlY2VpdmVycygpWzBdLnRyYWNrLmtpbmQgaXMgJ2F1ZGlvJworUEFT UyBwYy5nZXRUcmFuc2NlaXZlcnMoKS5sZW5ndGggaXMgMQorCisqKiogQ2hlY2sgdW51c2VkIHNl bmRlcgorYXVkaW9TZW5kZXIgPSBwYy5nZXRTZW5kZXJzKClbMF0KK1BBU1MgYXVkaW9TZW5kZXIu dHJhY2sgaXMgbnVsbAorCisqKiogQWRkaW5nIGEgdmlkZW8gdHJhY2sgc2hvdWxkIG5vdCByZXVz ZSBhdWRpb1NlbmRlciAod3Jvbmcga2luZCkKK3NlbmRlckZyb21BZGRUcmFjayA9IHBjLmFkZFRy YWNrKHZpZGVvVHJhY2ssIHN0cmVhbSkKK1BBU1Mgc2VuZGVyRnJvbUFkZFRyYWNrIGlzIG5vdCBh dWRpb1NlbmRlcgorCisqKiogQW4gZXh0cmEgc2VuZGVyIHNob3VsZCBoYXZlIGJlZW4gYWRkZWQK K1BBU1MgcGMuZ2V0U2VuZGVycygpLmxlbmd0aCBpcyAyCitQQVNTIHBjLmdldFNlbmRlcnMoKS5p bmNsdWRlcyhhdWRpb1NlbmRlcikgaXMgdHJ1ZQorUEFTUyBwYy5nZXRTZW5kZXJzKCkuaW5jbHVk ZXMoc2VuZGVyRnJvbUFkZFRyYWNrKSBpcyB0cnVlCisKKyoqKiBBZGRpbmcgYW4gYXVkaW8gdHJh Y2sgc2hvdWxkIHJldXNlIGF1ZGlvU2VuZGVyCitzZW5kZXJGcm9tQWRkVHJhY2sgPSBwYy5hZGRU cmFjayhhdWRpb1RyYWNrLCBzdHJlYW0pCitQQVNTIHNlbmRlckZyb21BZGRUcmFjayBpcyBhdWRp b1NlbmRlcgorUEFTUyBhdWRpb1NlbmRlci50cmFjayBpcyBhdWRpb1RyYWNrCisKKyoqKiBUaGUg bnVtYmVyIG9mIHNlbmRlcnMgc2hvdWxkIG5vdCBoYXZlIGNoYW5nZWQKK1BBU1MgcGMuZ2V0U2Vu ZGVycygpLmxlbmd0aCBpcyAyCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RF U1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tZWRpYXN0cmVhbS9S VENQZWVyQ29ubmVjdGlvbi1hZGRUcmFjay1yZXVzZS1zZW5kZXIuaHRtbCBiL0xheW91dFRlc3Rz L2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24tYWRkVHJhY2stcmV1c2Utc2VuZGVy Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMThkNTkyNQotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rp b24tYWRkVHJhY2stcmV1c2Utc2VuZGVyLmh0bWwKQEAgLTAsMCArMSw4MiBAQAorPCFET0NUWVBF IGh0bWw+Cis8aHRtbD4KKyAgICA8aGVhZD4KKyAgICAgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL3Jl c291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5 PgorICAgICAgICA8c2NyaXB0PgorICAgICAgICAgICAgbGV0IHN0cmVhbTsKKyAgICAgICAgICAg IGxldCBhdWRpb1RyYWNrOworICAgICAgICAgICAgbGV0IHZpZGVvVHJhY2s7CisKKyAgICAgICAg ICAgIGxldCBhdWRpb1NlbmRlcjsKKyAgICAgICAgICAgIGxldCBzZW5kZXJGcm9tQWRkVHJhY2s7 CisKKyAgICAgICAgICAgIGRlc2NyaXB0aW9uKCJUZXN0IHRoYXQgUlRDUGVlckNvbm5lY3Rpb24u YWRkVHJhY2sgcmV1c2VzIGFuIHVudXNlZCBzZW5kZXIgb2YgdGhlIHNhbWUga2luZCBpZiBwcmVz ZW50Iik7CisKKyAgICAgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAg ICAgICB0ZXN0UnVubmVyLnNldFVzZXJNZWRpYVBlcm1pc3Npb24odHJ1ZSk7CisgICAgICAgICAg ICBlbHNlIHsKKyAgICAgICAgICAgICAgICBkZWJ1ZygiVGhpcyB0ZXN0IGNhbiBub3QgYmUgcnVu IHdpdGhvdXQgdGhlIHRlc3RSdW5uZXIiKTsKKyAgICAgICAgICAgICAgICBmaW5pc2hKU1Rlc3Qo KTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgY29uc3QgcGMgPSBuZXcgd2Via2l0UlRD UGVlckNvbm5lY3Rpb24oe2ljZVNlcnZlcnM6W3t1cmxzOidzdHVuOmZvby5jb20nfV19KTsKKyAg ICAgICAgICAgIGNvbnN0IHJlbW90ZVBjID0gbmV3IHdlYmtpdFJUQ1BlZXJDb25uZWN0aW9uKHtp Y2VTZXJ2ZXJzOlt7dXJsczonc3R1bjpmb28uY29tJ31dfSk7CisKKyAgICAgICAgICAgIG5hdmln YXRvci5tZWRpYURldmljZXMuZ2V0VXNlck1lZGlhKHsgImF1ZGlvIjogdHJ1ZSwgInZpZGVvIjog dHJ1ZSB9KQorICAgICAgICAgICAgLnRoZW4oZnVuY3Rpb24gKHMpIHsKKyAgICAgICAgICAgICAg ICBzdHJlYW0gPSBzOworCisgICAgICAgICAgICAgICAgYXVkaW9UcmFjayA9IHN0cmVhbS5nZXRB dWRpb1RyYWNrcygpWzBdOworICAgICAgICAgICAgICAgIHZpZGVvVHJhY2sgPSBzdHJlYW0uZ2V0 VmlkZW9UcmFja3MoKVswXTsKKworICAgICAgICAgICAgICAgIHJlbW90ZVBjLmFkZFRyYWNrKGF1 ZGlvVHJhY2ssIHN0cmVhbSk7CisgICAgICAgICAgICAgICAgcmV0dXJuIHJlbW90ZVBjLmNyZWF0 ZU9mZmVyKCk7CisgICAgICAgICAgICB9KQorICAgICAgICAgICAgLnRoZW4oZnVuY3Rpb24gKGF1 ZGlvT2ZmZXIpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gcGMuc2V0UmVtb3RlRGVzY3JpcHRp b24oYXVkaW9PZmZlcik7CisgICAgICAgICAgICB9KQorICAgICAgICAgICAgLnRoZW4oZnVuY3Rp b24gKCkgeworICAgICAgICAgICAgICAgIGRlYnVnKCIqKiogUmVtb3RlIGRlc2NyaXB0aW9uIHdp dGggYXVkaW8gb2ZmZXIgc2V0Iik7CisKKyAgICAgICAgICAgICAgICBzaG91bGRCZSgicGMuZ2V0 U2VuZGVycygpLmxlbmd0aCIsICIxIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoInBjLmdl dFJlY2VpdmVycygpLmxlbmd0aCIsICIxIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoInBj LmdldFJlY2VpdmVycygpWzBdLnRyYWNrLmtpbmQiLCAiJ2F1ZGlvJyIpOworICAgICAgICAgICAg ICAgIHNob3VsZEJlKCJwYy5nZXRUcmFuc2NlaXZlcnMoKS5sZW5ndGgiLCAiMSIpOworCisgICAg ICAgICAgICAgICAgZGVidWcoIjxicj4qKiogQ2hlY2sgdW51c2VkIHNlbmRlciIpOworICAgICAg ICAgICAgICAgIGV2YWxBbmRMb2coImF1ZGlvU2VuZGVyID0gcGMuZ2V0U2VuZGVycygpWzBdIik7 CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoImF1ZGlvU2VuZGVyLnRyYWNrIiwgIm51bGwiKTsK KworICAgICAgICAgICAgICAgIGRlYnVnKCI8YnI+KioqIEFkZGluZyBhIHZpZGVvIHRyYWNrIHNo b3VsZCBub3QgcmV1c2UgYXVkaW9TZW5kZXIgKHdyb25nIGtpbmQpIik7CisgICAgICAgICAgICAg ICAgZXZhbEFuZExvZygic2VuZGVyRnJvbUFkZFRyYWNrID0gcGMuYWRkVHJhY2sodmlkZW9UcmFj aywgc3RyZWFtKSIpOworICAgICAgICAgICAgICAgIHNob3VsZE5vdEJlKCJzZW5kZXJGcm9tQWRk VHJhY2siLCAiYXVkaW9TZW5kZXIiKTsKKworICAgICAgICAgICAgICAgIGRlYnVnKCI8YnI+Kioq IEFuIGV4dHJhIHNlbmRlciBzaG91bGQgaGF2ZSBiZWVuIGFkZGVkIik7CisgICAgICAgICAgICAg ICAgc2hvdWxkQmUoInBjLmdldFNlbmRlcnMoKS5sZW5ndGgiLCAiMiIpOworICAgICAgICAgICAg ICAgIHNob3VsZEJlVHJ1ZSgicGMuZ2V0U2VuZGVycygpLmluY2x1ZGVzKGF1ZGlvU2VuZGVyKSIp OworICAgICAgICAgICAgICAgIHNob3VsZEJlVHJ1ZSgicGMuZ2V0U2VuZGVycygpLmluY2x1ZGVz KHNlbmRlckZyb21BZGRUcmFjaykiKTsKKworICAgICAgICAgICAgICAgIGRlYnVnKCI8YnI+Kioq IEFkZGluZyBhbiBhdWRpbyB0cmFjayBzaG91bGQgcmV1c2UgYXVkaW9TZW5kZXIiKTsKKyAgICAg ICAgICAgICAgICBldmFsQW5kTG9nKCJzZW5kZXJGcm9tQWRkVHJhY2sgPSBwYy5hZGRUcmFjayhh dWRpb1RyYWNrLCBzdHJlYW0pIik7CisgICAgICAgICAgICAgICAgc2hvdWxkQmUoInNlbmRlckZy b21BZGRUcmFjayIsICJhdWRpb1NlbmRlciIpOworICAgICAgICAgICAgICAgIHNob3VsZEJlKCJh dWRpb1NlbmRlci50cmFjayIsICJhdWRpb1RyYWNrIik7CisKKyAgICAgICAgICAgICAgICBkZWJ1 ZygiPGJyPioqKiBUaGUgbnVtYmVyIG9mIHNlbmRlcnMgc2hvdWxkIG5vdCBoYXZlIGNoYW5nZWQi KTsKKyAgICAgICAgICAgICAgICBzaG91bGRCZSgicGMuZ2V0U2VuZGVycygpLmxlbmd0aCIsICIy Iik7CisKKyAgICAgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAgICAgICAgIH0pCisg ICAgICAgICAgICAuY2F0Y2goZnVuY3Rpb24gKGVycm9yKSB7CisgICAgICAgICAgICAgICAgdGVz dEZhaWxlZCgiRXJyb3IgaW4gcHJvbWlzZSBjaGFpbjogIiArIGVycm9yKTsKKyAgICAgICAgICAg ICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAgICAgICAgIH0pOworCisgICAgICAgICAgICB3aW5k b3cuanNUZXN0SXNBc3luYyA9IHRydWU7CisgICAgICAgICAgICB3aW5kb3cuc3VjY2Vzc2Z1bGx5 UGFyc2VkID0gdHJ1ZTsKKworICAgICAgICA8L3NjcmlwdD4KKyAgICAgICAgPHNjcmlwdCBzcmM9 Ii4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorICAgIDwvYm9keT4K KzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0 YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXgg NTJhMjA3Mi4uOTZhNzhlZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rl c3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3Rh dGlvbnMKQEAgLTE4NCw2ICsxODQsNyBAQCBmYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0 aW9uLXN0YWJsZS5odG1sCiBmYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLmh0bWwK IGZhc3QvbWVkaWFzdHJlYW0vUlRDUGVlckNvbm5lY3Rpb24taW5zcGVjdC1vZmZlci5odG1sCiBm YXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZC1yZW1vdmVUcmFjay5odG1sCitm YXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWFkZFRyYWNrLXJldXNlLXNlbmRlci5o dG1sCiBmYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLWNsb3NlZC1zdGF0ZS5odG1s CiBmYXN0L21lZGlhc3RyZWFtL1JUQ1BlZXJDb25uZWN0aW9uLW92ZXJsb2FkZWQtb3BlcmF0aW9u cy1wYXJhbXMuaHRtbAogZmFzdC9tZWRpYXN0cmVhbS9SVENQZWVyQ29ubmVjdGlvbi1vdmVybG9h ZGVkLW9wZXJhdGlvbnMuaHRtbAo=