diff options
Diffstat (limited to 'talk/media/base/videocommon.cc')
| -rw-r--r-- | talk/media/base/videocommon.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/talk/media/base/videocommon.cc b/talk/media/base/videocommon.cc index 7b6aac206b..faf6450b56 100644 --- a/talk/media/base/videocommon.cc +++ b/talk/media/base/videocommon.cc @@ -31,6 +31,7 @@ #include <math.h> #include <sstream> +#include "webrtc/base/arraysize.h" #include "webrtc/base/common.h" namespace cricket { @@ -58,7 +59,7 @@ static const FourCCAliasEntry kFourCCAliases[] = { }; 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; } @@ -75,7 +76,7 @@ static float kScaleFactors[] = { 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. @@ -106,9 +107,6 @@ void ComputeScaleMaxPixels(int frame_width, int frame_height, int max_pixels, ASSERT(scaled_width != NULL); ASSERT(scaled_height != NULL); ASSERT(max_pixels > 0); - // For VP8 the values for max width and height can be found here - // webrtc/src/video_engine/vie_defines.h (kViEMaxCodecWidth and - // kViEMaxCodecHeight) const int kMaxWidth = 4096; const int kMaxHeight = 3072; int new_frame_width = frame_width; |