98878 2012-10-10 02:43:02 -0700 Fix JPEG turbo decoding failure when IMAGE_DECODER_DOWN_SAMPLING is enabled 2012-12-02 22:54:23 -0800 1 1 1 Unclassified WebKit Images 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 103749 103856 0 ljaehun.lim webkit-unassigned kbr noel.gordon webkit.review.bot yong.li.webkit oldest_to_newest 738761 0 ljaehun.lim 2012-10-10 02:43:02 -0700 When using libjpeg-turbo and enabling IMAGE_DECODER_DOWN_SAMPLING, JPEG decoding failed because of no support for JCS_EXT_RGBA, JCS_EXT_BGRA. Set RGBA values when color space is JCS_EXT_RGBA or JCS_EXT_BGRA. 738762 1 167962 ljaehun.lim 2012-10-10 02:43:37 -0700 Created attachment 167962 Patch 738763 2 webkit.review.bot 2012-10-10 02:45:08 -0700 Attachment 167962 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 738764 3 167963 ljaehun.lim 2012-10-10 02:46:46 -0700 Created attachment 167963 Patch 739126 4 kbr 2012-10-10 10:59:07 -0700 This looks fine, but I'd like Noel to do an unofficial review before r+'ing it. 739945 5 noel.gordon 2012-10-11 07:21:06 -0700 Looks sane. Sadly no tests exist for the IMAGE_DECODER_DOWN_SAMPLING enable. 740050 6 167963 kbr 2012-10-11 09:33:36 -0700 Comment on attachment 167963 Patch That's unfortunate, but I assume having this work is better than not. r=me 740068 7 167963 webkit.review.bot 2012-10-11 09:45:33 -0700 Comment on attachment 167963 Patch Clearing flags on attachment: 167963 Committed r131075: <http://trac.webkit.org/changeset/131075> 740069 8 webkit.review.bot 2012-10-11 09:45:36 -0700 All reviewed patches have been landed. Closing bug. 778491 9 noel.gordon 2012-11-28 16:45:40 -0800 Someone asked me a question about this. @jaehun - should the #if test be as follows? #if ENABLE(IMAGE_DECODER_DOWN_SAMPLING) && defined(TURBO_JPEG_RGB_SWIZZLE) Alternatively, we could remove all this and ensure that ports that use IMAGE_DECODER_DOWN_SAMPLING can use libjoeg-turbo correctly. TURBO_JPEG_RGB_SWIZZLE should not be taken to mean libjpeg-turbo and I think we should fix that. Thoughts? 778554 10 ljaehun.lim 2012-11-28 17:50:37 -0800 (In reply to comment #9) > Someone asked me a question about this. @jaehun - should the #if test be as follows? > > #if ENABLE(IMAGE_DECODER_DOWN_SAMPLING) && defined(TURBO_JPEG_RGB_SWIZZLE) > I considered the same #if statement at first. I have no objection to change #if statement. > Alternatively, we could remove all this and ensure that ports that use IMAGE_DECODER_DOWN_SAMPLING can use libjoeg-turbo correctly. TURBO_JPEG_RGB_SWIZZLE should not be taken to mean libjpeg-turbo and I think we should fix that. Thoughts? I perfectly agree with you. 780128 11 yong.li.webkit 2012-11-30 08:09:39 -0800 Just noticed this fix. Nice job. For those images are not scaled when DOWNSAMPLE is enabled, it seems that we can still use the swizzling path? 780224 12 yong.li.webkit 2012-11-30 10:46:15 -0800 (In reply to comment #11) > Just noticed this fix. Nice job. For those images are not scaled when DOWNSAMPLE is enabled, it seems that we can still use the swizzling path? Bug 103749 created for this, and patch is uploaded 781129 13 noel.gordon 2012-12-02 22:13:40 -0800 I have reviewed that patch, looks good. Second thing to do is to handle the scaled case better per comment 10. 167962 2012-10-10 02:43:37 -0700 2012-10-10 02:46:46 -0700 Patch patch.diff text/plain 2078 ljaehun.lim ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxNWY2ZWZlLi4zOTE4MWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTItMTAtMTAgIEphZWh1biBMaW0gIDxsamFlaHVuLmxpbUBzYW1zdW5nLmNvbT4KKwor ICAgICAgICBGaXggSlBFRyBkZWNvZGluZyBmYWl1cmUgd2hlbiBJTUFHRV9ERUNPREVSX0RPV05f U0FNUExJTkcgaXMgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2hlbiB1c2luZyBsaWJqcGVnLXR1cmJvIGFuZCBlbmFibGluZyBJTUFHRV9ERUNPREVS X0RPV05fU0FNUExJTkcsCisgICAgICAgIEpQRUcgZGVjb2RpbmcgZmFpbGVkIGJlY2F1c2Ugb2Yg bm8gc3VwcG9ydCBmb3IgSkNTX0VYVF9SR0JBLCBKQ1NfRVhUX0JHUkEuCisgICAgICAgIFNldCBS R0JBIHZhbHVlcyB3aGVuIGNvbG9yIHNwYWNlIGlzIEpDU19FWFRfUkdCQSBvciBKQ1NfRVhUX0JH UkEuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vaW1hZ2Ut ZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpQ RUdJbWFnZURlY29kZXI6Om91dHB1dFNjYW5saW5lcyk6CisKIDIwMTItMTAtMDkgIEVucmljYSBD YXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KIAogICAgICAgICBPbmx5IG1lYXN1cmUgdGV4dCBv bmNlIGluc3RlYWQgb2YgdHdpY2Ugd2hlbiBwZXJmb3JtaW5nIGxpbmUgbGF5b3V0LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVHSW1h Z2VEZWNvZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29kZXJzL2pw ZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHAKaW5kZXggMGU0YjUzNS4uNTI1ZjNhNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2RlcnMvanBlZy9KUEVHSW1hZ2VE ZWNvZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9q cGVnL0pQRUdJbWFnZURlY29kZXIuY3BwCkBAIC02MTIsNiArNjEyLDEyIEBAIGJvb2wgSlBFR0lt YWdlRGVjb2Rlcjo6b3V0cHV0U2NhbmxpbmVzKCkKICAgICAgICAgICAgIEpTQU1QTEUqIGpzYW1w bGUgPSAqc2FtcGxlcyArIChtX3NjYWxlZCA/IG1fc2NhbGVkQ29sdW1uc1t4XSA6IHgpICogKChp bmZvLT5vdXRfY29sb3Jfc3BhY2UgPT0gSkNTX1JHQikgPyAzIDogNCk7CiAgICAgICAgICAgICBp ZiAoaW5mby0+b3V0X2NvbG9yX3NwYWNlID09IEpDU19SR0IpCiAgICAgICAgICAgICAgICAgYnVm ZmVyLnNldFJHQkEoeCwgZGVzdFksIGpzYW1wbGVbMF0sIGpzYW1wbGVbMV0sIGpzYW1wbGVbMl0s IDB4RkYpOworI2lmIGRlZmluZWQoVFVSQk9fSlBFR19SR0JfU1dJWlpMRSkKKyAgICAgICAgICAg IGVsc2UgaWYgKGluZm8tPm91dF9jb2xvcl9zcGFjZSA9PSBKQ1NfRVhUX1JHQkEpCisgICAgICAg ICAgICAgICAgYnVmZmVyLnNldFJHQkEoeCwgZGVzdFksIGpzYW1wbGVbMF0sIGpzYW1wbGVbMV0s IGpzYW1wbGVbMl0sIDB4RkYpOworICAgICAgICAgICAgZWxzZSBpZiAoaW5mby0+b3V0X2NvbG9y X3NwYWNlID09IEpDU19FWFRfQkdSQSkKKyAgICAgICAgICAgICAgICBidWZmZXIuc2V0UkdCQSh4 LCBkZXN0WSwganNhbXBsZVsyXSwganNhbXBsZVsxXSwganNhbXBsZVswXSwgMHhGRik7CisjZW5k aWYKICAgICAgICAgICAgIGVsc2UgaWYgKGluZm8tPm91dF9jb2xvcl9zcGFjZSA9PSBKQ1NfQ01Z SykgewogICAgICAgICAgICAgICAgIC8vIFNvdXJjZSBpcyAnSW52ZXJ0ZWQgQ01ZSycsIG91dHB1 dCBpcyBSR0IuCiAgICAgICAgICAgICAgICAgLy8gU2VlOiBodHRwOi8vd3d3LmVhc3lyZ2IuY29t L21hdGgucGhwP01BVEg9TTEyI3RleHQxMgo= 167963 2012-10-10 02:46:46 -0700 2012-10-11 09:45:32 -0700 Patch patch.diff text/plain 2083 ljaehun.lim ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxNWY2ZWZlLi4yNWEwYmIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTItMTAtMTAgIEphZWh1biBMaW0gIDxsamFlaHVuLmxpbUBzYW1zdW5nLmNvbT4KKwor ICAgICAgICBGaXggSlBFRyBkZWNvZGluZyBmYWl1cmUgd2hlbiBJTUFHRV9ERUNPREVSX0RPV05f U0FNUExJTkcgaXMgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTg4NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBXaGVuIHVzaW5nIGxpYmpwZWctdHVyYm8gYW5kIGVuYWJsaW5nIElNQUdFX0RF Q09ERVJfRE9XTl9TQU1QTElORywKKyAgICAgICAgSlBFRyBkZWNvZGluZyBmYWlsZWQgYmVjYXVz ZSBvZiBubyBzdXBwb3J0IGZvciBKQ1NfRVhUX1JHQkEsIEpDU19FWFRfQkdSQS4KKyAgICAgICAg U2V0IFJHQkEgdmFsdWVzIHdoZW4gY29sb3Igc3BhY2UgaXMgSkNTX0VYVF9SR0JBIG9yIEpDU19F WFRfQkdSQS4KKworICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9p bWFnZS1kZWNvZGVycy9qcGVnL0pQRUdJbWFnZURlY29kZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SlBFR0ltYWdlRGVjb2Rlcjo6b3V0cHV0U2NhbmxpbmVzKToKKwogMjAxMi0xMC0wOSAgRW5y aWNhIENhc3VjY2kgIDxlbnJpY2FAYXBwbGUuY29tPgogCiAgICAgICAgIE9ubHkgbWVhc3VyZSB0 ZXh0IG9uY2UgaW5zdGVhZCBvZiB0d2ljZSB3aGVuIHBlcmZvcm1pbmcgbGluZSBsYXlvdXQuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9qcGVnL0pQ RUdJbWFnZURlY29kZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW1hZ2UtZGVjb2Rl cnMvanBlZy9KUEVHSW1hZ2VEZWNvZGVyLmNwcAppbmRleCAwZTRiNTM1Li41MjVmM2E2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pbWFnZS1kZWNvZGVycy9qcGVnL0pQRUdJ bWFnZURlY29kZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ltYWdlLWRlY29k ZXJzL2pwZWcvSlBFR0ltYWdlRGVjb2Rlci5jcHAKQEAgLTYxMiw2ICs2MTIsMTIgQEAgYm9vbCBK UEVHSW1hZ2VEZWNvZGVyOjpvdXRwdXRTY2FubGluZXMoKQogICAgICAgICAgICAgSlNBTVBMRSog anNhbXBsZSA9ICpzYW1wbGVzICsgKG1fc2NhbGVkID8gbV9zY2FsZWRDb2x1bW5zW3hdIDogeCkg KiAoKGluZm8tPm91dF9jb2xvcl9zcGFjZSA9PSBKQ1NfUkdCKSA/IDMgOiA0KTsKICAgICAgICAg ICAgIGlmIChpbmZvLT5vdXRfY29sb3Jfc3BhY2UgPT0gSkNTX1JHQikKICAgICAgICAgICAgICAg ICBidWZmZXIuc2V0UkdCQSh4LCBkZXN0WSwganNhbXBsZVswXSwganNhbXBsZVsxXSwganNhbXBs ZVsyXSwgMHhGRik7CisjaWYgZGVmaW5lZChUVVJCT19KUEVHX1JHQl9TV0laWkxFKQorICAgICAg ICAgICAgZWxzZSBpZiAoaW5mby0+b3V0X2NvbG9yX3NwYWNlID09IEpDU19FWFRfUkdCQSkKKyAg ICAgICAgICAgICAgICBidWZmZXIuc2V0UkdCQSh4LCBkZXN0WSwganNhbXBsZVswXSwganNhbXBs ZVsxXSwganNhbXBsZVsyXSwgMHhGRik7CisgICAgICAgICAgICBlbHNlIGlmIChpbmZvLT5vdXRf Y29sb3Jfc3BhY2UgPT0gSkNTX0VYVF9CR1JBKQorICAgICAgICAgICAgICAgIGJ1ZmZlci5zZXRS R0JBKHgsIGRlc3RZLCBqc2FtcGxlWzJdLCBqc2FtcGxlWzFdLCBqc2FtcGxlWzBdLCAweEZGKTsK KyNlbmRpZgogICAgICAgICAgICAgZWxzZSBpZiAoaW5mby0+b3V0X2NvbG9yX3NwYWNlID09IEpD U19DTVlLKSB7CiAgICAgICAgICAgICAgICAgLy8gU291cmNlIGlzICdJbnZlcnRlZCBDTVlLJywg b3V0cHV0IGlzIFJHQi4KICAgICAgICAgICAgICAgICAvLyBTZWU6IGh0dHA6Ly93d3cuZWFzeXJn Yi5jb20vbWF0aC5waHA/TUFUSD1NMTIjdGV4dDEyCg==