Report repetition count in SkCodec

dm/DMSrcSink.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "DMSrcSink.h"
 #include "Resources.h"
 #include "SkAndroidCodec.h"
@@ skipping 412 matching lines @@
     }
 
     SkImageInfo bitmapInfo = decodeInfo;
     if (kRGBA_8888_SkColorType == decodeInfo.colorType() ||
             kBGRA_8888_SkColorType == decodeInfo.colorType()) {
         bitmapInfo = bitmapInfo.makeColorType(kN32_SkColorType);
     }
 
     switch (fMode) {
         case kAnimated_Mode: {
-            std::vector<SkCodec::FrameInfo> frameInfos = codec->getFrameInfo();
-            if (frameInfos.size() <= 1) {
+            std::vector<SkCodec::FrameInfo> frameInfos;
+            const bool animated = codec->getFrameInfo(&frameInfos, nullptr);
+            if (!animated || frameInfos.size() <= 1) {
                 return SkStringPrintf("%s is not an animated image.", fPath.c_str());
             }
 
             // As in CodecSrc::size(), compute a roughly square grid to draw the frames
             // into. "factor" is the number of frames to draw on one row. There will be
             // up to "factor" rows as well.
             const float root = sqrt((float) frameInfos.size());
             const int factor = sk_float_ceil2int(root);
 
             // Used to cache a frame that future frames will depend on.
@@ skipping 273 matching lines @@
     SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
     if (nullptr == codec) {
         return SkISize::Make(0, 0);
     }
 
     auto imageSize = codec->getScaledDimensions(fScale);
     if (fMode == kAnimated_Mode) {
         // We'll draw one of each frame, so make it big enough to hold them all
         // in a grid. The grid will be roughly square, with "factor" frames per
         // row and up to "factor" rows.
-        const size_t count = codec->getFrameInfo().size();
+        std::vector<SkCodec::FrameInfo> frameInfos;
+        if (!codec->getFrameInfo(&frameInfos, nullptr)) {
+            return imageSize;
+        }
+        const size_t count = frameInfos.size();
         const float root = sqrt((float) count);
         const int factor = sk_float_ceil2int(root);
         imageSize.fWidth  = imageSize.fWidth  * factor;
         imageSize.fHeight = imageSize.fHeight * sk_float_ceil2int((float) count / (float) factor);
     }
     return imageSize;
 }
 
 Name CodecSrc::name() const {
     if (1.0f == fScale) {
@@ skipping 1064 matching lines @@
         Error err = src.draw(&rec);
         if (!err.isEmpty()) {
             return err;
         }
         dl->draw(canvas);
         return check_against_reference(bitmap, src, fSink);
     });
 }
 
 }  // namespace DM