ConvertToARGB: Allows rotation on ARGB input

source/convert_to_argb.cc

 /*
  *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS. All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 32 matching lines @@
                   uint32 fourcc) {
   uint32 format = CanonicalFourCC(fourcc);
   int aligned_src_width = (src_width + 1) & ~1;
   const uint8* src;
   const uint8* src_uv;
   int abs_src_height = (src_height < 0) ? -src_height : src_height;
   int inv_crop_height = (crop_height < 0) ? -crop_height : crop_height;
   int r = 0;
 
   // One pass rotation is available for some formats. For the rest, convert
-  // to I420 (with optional vertical flipping) into a temporary I420 buffer,
-  // and then rotate the I420 to the final destination buffer.
+  // to ARGB (with optional vertical flipping) into a temporary ARGB buffer,
+  // and then rotate the ARGB to the final destination buffer.
   // For in-place conversion, if destination crop_argb is same as source sample,
   // also enable temporary buffer.
   LIBYUV_BOOL need_buf =
       (rotation && format != FOURCC_ARGB) || crop_argb == sample;
   uint8* dest_argb = crop_argb;
   int dest_argb_stride = argb_stride;
   uint8* rotate_buffer = NULL;
   int abs_crop_height = (crop_height < 0) ? -crop_height : crop_height;
 
   if (crop_argb == NULL || sample == NULL || src_width <= 0 ||
@@ skipping 30 matching lines @@
       src = sample + (src_width * crop_y + crop_x) * 3;
       r = RGB24ToARGB(src, src_width * 3, crop_argb, argb_stride, crop_width,
                       inv_crop_height);
       break;
     case FOURCC_RAW:
       src = sample + (src_width * crop_y + crop_x) * 3;
       r = RAWToARGB(src, src_width * 3, crop_argb, argb_stride, crop_width,
                     inv_crop_height);
       break;
     case FOURCC_ARGB:
-      src = sample + (src_width * crop_y + crop_x) * 4;
-      r = ARGBToARGB(src, src_width * 4, crop_argb, argb_stride, crop_width,
-                     inv_crop_height);
+      if (!need_buf && !rotation) {

[fbarchard1, 2017/01/11 19:42:16]

FYI for I420 version the rotation is done here for any formats that can do it. 
But only ARGB can rotate directly, so your change is fine.

+        src = sample + (src_width * crop_y + crop_x) * 4;
+        r = ARGBToARGB(src, src_width * 4, crop_argb, argb_stride, crop_width,
+                       inv_crop_height);
+      }
       break;
     case FOURCC_BGRA:
       src = sample + (src_width * crop_y + crop_x) * 4;
       r = BGRAToARGB(src, src_width * 4, crop_argb, argb_stride, crop_width,
                      inv_crop_height);
       break;
     case FOURCC_ABGR:
       src = sample + (src_width * crop_y + crop_x) * 4;
       r = ABGRToARGB(src, src_width * 4, crop_argb, argb_stride, crop_width,
                      inv_crop_height);
@@ skipping 128 matching lines @@
     default:
       r = -1;  // unknown fourcc - return failure code.
   }
 
   if (need_buf) {
     if (!r) {
       r = ARGBRotate(crop_argb, argb_stride, dest_argb, dest_argb_stride,
                      crop_width, abs_crop_height, rotation);
     }
     free(rotate_buffer);
+  } else if (rotation) {
+    src = sample + (src_width * crop_y + crop_x) * 4;
+    r = ARGBRotate(src, src_width * 4,
+                   crop_argb, argb_stride,
+                   crop_width, inv_crop_height, rotation);
   }
 
   return r;
 }
 
 #ifdef __cplusplus
 }  // extern "C"
 }  // namespace libyuv
 #endif