SkPDF: smarter Jpeg when libjpeg-turbo is present

The fallback code does not parse the color type for EXIF-only jpegs.
Since these exist in the wild, we need to find out if they are really
standard YUV or greyscale Jpegs and embed them in PDFs if they are.

BUG=chromium:801430
Change-Id: I93eaf8b8fc22b7169b2fce9520e022b72ad0bf81
Reviewed-on: https://skia-review.googlesource.com/118992
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>

1 files changed, 51 insertions, 7 deletions

diff --git a/tests/PDFJpegEmbedTest.cpp b/tests/PDFJpegEmbedTest.cpp
index aaac2b9f18..1ba148e8bb 100644
--- a/tests/PDFJpegEmbedTest.cpp
+++ b/tests/PDFJpegEmbedTest.cpp
@@ -82,6 +82,31 @@ DEF_TEST(SkPDF_JpegEmbedTest, r) {
 
 #include "SkJpegInfo.h"
 
+struct SkJFIFInfo {
+    SkISize fSize;
+    enum Type {
+        kGrayscale,
+        kYCbCr,
+    } fType;
+};
+bool SkIsJFIF(const SkData* data, SkJFIFInfo* info) {
+    SkISize jpegSize;
+    SkEncodedInfo::Color jpegColorType;
+    SkEncodedOrigin exifOrientation;
+    if (data && SkGetJpegInfo(data->data(), data->size(), &jpegSize,
+                              &jpegColorType, &exifOrientation)) {
+        bool yuv = jpegColorType == SkEncodedInfo::kYUV_Color;
+        bool goodColorType = yuv || jpegColorType == SkEncodedInfo::kGray_Color;
+        if (goodColorType && kTopLeft_SkEncodedOrigin == exifOrientation) {
+            if (info) {
+                *info = {jpegSize, yuv ? SkJFIFInfo::kYCbCr : SkJFIFInfo::kGrayscale};
+            }
+            return true;
+        }
+    }
+    return false;
+}
+
 DEF_TEST(SkPDF_JpegIdentification, r) {
     static struct {
         const char* path;
@@ -118,15 +143,34 @@ DEF_TEST(SkPDF_JpegIdentification, r) {
     SkJFIFInfo info;
     {
         static const char goodJpeg[] =
-            "\377\330\377\340\0\20JFIF\0\1\1\0\0\1\0\1\0\0\377\333\0C\0\10\6\6\7"
-            "\6\5\10\7\7\7\t\t\10\n\14\24\r\14\13\13\14\31\22\23\17\24\35\32\37"
-            "\36\35\32\34\34 $.' \",#\34\34(7),01444\37'9=82<.342\377\333\0C\1\t"
-            "\t\t\14\13\14\30\r\r\0302!\34!222222222222222222222222222222222222"
-            "22222222222222\377\300\0\21\10\2\0\2\0\3\1\"\0\2\21\1\3\21\001";
-        size_t goodJpegLength = 177;
+            "\377\330\377\340\0\20JFIF\0\1\1\0\0\1\0\1\0\0\377\333\0C\0\20\13\14"
+            "\16\14\n\20\16\r\16\22\21\20\23\30(\32\30\26\26\0301#%\35(:3=<9387"
+            "@H\\N@DWE78PmQW_bghg>Mqypdx\\egc\377\333\0C\1\21\22\22\30\25\30/\32"
+            "\32/cB8Bcccccccccccccccccccccccccccccccccccccccccccccccccc\377\300"
+            "\0\21\10\0\10\0\10\3\1\"\0\2\21\1\3\21\1\377\304\0\37\0\0\1\5\1\1\1"
+            "\1\1\1\0\0\0\0\0\0\0\0\1\2\3\4\5\6\7\10\t\n\13\377\304\0\265\20\0\2"
+            "\1\3\3\2\4\3\5\5\4\4\0\0\1}\1\2\3\0\4\21\5\22!1A\6\23Qa\7\"q\0242\201"
+            "\221\241\10#B\261\301\25R\321\360$3br\202\t\n\26\27\30\31\32%&'()*"
+            "456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz\203\204\205\206\207\210\211"
+            "\212\222\223\224\225\226\227\230\231\232\242\243\244\245\246\247\250"
+            "\251\252\262\263\264\265\266\267\270\271\272\302\303\304\305\306\307"
+            "\310\311\312\322\323\324\325\326\327\330\331\332\341\342\343\344\345"
+            "\346\347\350\351\352\361\362\363\364\365\366\367\370\371\372\377\304"
+            "\0\37\1\0\3\1\1\1\1\1\1\1\1\1\0\0\0\0\0\0\1\2\3\4\5\6\7\10\t\n\13\377"
+            "\304\0\265\21\0\2\1\2\4\4\3\4\7\5\4\4\0\1\2w\0\1\2\3\21\4\5!1\6\22"
+            "AQ\7aq\23\"2\201\10\24B\221\241\261\301\t#3R\360\25br\321\n\26$4\341"
+            "%\361\27\30\31\32&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz\202\203"
+            "\204\205\206\207\210\211\212\222\223\224\225\226\227\230\231\232\242"
+            "\243\244\245\246\247\250\251\252\262\263\264\265\266\267\270\271\272"
+            "\302\303\304\305\306\307\310\311\312\322\323\324\325\326\327\330\331"
+            "\332\342\343\344\345\346\347\350\351\352\362\363\364\365\366\367\370"
+            "\371\372\377\332\0\14\3\1\0\2\21\3\21\0?\0\216M\352\214\25\271\224"
+            "\262\310\253\363tl\22209\35O~\237\\\24QZ\306Mh\216\252i\364ml\177\377"
+            "\331";
+        size_t goodJpegLength = 659;
         auto data = SkData::MakeWithoutCopy(goodJpeg, goodJpegLength);
         REPORTER_ASSERT(r, SkIsJFIF(data.get(), &info));
-        REPORTER_ASSERT(r, info.fSize == SkISize::Make(512, 512));
+        REPORTER_ASSERT(r, info.fSize == (SkISize{8, 8}));
         REPORTER_ASSERT(r, info.fType == SkJFIFInfo::kYCbCr);
 
         // Not long enough to read first (SOI) segment marker.