30002 2009-10-02 01:41:45 -0700 [GStreamer] MediaPlayerPrivate::cancelLoad() can be implemented by setting state to NULL 2009-10-15 07:32:03 -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 151792 0 slomo 2009-10-02 01:41:45 -0700 Hi, MediaPlayerPrivate::cancelLoad() can be implemented by setting the state of playbin2 to NULL. This can be called at any time and will stop everything. 154570 1 41160 pnormand 2009-10-14 07:22:10 -0700 Created attachment 41160 proposed patch 154778 2 41160 gustavo 2009-10-15 06:14:09 -0700 Comment on attachment 41160 proposed patch > void MediaPlayerPrivate::cancelLoad() > { > - notImplemented(); > + if (m_networkState < MediaPlayer::Loading || m_networkState == MediaPlayer::Loaded) > + return; > + > + if (m_playBin) > + gst_element_set_state(m_playBin, GST_STATE_NULL); > } Both Mac and Win call updateStates() here after doing their media library magics; do you know if there is a reason why we don't need it? 154782 3 pnormand 2009-10-15 06:42:19 -0700 (In reply to comment #2) > (From update of attachment 41160 [details]) > > void MediaPlayerPrivate::cancelLoad() > > { > > - notImplemented(); > > + if (m_networkState < MediaPlayer::Loading || m_networkState == MediaPlayer::Loaded) > > + return; > > + > > + if (m_playBin) > > + gst_element_set_state(m_playBin, GST_STATE_NULL); > > } > > Both Mac and Win call updateStates() here after doing their media library > magics; do you know if there is a reason why we don't need it? Hmm right. updateStates() is called when we receive the STATE_CHANGE message but we don't handle STATE_NULL there. Will send a new patch, thanks for spotting that ;) 154789 4 41160 gustavo 2009-10-15 07:15:12 -0700 Comment on attachment 41160 proposed patch > void MediaPlayerPrivate::cancelLoad() > { > - notImplemented(); > + if (m_networkState < MediaPlayer::Loading || m_networkState == MediaPlayer::Loaded) > + return; > + > + if (m_playBin) > + gst_element_set_state(m_playBin, GST_STATE_NULL); > } According to further investigation by Philippe, updateStates is always called on element state transitions, so it is being done here. 154792 5 41160 commit-queue 2009-10-15 07:32:00 -0700 Comment on attachment 41160 proposed patch Clearing flags on attachment: 41160 Committed r49624: <http://trac.webkit.org/changeset/49624> 154793 6 commit-queue 2009-10-15 07:32:03 -0700 All reviewed patches have been landed. Closing bug. 41160 2009-10-14 07:22:10 -0700 2009-10-15 07:32:00 -0700 proposed patch 0001-implement-cancelLoad.patch text/plain 1612 pnormand RnJvbSA5NWI3MDFjNWNkZGYzMDQ5MmQyOTZhZDA0NGQ3ZDUyZGI0ZTJmNWQ3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBXZWQsIDE0IE9jdCAyMDA5IDE1OjQ1OjM2ICswMjAwClN1YmplY3Q6IFtQQVRDSF0g aW1wbGVtZW50IGNhbmNlbExvYWQKCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgfCAgIDExICsrKysrKysrKysrCiAuLi4vZ3JhcGhpY3MvZ3Rr L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgICB8ICAgIDYgKysrKystCiAyIGZpbGVz IGNoYW5nZWQsIDE2IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3ZjAzZjgxLi4xYWU5 NjhiIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE0IEBACisyMDA5LTEwLTE0ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1h bmRAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAwMDIKKwor ICAgICAgICBpbXBsZW1lbnQgY2FuY2VsTG9hZAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpNZWRpYVBsYXllclByaXZhdGU6OmNhbmNlbExvYWQpOgorCiAyMDA5LTEwLTEzICBZdXJ5IFNl bWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBh dmVsIEZlbGRtYW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCA3NmI5OTJmLi42MWI2 YmQwIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3Rr L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKQEAgLTQ4NCw3ICs0ODQsMTEgQEAgdW5z aWduZWQgTWVkaWFQbGF5ZXJQcml2YXRlOjp0b3RhbEJ5dGVzKCkgY29uc3QKIAogdm9pZCBNZWRp YVBsYXllclByaXZhdGU6OmNhbmNlbExvYWQoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7Cisg ICAgaWYgKG1fbmV0d29ya1N0YXRlIDwgTWVkaWFQbGF5ZXI6OkxvYWRpbmcgfHwgbV9uZXR3b3Jr U3RhdGUgPT0gTWVkaWFQbGF5ZXI6OkxvYWRlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYg KG1fcGxheUJpbikKKyAgICAgICAgZ3N0X2VsZW1lbnRfc2V0X3N0YXRlKG1fcGxheUJpbiwgR1NU X1NUQVRFX05VTEwpOwogfQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6dXBkYXRlU3RhdGVz KCkKLS0gCjEuNi4zLjMKCg==