Add scaled subset API to SkCodec

src/codec/SkCodecPriv.h

 /*
  * Copyright 2015 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkCodecPriv_DEFINED
 #define SkCodecPriv_DEFINED
 
@@ skipping 13 matching lines @@
     uint8_t zeroAlpha = 0;                      \
     uint8_t maxAlpha = 0xFF;
 
 #define UPDATE_RESULT_ALPHA(alpha)              \
     zeroAlpha |= (alpha);                       \
     maxAlpha  &= (alpha);
 
 #define COMPUTE_RESULT_ALPHA                    \
     SkSwizzler::GetResult(zeroAlpha, maxAlpha);
 
+inline bool is_valid_subset(const SkIRect& subset, const SkISize& imageDims) {
+    return SkIRect::MakeSize(imageDims).contains(subset);
+}
+
 /*
  * returns a scaled dimension based on the original dimension and the sampleSize
  * NOTE: we round down here for scaled dimension to match the behavior of SkImageDecoder
  */
 inline int get_scaled_dimension(int srcDimension, int sampleSize) {
     if (sampleSize > srcDimension) {
         return 1;
     }
     return srcDimension / sampleSize;
 }
@@ skipping 13 matching lines @@
  * The output can be interpreted as an x-coordinate or a y-coordinate.
  *
  * This does not need to be called and is not called when sampleFactor == 1.
  */
 inline int get_dst_coord(int srcCoord, int sampleFactor) { return srcCoord / sampleFactor; };
 
 /*
  * When scaling, we will discard certain y-coordinates (rows) and
  * x-coordinates (columns).  This function returns true if we should keep the
  * coordinate and false otherwise.
- * The inputs may be x-coordinates or y-coordinates.
+ *
+ * The inputs may be x-coordinates or y-coordinates, but for clarity, it helps
+ * to name variables using y-coordinate naming conventions.

[scroggo, 2015/10/12 20:47:07]

Was y picked arbitrarily over x? I understand it makes sense to be less
abstract, but I don't see why y is more clear.

  *
  * This does not need to be called and is not called when sampleFactor == 1.
+ *
+ * @param srcY               Unscaled, original y-coordinate
+ * @param sampleY            Sampling factor used in the y-dimension
+ * @param scaledSubsetHeight Height of the final output, after any scaling or subsetting
+ * @param subsetY            Top of the subset as an unscaled, original y-coordinate
  */
-inline bool is_coord_necessary(int srcCoord, int sampleFactor, int scaledDim) {
+inline bool is_coord_necessary(int srcY, int sampleY, int scaledSubsetHeight, int subsetY) {
     // Get the first coordinate that we want to keep
-    int startCoord = get_start_coord(sampleFactor);
+    int startY = get_start_coord(sampleY) + subsetY;
 
     // Return false on edge cases
-    if (srcCoord < startCoord || get_dst_coord(srcCoord, sampleFactor) >= scaledDim) {
+    if (srcY < startY || get_dst_coord(srcY - subsetY, sampleY) >= scaledSubsetHeight) {
         return false;
     }
 
-    // Every sampleFactor rows are necessary
-    return ((srcCoord - startCoord) % sampleFactor) == 0;
+    // Every sampleY rows are necessary
+    return ((srcY - startY) % sampleY) == 0;
 }
 
 inline bool valid_alpha(SkAlphaType dstAlpha, SkAlphaType srcAlpha) {
     // Check for supported alpha types
     if (srcAlpha != dstAlpha) {
         if (kOpaque_SkAlphaType == srcAlpha) {
             // If the source is opaque, we must decode to opaque
             return false;
         }
 
@@ skipping 145 matching lines @@
 #endif
 }
 
 #ifdef SK_PRINT_CODEC_MESSAGES
     #define SkCodecPrintf SkDebugf
 #else
     #define SkCodecPrintf(...)
 #endif
 
 #endif // SkCodecPriv_DEFINED