Convert usage of ARRAY_SIZE to arraysize.

talk/media/base/videocommon.cc

 /*
  * libjingle
  * Copyright 2010 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 13 matching lines @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "talk/media/base/videocommon.h"
 
 #include <limits.h>  // For INT_MAX
 #include <math.h>
 #include <sstream>
 
+#include "webrtc/base/arraysize.h"
 #include "webrtc/base/common.h"
 
 namespace cricket {
 
 struct FourCCAliasEntry {
   uint32_t alias;
   uint32_t canonical;
 };
 
 static const FourCCAliasEntry kFourCCAliases[] = {
   {FOURCC_IYUV, FOURCC_I420},
   {FOURCC_YU16, FOURCC_I422},
   {FOURCC_YU24, FOURCC_I444},
   {FOURCC_YUYV, FOURCC_YUY2},
   {FOURCC_YUVS, FOURCC_YUY2},
   {FOURCC_HDYC, FOURCC_UYVY},
   {FOURCC_2VUY, FOURCC_UYVY},
   {FOURCC_JPEG, FOURCC_MJPG},  // Note: JPEG has DHT while MJPG does not.
   {FOURCC_DMB1, FOURCC_MJPG},
   {FOURCC_BA81, FOURCC_BGGR},
   {FOURCC_RGB3, FOURCC_RAW},
   {FOURCC_BGR3, FOURCC_24BG},
   {FOURCC_CM32, FOURCC_BGRA},
   {FOURCC_CM24, FOURCC_RAW},
 };
 
 uint32_t CanonicalFourCC(uint32_t fourcc) {
-  for (int i = 0; i < ARRAY_SIZE(kFourCCAliases); ++i) {
+  for (int i = 0; i < arraysize(kFourCCAliases); ++i) {
     if (kFourCCAliases[i].alias == fourcc) {
       return kFourCCAliases[i].canonical;
     }
   }
   // Not an alias, so return it as-is.
   return fourcc;
 }
 
 static float kScaleFactors[] = {
   1.f / 1.f,  // Full size.
   1.f / 2.f,  // 1/2 scale.
   1.f / 4.f,  // 1/4 scale.
   1.f / 8.f,  // 1/8 scale.
   1.f / 16.f  // 1/16 scale.
 };
 
-static const int kNumScaleFactors = ARRAY_SIZE(kScaleFactors);
+static const int kNumScaleFactors = arraysize(kScaleFactors);
 
 // Finds the scale factor that, when applied to width and height, produces
 // fewer than num_pixels.
 static float FindLowerScale(int width, int height, int target_num_pixels) {
   if (!target_num_pixels) {
     return 0.f;
   }
   int best_distance = INT_MAX;
   int best_index = kNumScaleFactors - 1;  // Default to max scale.
   for (int i = 0; i < kNumScaleFactors; ++i) {
@@ skipping 148 matching lines @@
     }
   }
 
   std::ostringstream ss;
   ss << fourcc_name << width << "x" << height << "x"
      << IntervalToFpsFloat(interval);
   return ss.str();
 }
 
 }  // namespace cricket