Report repetition count in SkCodec

tests/CodecAnimTest.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCodec.h"
 #include "SkStream.h"
 
 #include "Resources.h"
 #include "Test.h"
 
 #include <initializer_list>
 #include <vector>
 
 DEF_TEST(Codec_frames, r) {
     static const struct {
         const char*         fName;
         size_t              fFrameCount;
         // One less than fFramecount, since the first frame is always
         // independent.
         std::vector<size_t> fRequiredFrames;
         // The size of this one should match fFrameCount for animated, empty
         // otherwise.
         std::vector<size_t> fDurations;
+        int                 fRepetitionCount;
     } gRecs[] = {
-        { "box.gif", 1, {}, {} },
-        { "color_wheel.gif", 1, {}, {} },
-        { "test640x479.gif", 4, { 0, 1, 2 }, { 200, 200, 200, 200 } },
+        { "box.gif", 1, {}, {}, 0 },
+        { "color_wheel.gif", 1, {}, {}, 0 },
+        { "test640x479.gif", 4, { 0, 1, 2 }, { 200, 200, 200, 200 },
+                SkCodec::kRepetitionCountInfinite },
 
-        { "arrow.png",  1, {}, {} },
-        { "google_chrome.ico", 1, {}, {} },
-        { "brickwork-texture.jpg", 1, {}, {} },
+        { "arrow.png",  1, {}, {}, 0 },
+        { "google_chrome.ico", 1, {}, {}, 0 },
+        { "brickwork-texture.jpg", 1, {}, {}, 0 },
 #if defined(SK_CODEC_DECODES_RAW) && (!defined(_WIN32))
-        { "dng_with_preview.dng", 1, {}, {} },
+        { "dng_with_preview.dng", 1, {}, {}, 0 },
 #endif
-        { "mandrill.wbmp", 1, {}, {} },
-        { "randPixels.bmp", 1, {}, {} },
-        { "yellow_rose.webp", 1, {}, {} },
+        { "mandrill.wbmp", 1, {}, {}, 0 },
+        { "randPixels.bmp", 1, {}, {}, 0 },
+        { "yellow_rose.webp", 1, {}, {}, 0 },
     };
 
-    for (auto rec : gRecs) {
+    for (const auto& rec : gRecs) {
         std::unique_ptr<SkStream> stream(GetResourceAsStream(rec.fName));
         if (!stream) {
             // Useful error statement, but sometimes people run tests without
             // resources, and they do not want to see these messages.
             //ERRORF(r, "Missing resources? Could not find '%s'", rec.fName);
             continue;
         }
 
         std::unique_ptr<SkCodec> codec(SkCodec::NewFromStream(stream.release()));
         if (!codec) {
             ERRORF(r, "Failed to create an SkCodec from '%s'", rec.fName);
             continue;
         }
 
+        std::vector<SkCodec::FrameInfo> frameInfos;
+        int repetitionCount;
+        const bool isAnimated = codec->getFrameInfo(&frameInfos, &repetitionCount);
+        if (!isAnimated) {
+            REPORTER_ASSERT(r, rec.fFrameCount == 1);
+            continue;
+        }
+
+        if (rec.fFrameCount == 1) {
+            // SkGifCodec still returns true even if there is only one frame.
+            continue;
+        }
+
+        // From here on, we are only concerned with animated images.
         const size_t expected = rec.fFrameCount;
-        const auto frameInfos = codec->getFrameInfo();
-        // getFrameInfo returns empty set for non-animated.
-        const size_t frameCount = frameInfos.size() == 0 ? 1 : frameInfos.size();
+        const size_t frameCount = frameInfos.size();
         if (frameCount != expected) {
             ERRORF(r, "'%s' expected frame count: %i\tactual: %i", rec.fName, expected, frameCount);
             continue;
         }
 
         if (rec.fRequiredFrames.size() + 1 != expected) {
             ERRORF(r, "'%s' has wrong number entries in fRequiredFrames; expected: %i\tactual: %i",
                    rec.fName, expected, rec.fRequiredFrames.size());
             continue;
         }
 
-        if (1 == frameCount) {
-            continue;
-        }
-
-        // From here on, we are only concerned with animated images.
+        REPORTER_ASSERT(r, repetitionCount == rec.fRepetitionCount);
         REPORTER_ASSERT(r, frameInfos[0].fRequiredFrame == SkCodec::kNone);
         for (size_t i = 1; i < frameCount; i++) {
             REPORTER_ASSERT(r, rec.fRequiredFrames[i-1] == frameInfos[i].fRequiredFrame);
         }
 
         // Compare decoding in two ways:
         // 1. Provide the frame that a frame depends on, so the codec just has to blend.
         //    (in the array cachedFrames)
         // 2. Do not provide the frame that a frame depends on, so the codec has to decode all the
         //    way back to a key-frame. (in a local variable uncachedFrame)
@@ skipping 44 matching lines @@
             ERRORF(r, "'%s' has wrong number entries in fDurations; expected: %i\tactual: %i",
                    rec.fName, expected, rec.fDurations.size());
             continue;
         }
 
         for (size_t i = 0; i < frameCount; i++) {
             REPORTER_ASSERT(r, rec.fDurations[i] == frameInfos[i].fDuration);
         }
     }
 }