29998 2009-10-02 01:23:46 -0700 [GStreamer] Should probably scale video frames to requested size 2009-10-12 07:34:50 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 29997 0 slomo webkit-unassigned commit-queue pnormand oldest_to_newest 151787 0 slomo 2009-10-02 01:23:46 -0700 Hi, currently the MediaPlayer only scales the video frames to the p-a-r but keeps everything else as is. I think it should additionally scale the frames to fit the requested size as good as possible (while keeping the p-a-r). With requested size I mean what gets passed to MediaPlayerPrivate::setSize(). Important here is, that you really really should make sure that a) the par is kept and b) both width and height are <= the requested size 154002 1 41023 slomo 2009-10-12 01:24:00 -0700 Created attachment 41023 scale-video.diff Patch on top of the one from bug #29997. 154028 2 41023 gustavo 2009-10-12 05:29:01 -0700 Comment on attachment 41023 scale-video.diff Nice =). So, what I said in #29997 regarding coding style mostly applies to this one too. Since this one is basically a follow-up to that one, I'll say r- for now. 154038 3 41038 slomo 2009-10-12 06:43:22 -0700 Created attachment 41038 scale-video.diff 154044 4 41038 gustavo 2009-10-12 06:59:31 -0700 Comment on attachment 41038 scale-video.diff Thanks! 154059 5 41038 commit-queue 2009-10-12 07:34:46 -0700 Comment on attachment 41038 scale-video.diff Clearing flags on attachment: 41038 Committed r49439: <http://trac.webkit.org/changeset/49439> 154060 6 commit-queue 2009-10-12 07:34:50 -0700 All reviewed patches have been landed. Closing bug. 41023 2009-10-12 01:24:00 -0700 2009-10-12 06:43:22 -0700 scale-video.diff scale-video.diff text/plain 2543 slomo SW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAkyMDA5LTEwLTEyIDEwOjA3OjUxLjAwMDAw MDAwMCArMDIwMAorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmNwcAkyMDA5LTEwLTEyIDEwOjE2OjA1LjAwMDAwMDAwMCArMDIwMApA QCAtNjUyLDEyICs2NTIsMTYgQEAKICAgICAgICAgcmV0dXJuOwogCiAgICAgaW50IHdpZHRoID0g MCwgaGVpZ2h0ID0gMCwgcGFyX24gPSAwLCBwYXJfZCA9IDA7CisgICAgZG91YmxlIGR3aWR0aCA9 IDAsIGRoZWlnaHQgPSAwLjA7CiAgICAgZG91YmxlIGRwYXJfbiA9IDAsIGRwYXJfZCA9IDA7Cisg ICAgZG91YmxlIHNjYWxlLCBnYXBfaCwgZ2FwX3c7CiAgICAgR3N0Q2FwcyAqY2FwcyA9IGdzdF9i dWZmZXJfZ2V0X2NhcHMgKG1fYnVmZmVyKTsKICAgICBpZiAoIWdzdF92aWRlb19mb3JtYXRfcGFy c2VfY2FwcyAoR1NUX0JVRkZFUl9DQVBTIChtX2J1ZmZlciksIE5VTEwsICZ3aWR0aCwgJmhlaWdo dCkgfHwKICAgICAgICAgIWdzdF92aWRlb19wYXJzZV9jYXBzX3BpeGVsX2FzcGVjdF9yYXRpbyhj YXBzLCAmcGFyX24sICZwYXJfZCkpCiAgICAgICByZXR1cm47CiAKKyAgICBkd2lkdGggPSB3aWR0 aDsKKyAgICBkaGVpZ2h0ID0gaGVpZ2h0OwogICAgIGRwYXJfbiA9IHBhcl9uOwogICAgIGRwYXJf ZCA9IHBhcl9kOwogICAgIGNhaXJvX3QqIGNyID0gY29udGV4dC0+cGxhdGZvcm1Db250ZXh0KCk7 CkBAIC02NjksMTAgKzY3MywyMiBAQAogICAgIGNhaXJvX3NhdmUoY3IpOwogICAgIGNhaXJvX3Nl dF9vcGVyYXRvcihjciwgQ0FJUk9fT1BFUkFUT1JfU09VUkNFKTsKIAorICAgIGR3aWR0aCAqPSBk cGFyX24gLyBkcGFyX2Q7CisgICAgZGhlaWdodCAqPSBkcGFyX2QgLyBkcGFyX247CisKKyAgICBz Y2FsZSA9IE1JTiAocmVjdC53aWR0aCAoKSAvIGR3aWR0aCwgcmVjdC5oZWlnaHQgKCkgLyBkaGVp Z2h0KTsKKyAgICBkd2lkdGggKj0gc2NhbGU7CisgICAgZGhlaWdodCAqPSBzY2FsZTsKKworICAg IC8vIENhbGN1bGF0ZSBnYXAgYmV0d2VlbiBib3JkZXIgYW4gcGljdHVyZQorICAgIGdhcF93ID0g KHJlY3Qud2lkdGgoKSAtIGR3aWR0aCkgLyAyLjA7CisgICAgZ2FwX2ggPSAocmVjdC5oZWlnaHQo KSAtIGRoZWlnaHQpIC8gMi4wOworCiAgICAgLy8gcGFpbnQgdGhlIHJlY3RhbmdsZSBvbiB0aGUg Y29udGV4dCBhbmQgZHJhdyB0aGUgc3VyZmFjZSBpbnNpZGUuCi0gICAgY2Fpcm9fdHJhbnNsYXRl KGNyLCByZWN0LngoKSwgcmVjdC55KCkpOworICAgIGNhaXJvX3RyYW5zbGF0ZShjciwgcmVjdC54 KCkgKyBnYXBfdywgcmVjdC55KCkgKyBnYXBfaCk7CiAgICAgY2Fpcm9fcmVjdGFuZ2xlKGNyLCAw LCAwLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOwogICAgIGNhaXJvX3NjYWxlIChjciwg ZHBhcl9uIC8gZHBhcl9kLCBkcGFyX2QgLyBkcGFyX24pOworICAgIGNhaXJvX3NjYWxlIChjciwg c2NhbGUsIHNjYWxlKTsKICAgICBjYWlyb19zZXRfc291cmNlX3N1cmZhY2UoY3IsIHNyYywgMCwg MCk7CiAgICAgY2Fpcm9fZmlsbChjcik7CiAgICAgY2Fpcm9fcmVzdG9yZShjcik7CkluZGV4OiBX ZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkoUmV2aXNp b24gNDk0MzQpCisrKyBXZWJDb3JlL0NoYW5nZUxvZwkoQXJiZWl0c2tvcGllKQpAQCAtMSwzICsx LDE3IEBACisyMDA5LTEwLTEyICBTZWJhc3RpYW4gRHLDtmdlICA8c2ViYXN0aWFuLmRyb2VnZUBj b2xsYWJvcmEuY28udWs+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5OTk4Cisg ICAgICAgIAorICAgICAgICBTY2FsZSB2aWRlbyB0byBjb21wbGV0ZWx5IGZpbGwgdGhlIHRhcmdl dCBzdXJmYWNlIHdoaWxlCisgICAgICAgIGtlZXBpbmcgdGhlIGFzcGVjdCByYXRpby4gVGhpcyBm aXhlcyBkaXNwbGF5aW5nIG9mIHRoZQorICAgICAgICBZb3VUdWJlIEhUTUw1IHNhbXBsZSB3ZWJz aXRlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIFNjYWxlIHZpZGVvIHRvIGNvbXBsZXRlbHkgZmlsbCB0 aGUgdGFyZ2V0IHN1cmZhY2UsIGtlZXAKKyAgICAgICAgdGhlIGFzcGVjdCByYXRpbyBhbmQgY2Vu dGVyIGl0LgorCiAyMDA5LTEwLTExICBEYW5pZWwgQmF0ZXMgIDxkYmF0ZXNAd2Via2l0Lm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgo= 41038 2009-10-12 06:43:22 -0700 2009-10-12 07:34:46 -0700 scale-video.diff scale-video.diff text/plain 2877 slomo SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShSZXZpc2lvbiA0OTQzNCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCShBcmJlaXRza29waWUpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMTAtMTIgIFNlYmFzdGlhbiBEcsO2Z2UgIDxzZWJhc3RpYW4u ZHJvZWdlQGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjk5OTgKKyAgICAgICAgCisgICAgICAgIFNjYWxlIHZpZGVvIHRvIGNvbXBsZXRlbHkgZmlsbCB0 aGUgdGFyZ2V0IHN1cmZhY2Ugd2hpbGUKKyAgICAgICAga2VlcGluZyB0aGUgYXNwZWN0IHJhdGlv LiBUaGlzIGZpeGVzIGRpc3BsYXlpbmcgb2YgdGhlCisgICAgICAgIFlvdVR1YmUgSFRNTDUgc2Ft cGxlIHdlYnNpdGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgU2NhbGUgdmlkZW8gdG8gY29tcGxldGVs eSBmaWxsIHRoZSB0YXJnZXQgc3VyZmFjZSwga2VlcAorICAgICAgICB0aGUgYXNwZWN0IHJhdGlv IGFuZCBjZW50ZXIgaXQuCisKIDIwMDktMTAtMTEgIERhbmllbCBCYXRlcyAgPGRiYXRlc0B3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCgpJbmRleDogV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuY3BwCTIwMDktMTAtMTIgMTU6Mzk6NDMuMDAwMDAwMDAwICswMjAwCisr KyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXIuY3BwCTIwMDktMTAtMTIgMTU6NDA6MTEuMDAwMDAwMDAwICswMjAwCkBAIC02NTYsNiArNjU2 LDEwIEBACiAgICAgaW50IHBpeGVsQXNwZWN0UmF0aW9EZW5vbWluYXRvciA9IDA7CiAgICAgZG91 YmxlIGRvdWJsZVBpeGVsQXNwZWN0UmF0aW9OdW1lcmF0b3IgPSAwOwogICAgIGRvdWJsZSBkb3Vi bGVQaXhlbEFzcGVjdFJhdGlvRGVub21pbmF0b3IgPSAwOworICAgIGRvdWJsZSBkaXNwbGF5V2lk dGg7CisgICAgZG91YmxlIGRpc3BsYXlIZWlnaHQ7CisgICAgZG91YmxlIHNjYWxlLCBnYXBIZWln aHQsIGdhcFdpZHRoOworCiAgICAgR3N0Q2FwcyAqY2FwcyA9IGdzdF9idWZmZXJfZ2V0X2NhcHMo bV9idWZmZXIpOwogCiAgICAgaWYgKCFnc3RfdmlkZW9fZm9ybWF0X3BhcnNlX2NhcHMoY2Fwcywg TlVMTCwgJndpZHRoLCAmaGVpZ2h0KSB8fApAQCAtNjY0LDYgKzY2OCw4IEBACiAgICAgICByZXR1 cm47CiAgICAgfQogCisgICAgZGlzcGxheVdpZHRoID0gd2lkdGg7CisgICAgZGlzcGxheUhlaWdo dCA9IGhlaWdodDsKICAgICBkb3VibGVQaXhlbEFzcGVjdFJhdGlvTnVtZXJhdG9yID0gcGl4ZWxB c3BlY3RSYXRpb051bWVyYXRvcjsKICAgICBkb3VibGVQaXhlbEFzcGVjdFJhdGlvRGVub21pbmF0 b3IgPSBwaXhlbEFzcGVjdFJhdGlvRGVub21pbmF0b3I7CiAKQEAgLTY3NiwxMSArNjgyLDIzIEBA CiAgICAgY2Fpcm9fc2F2ZShjcik7CiAgICAgY2Fpcm9fc2V0X29wZXJhdG9yKGNyLCBDQUlST19P UEVSQVRPUl9TT1VSQ0UpOwogCisgICAgZGlzcGxheVdpZHRoICo9IGRvdWJsZVBpeGVsQXNwZWN0 UmF0aW9OdW1lcmF0b3IgLyBkb3VibGVQaXhlbEFzcGVjdFJhdGlvRGVub21pbmF0b3I7CisgICAg ZGlzcGxheUhlaWdodCAqPSBkb3VibGVQaXhlbEFzcGVjdFJhdGlvRGVub21pbmF0b3IgLyBkb3Vi bGVQaXhlbEFzcGVjdFJhdGlvTnVtZXJhdG9yOworCisgICAgc2NhbGUgPSBNSU4gKHJlY3Qud2lk dGggKCkgLyBkaXNwbGF5V2lkdGgsIHJlY3QuaGVpZ2h0ICgpIC8gZGlzcGxheUhlaWdodCk7Cisg ICAgZGlzcGxheVdpZHRoICo9IHNjYWxlOworICAgIGRpc3BsYXlIZWlnaHQgKj0gc2NhbGU7CisK KyAgICAvLyBDYWxjdWxhdGUgZ2FwIGJldHdlZW4gYm9yZGVyIGFuIHBpY3R1cmUKKyAgICBnYXBX aWR0aCA9IChyZWN0LndpZHRoKCkgLSBkaXNwbGF5V2lkdGgpIC8gMi4wOworICAgIGdhcEhlaWdo dCA9IChyZWN0LmhlaWdodCgpIC0gZGlzcGxheUhlaWdodCkgLyAyLjA7CisKICAgICAvLyBwYWlu dCB0aGUgcmVjdGFuZ2xlIG9uIHRoZSBjb250ZXh0IGFuZCBkcmF3IHRoZSBzdXJmYWNlIGluc2lk ZS4KLSAgICBjYWlyb190cmFuc2xhdGUoY3IsIHJlY3QueCgpLCByZWN0LnkoKSk7CisgICAgY2Fp cm9fdHJhbnNsYXRlKGNyLCByZWN0LngoKSArIGdhcFdpZHRoLCByZWN0LnkoKSArIGdhcEhlaWdo dCk7CiAgICAgY2Fpcm9fcmVjdGFuZ2xlKGNyLCAwLCAwLCByZWN0LndpZHRoKCksIHJlY3QuaGVp Z2h0KCkpOwogICAgIGNhaXJvX3NjYWxlKGNyLCBkb3VibGVQaXhlbEFzcGVjdFJhdGlvTnVtZXJh dG9yIC8gZG91YmxlUGl4ZWxBc3BlY3RSYXRpb0Rlbm9taW5hdG9yLAogICAgICAgICAgICAgICAg IGRvdWJsZVBpeGVsQXNwZWN0UmF0aW9EZW5vbWluYXRvciAvIGRvdWJsZVBpeGVsQXNwZWN0UmF0 aW9OdW1lcmF0b3IpOworICAgIGNhaXJvX3NjYWxlKGNyLCBzY2FsZSwgc2NhbGUpOwogICAgIGNh aXJvX3NldF9zb3VyY2Vfc3VyZmFjZShjciwgc3JjLCAwLCAwKTsKICAgICBjYWlyb19maWxsKGNy KTsKICAgICBjYWlyb19yZXN0b3JlKGNyKTsK