30006 2009-10-02 01:54:32 -0700 [GStreamer] Unnecessary checks for Messages types in callbacks 2009-10-15 06:10:12 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 slomo webkit-unassigned commit-queue pnormand oldest_to_newest 151797 0 slomo 2009-10-02 01:54:32 -0700 The EOS/StateChange/Error callbacks check the message type but they can only be called with that exact message. The check should be removed ;) Also instead of 3-4 different callbacks for all messages types it might make sense to only use a single one, with a switch over the message types. 154562 1 41158 pnormand 2009-10-14 06:16:34 -0700 Created attachment 41158 proposed patch 154567 2 slomo 2009-10-14 06:47:07 -0700 Looks good to me 154776 3 41158 commit-queue 2009-10-15 06:10:09 -0700 Comment on attachment 41158 proposed patch Clearing flags on attachment: 41158 Committed r49621: <http://trac.webkit.org/changeset/49621> 154777 4 commit-queue 2009-10-15 06:10:12 -0700 All reviewed patches have been landed. Closing bug. 41158 2009-10-14 06:16:34 -0700 2009-10-15 06:10:09 -0700 proposed patch 0001-refactored-gst-message-callbacks-into-a-single-one.patch text/plain 7299 pnormand RnJvbSBjOWM1YmEwYjU3ZWYzNzJlNTliYTk2ZDQ0YzY4N2YyYmYxYjc2NWE2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBXZWQsIDE0IE9jdCAyMDA5IDE1OjExOjU0ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g cmVmYWN0b3JlZCBnc3QgbWVzc2FnZSBjYWxsYmFja3MgaW50byBhIHNpbmdsZSBvbmUKCi0tLQog V2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE1 ICsrKysrCiAuLi4vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAg ICB8ICAgNjMgKysrKysrKystLS0tLS0tLS0tLS0KIC4uLi9ncmFwaGljcy9ndGsvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmggICAgIHwgICAgOCArLS0KIDMgZmlsZXMgY2hhbmdlZCwgNDMg aW5zZXJ0aW9ucygrKSwgNDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFu Z2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3ZjAzZjgxLi4xYjExNjc0IDEwMDY0NAot LS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE4IEBACisyMDA5LTEwLTE0ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAwMDYKKyAgICAgICAgW0dTdHJl YW1lcl0gVW5uZWNlc3NhcnkgY2hlY2tzIGZvciBNZXNzYWdlcyB0eXBlcyBpbiBjYWxsYmFja3MK KworICAgICAgICByZWZhY3RvcmVkIGdzdCBtZXNzYWdlIGNhbGxiYWNrcyBpbnRvIGEgc2luZ2xl IG9uZQorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjptZWRpYVBsYXllclByaXZhdGVNZXNz YWdlQ2FsbGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6ZG9fZ3N0X2luaXQpOgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlOjpkdXJhdGlvbik6CisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oOgorCiAyMDA5LTEw LTEzICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCA3 NmI5OTJmLi5lYjhiYzUzIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0 ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKQEAgLTI1LDkgKzI1 LDEwIEBACiAjaWYgRU5BQkxFKFZJREVPKQogCiAjaW5jbHVkZSAiTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmgiCi0jaW5jbHVkZSAiRGF0YVNvdXJjZUdTdHJlYW1lci5oIgorCiAKICNpbmNs dWRlICJDU3RyaW5nLmgiCisjaW5jbHVkZSAiRGF0YVNvdXJjZUdTdHJlYW1lci5oIgogI2luY2x1 ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkludFJlY3QuaCIKICNpbmNsdWRlICJL VVJMLmgiCkBAIC0zNSw5ICszNiw5IEBACiAjaW5jbHVkZSAiTWVkaWFQbGF5ZXIuaCIKICNpbmNs dWRlICJOb3RJbXBsZW1lbnRlZC5oIgogI2luY2x1ZGUgIlNjcm9sbFZpZXcuaCIKKyNpbmNsdWRl ICJUaW1lUmFuZ2VzLmgiCiAjaW5jbHVkZSAiVmlkZW9TaW5rR1N0cmVhbWVyLmgiCiAjaW5jbHVk ZSAiV2lkZ2V0LmgiCi0jaW5jbHVkZSAiVGltZVJhbmdlcy5oIgogCiAjaW5jbHVkZSA8Z3N0L2dz dC5oPgogI2luY2x1ZGUgPGdzdC9pbnRlcmZhY2VzL21peGVyLmg+CkBAIC01MSwxNiArNTIsMjAg QEAgdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1nYm9vbGVh biBtZWRpYVBsYXllclByaXZhdGVFcnJvckNhbGxiYWNrKEdzdEJ1cyogYnVzLCBHc3RNZXNzYWdl KiBtZXNzYWdlLCBncG9pbnRlciBkYXRhKQorZ2Jvb2xlYW4gbWVkaWFQbGF5ZXJQcml2YXRlTWVz c2FnZUNhbGxiYWNrKEdzdEJ1cyogYnVzLCBHc3RNZXNzYWdlKiBtZXNzYWdlLCBncG9pbnRlciBk YXRhKQogewotICAgIGlmIChHU1RfTUVTU0FHRV9UWVBFKG1lc3NhZ2UpID09IEdTVF9NRVNTQUdF X0VSUk9SKSB7Ci0gICAgICAgIEdPd25QdHI8R0Vycm9yPiBlcnI7Ci0gICAgICAgIEdPd25QdHI8 Z2NoYXI+IGRlYnVnOworICAgIEdPd25QdHI8R0Vycm9yPiBlcnI7CisgICAgR093blB0cjxnY2hh cj4gZGVidWc7CisgICAgTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZSBlcnJvcjsKKyAgICBNZWRp YVBsYXllclByaXZhdGUqIG1wID0gcmVpbnRlcnByZXRfY2FzdDxNZWRpYVBsYXllclByaXZhdGUq PihkYXRhKTsKKyAgICBnaW50IHBlcmNlbnQgPSAwOwogCisgICAgc3dpdGNoIChHU1RfTUVTU0FH RV9UWVBFKG1lc3NhZ2UpKSB7CisgICAgY2FzZSBHU1RfTUVTU0FHRV9FUlJPUjoKICAgICAgICAg Z3N0X21lc3NhZ2VfcGFyc2VfZXJyb3IobWVzc2FnZSwgJmVyci5vdXRQdHIoKSwgJmRlYnVnLm91 dFB0cigpKTsKICAgICAgICAgTE9HX1ZFUkJPU0UoTWVkaWEsICJFcnJvcjogJWQsICVzIiwgZXJy LT5jb2RlLCAgZXJyLT5tZXNzYWdlKTsKIAotICAgICAgICBNZWRpYVBsYXllcjo6TmV0d29ya1N0 YXRlIGVycm9yID0gTWVkaWFQbGF5ZXI6OkVtcHR5OworICAgICAgICBlcnJvciA9IE1lZGlhUGxh eWVyOjpFbXB0eTsKICAgICAgICAgaWYgKGVyci0+ZG9tYWluID09IEdTVF9DT1JFX0VSUk9SIHx8 IGVyci0+ZG9tYWluID09IEdTVF9MSUJSQVJZX0VSUk9SKQogICAgICAgICAgICAgZXJyb3IgPSBN ZWRpYVBsYXllcjo6RGVjb2RlRXJyb3I7CiAgICAgICAgIGVsc2UgaWYgKGVyci0+ZG9tYWluID09 IEdTVF9SRVNPVVJDRV9FUlJPUikKQEAgLTY4LDM4ICs3MywyNCBAQCBnYm9vbGVhbiBtZWRpYVBs YXllclByaXZhdGVFcnJvckNhbGxiYWNrKEdzdEJ1cyogYnVzLCBHc3RNZXNzYWdlKiBtZXNzYWdl LCBncG9pbgogICAgICAgICBlbHNlIGlmIChlcnItPmRvbWFpbiA9PSBHU1RfU1RSRUFNX0VSUk9S KQogICAgICAgICAgICAgZXJyb3IgPSBNZWRpYVBsYXllcjo6TmV0d29ya0Vycm9yOwogCi0gICAg ICAgIE1lZGlhUGxheWVyUHJpdmF0ZSogbXAgPSByZWludGVycHJldF9jYXN0PE1lZGlhUGxheWVy UHJpdmF0ZSo+KGRhdGEpOwogICAgICAgICBpZiAobXApCiAgICAgICAgICAgICBtcC0+bG9hZGlu Z0ZhaWxlZChlcnJvcik7Ci0gICAgfQotICAgIHJldHVybiB0cnVlOwotfQotCi1nYm9vbGVhbiBt ZWRpYVBsYXllclByaXZhdGVFT1NDYWxsYmFjayhHc3RCdXMqIGJ1cywgR3N0TWVzc2FnZSogbWVz c2FnZSwgZ3BvaW50ZXIgZGF0YSkKLXsKLSAgICBpZiAoR1NUX01FU1NBR0VfVFlQRShtZXNzYWdl KSA9PSBHU1RfTUVTU0FHRV9FT1MpIHsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBHU1RfTUVT U0FHRV9FT1M6CiAgICAgICAgIExPR19WRVJCT1NFKE1lZGlhLCAiRW5kIG9mIFN0cmVhbSIpOwot ICAgICAgICBNZWRpYVBsYXllclByaXZhdGUqIG1wID0gcmVpbnRlcnByZXRfY2FzdDxNZWRpYVBs YXllclByaXZhdGUqPihkYXRhKTsKICAgICAgICAgbXAtPmRpZEVuZCgpOwotICAgIH0KLSAgICBy ZXR1cm4gdHJ1ZTsKLX0KLQotZ2Jvb2xlYW4gbWVkaWFQbGF5ZXJQcml2YXRlU3RhdGVDYWxsYmFj ayhHc3RCdXMqIGJ1cywgR3N0TWVzc2FnZSogbWVzc2FnZSwgZ3BvaW50ZXIgZGF0YSkKLXsKLSAg ICBpZiAoR1NUX01FU1NBR0VfVFlQRShtZXNzYWdlKSA9PSBHU1RfTUVTU0FHRV9TVEFURV9DSEFO R0VEKSB7Ci0gICAgICAgIE1lZGlhUGxheWVyUHJpdmF0ZSogbXAgPSByZWludGVycHJldF9jYXN0 PE1lZGlhUGxheWVyUHJpdmF0ZSo+KGRhdGEpOworICAgICAgICBicmVhazsKKyAgICBjYXNlIEdT VF9NRVNTQUdFX1NUQVRFX0NIQU5HRUQ6CiAgICAgICAgIG1wLT51cGRhdGVTdGF0ZXMoKTsKLSAg ICB9Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KLWdib29sZWFuIG1lZGlhUGxheWVyUHJpdmF0ZUJ1 ZmZlcmluZ0NhbGxiYWNrKEdzdEJ1cyogYnVzLCBHc3RNZXNzYWdlKiBtZXNzYWdlLCBncG9pbnRl ciBkYXRhKQotewotICAgIGlmIChHU1RfTUVTU0FHRV9UWVBFKG1lc3NhZ2UpID09IEdTVF9NRVNT QUdFX0JVRkZFUklORykgewotICAgICAgICBnaW50IHBlcmNlbnQgPSAwOworICAgICAgICBicmVh azsKKyAgICBjYXNlIEdTVF9NRVNTQUdFX0JVRkZFUklORzoKICAgICAgICAgZ3N0X21lc3NhZ2Vf cGFyc2VfYnVmZmVyaW5nKG1lc3NhZ2UsICZwZXJjZW50KTsKICAgICAgICAgTE9HX1ZFUkJPU0Uo TWVkaWEsICJCdWZmZXJpbmcgJWQiLCBwZXJjZW50KTsKKyAgICAgICAgYnJlYWs7CisgICAgZGVm YXVsdDoKKyAgICAgICAgTE9HX1ZFUkJPU0UoTWVkaWEsICJVbmhhbmRsZWQgR1N0cmVhbWVyIG1l c3NhZ2UgdHlwZTogJXMiLAorICAgICAgICAgICAgICAgICAgICBHU1RfTUVTU0FHRV9UWVBFX05B TUUobWVzc2FnZSkpOworICAgICAgICBicmVhazsKICAgICB9CiAgICAgcmV0dXJuIHRydWU7CiB9 CkBAIC0xMjQsNyArMTE1LDggQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGU6OnJlZ2lzdGVyTWVk aWFFbmdpbmUoTWVkaWFFbmdpbmVSZWdpc3RyYXIgcmVnaXN0cmFyKQogCiBzdGF0aWMgYm9vbCBn c3RJbml0aWFsaXplZCA9IGZhbHNlOwogCi1zdGF0aWMgdm9pZCBkb19nc3RfaW5pdCgpIHsKK3N0 YXRpYyB2b2lkIGRvX2dzdF9pbml0KCkKK3sKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHBhc3Mg dGhlIGFyZ3VtZW50cyBmcm9tIHRoZSBjb21tYW5kIGxpbmUKICAgICBpZiAoIWdzdEluaXRpYWxp emVkKSB7CiAgICAgICAgIGdzdF9pbml0KDAsIDApOwpAQCAtODI4LDEwICs4MjAsNyBAQCB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZTo6Y3JlYXRlR1NUUGxheUJpbihTdHJpbmcgdXJsKQogCiAgICAg R3N0QnVzKiBidXMgPSBnc3RfcGlwZWxpbmVfZ2V0X2J1cyhHU1RfUElQRUxJTkUobV9wbGF5Qmlu KSk7CiAgICAgZ3N0X2J1c19hZGRfc2lnbmFsX3dhdGNoKGJ1cyk7Ci0gICAgZ19zaWduYWxfY29u bmVjdChidXMsICJtZXNzYWdlOjplcnJvciIsIEdfQ0FMTEJBQ0sobWVkaWFQbGF5ZXJQcml2YXRl RXJyb3JDYWxsYmFjayksIHRoaXMpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3QoYnVzLCAibWVzc2Fn ZTo6ZW9zIiwgR19DQUxMQkFDSyhtZWRpYVBsYXllclByaXZhdGVFT1NDYWxsYmFjayksIHRoaXMp OwotICAgIGdfc2lnbmFsX2Nvbm5lY3QoYnVzLCAibWVzc2FnZTo6c3RhdGUtY2hhbmdlZCIsIEdf Q0FMTEJBQ0sobWVkaWFQbGF5ZXJQcml2YXRlU3RhdGVDYWxsYmFjayksIHRoaXMpOwotICAgIGdf c2lnbmFsX2Nvbm5lY3QoYnVzLCAibWVzc2FnZTo6YnVmZmVyaW5nIiwgR19DQUxMQkFDSyhtZWRp YVBsYXllclByaXZhdGVCdWZmZXJpbmdDYWxsYmFjayksIHRoaXMpOworICAgIGdfc2lnbmFsX2Nv bm5lY3QoYnVzLCAibWVzc2FnZSIsIEdfQ0FMTEJBQ0sobWVkaWFQbGF5ZXJQcml2YXRlTWVzc2Fn ZUNhbGxiYWNrKSwgdGhpcyk7CiAgICAgZ3N0X29iamVjdF91bnJlZihidXMpOwogCiAgICAgZ19v YmplY3Rfc2V0KEdfT0JKRUNUKG1fcGxheUJpbiksICJ1cmkiLCB1cmwudXRmOCgpLmRhdGEoKSwg TlVMTCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCmluZGV4IDExZTU5YTYuLjEwZWU3ZGQgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5oCkBAIC00MywxNCArNDMsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgIGNsYXNzIEludFJlY3Q7CiAgICAgY2xhc3MgU3RyaW5nOwogCi0gICAgZ2Jvb2xlYW4g bWVkaWFQbGF5ZXJQcml2YXRlRXJyb3JDYWxsYmFjayhHc3RCdXMqIGJ1cywgR3N0TWVzc2FnZSog bWVzc2FnZSwgZ3BvaW50ZXIgZGF0YSk7Ci0gICAgZ2Jvb2xlYW4gbWVkaWFQbGF5ZXJQcml2YXRl RU9TQ2FsbGJhY2soR3N0QnVzKiBidXMsIEdzdE1lc3NhZ2UqIG1lc3NhZ2UsIGdwb2ludGVyIGRh dGEpOwotICAgIGdib29sZWFuIG1lZGlhUGxheWVyUHJpdmF0ZVN0YXRlQ2FsbGJhY2soR3N0QnVz KiBidXMsIEdzdE1lc3NhZ2UqIG1lc3NhZ2UsIGdwb2ludGVyIGRhdGEpOworICAgIGdib29sZWFu IG1lZGlhUGxheWVyUHJpdmF0ZU1lc3NhZ2VDYWxsYmFjayhHc3RCdXMqIGJ1cywgR3N0TWVzc2Fn ZSogbWVzc2FnZSwgZ3BvaW50ZXIgZGF0YSk7CiAKICAgICBjbGFzcyBNZWRpYVBsYXllclByaXZh dGUgOiBwdWJsaWMgTWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlIHsKLSAgICAgICAgZnJpZW5k IGdib29sZWFuIG1lZGlhUGxheWVyUHJpdmF0ZUVycm9yQ2FsbGJhY2soR3N0QnVzKiBidXMsIEdz dE1lc3NhZ2UqIG1lc3NhZ2UsIGdwb2ludGVyIGRhdGEpOwotICAgICAgICBmcmllbmQgZ2Jvb2xl YW4gbWVkaWFQbGF5ZXJQcml2YXRlRU9TQ2FsbGJhY2soR3N0QnVzKiBidXMsIEdzdE1lc3NhZ2Uq IG1lc3NhZ2UsIGdwb2ludGVyIGRhdGEpOwotICAgICAgICBmcmllbmQgZ2Jvb2xlYW4gbWVkaWFQ bGF5ZXJQcml2YXRlU3RhdGVDYWxsYmFjayhHc3RCdXMqIGJ1cywgR3N0TWVzc2FnZSogbWVzc2Fn ZSwgZ3BvaW50ZXIgZGF0YSk7CisgICAgICAgIGZyaWVuZCBnYm9vbGVhbiBtZWRpYVBsYXllclBy aXZhdGVNZXNzYWdlQ2FsbGJhY2soR3N0QnVzKiBidXMsIEdzdE1lc3NhZ2UqIG1lc3NhZ2UsIGdw b2ludGVyIGRhdGEpOwogICAgICAgICBmcmllbmQgdm9pZCBtZWRpYVBsYXllclByaXZhdGVSZXBh aW50Q2FsbGJhY2soV2ViS2l0VmlkZW9TaW5rKiwgR3N0QnVmZmVyICpidWZmZXIsIE1lZGlhUGxh eWVyUHJpdmF0ZSogcGxheWVyUHJpdmF0ZSk7CiAKICAgICAgICAgcHVibGljOgotLSAKMS42LjMu MwoK