cricket::VideoFrame cleanup. New width() and height(). Deleted GetChroma* methods.

webrtc/media/base/fakevideorenderer.h

 /*
  *  Copyright (c) 2011 The WebRTC 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 19 matching lines @@
         num_rendered_frames_(0),
         black_frame_(false) {}
 
   virtual void OnFrame(const VideoFrame& frame) {
     rtc::CritScope cs(&crit_);
     // TODO(zhurunz) Check with VP8 team to see if we can remove this
     // tolerance on Y values.
     black_frame_ = CheckFrameColorYuv(6, 48, 128, 128, 128, 128, &frame);
     // Treat unexpected frame size as error.
     ++num_rendered_frames_;
-    width_ = static_cast<int>(frame.GetWidth());
-    height_ = static_cast<int>(frame.GetHeight());
+    width_ = frame.width();
+    height_ = frame.height();
     rotation_ = frame.GetVideoRotation();
     timestamp_ = frame.GetTimeStamp();
     SignalRenderFrame(&frame);
   }
 
   int errors() const { return errors_; }
   int width() const {
     rtc::CritScope cs(&crit_);
     return width_;
   }
@@ skipping 27 matching lines @@
                                  uint8_t y_max,
                                  uint8_t u_min,
                                  uint8_t u_max,
                                  uint8_t v_min,
                                  uint8_t v_max,
                                  const cricket::VideoFrame* frame) {
     if (!frame) {
       return false;
     }
     // Y
-    size_t y_width = frame->GetWidth();
-    size_t y_height = frame->GetHeight();
+    int y_width = frame->width();
+    int y_height = frame->height();
     const uint8_t* y_plane = frame->GetYPlane();
     const uint8_t* y_pos = y_plane;
     int32_t y_pitch = frame->GetYPitch();
-    for (size_t i = 0; i < y_height; ++i) {
-      for (size_t j = 0; j < y_width; ++j) {
+    for (int i = 0; i < y_height; ++i) {
+      for (int j = 0; j < y_width; ++j) {
         uint8_t y_value = *(y_pos + j);
         if (y_value < y_min || y_value > y_max) {
           return false;
         }
       }
       y_pos += y_pitch;
     }
     // U and V
-    size_t chroma_width = frame->GetChromaWidth();
-    size_t chroma_height = frame->GetChromaHeight();
+    int chroma_width = (frame->width() + 1)/2;
+    int chroma_height = (frame->height() + 1)/2;
     const uint8_t* u_plane = frame->GetUPlane();
     const uint8_t* v_plane = frame->GetVPlane();
     const uint8_t* u_pos = u_plane;
     const uint8_t* v_pos = v_plane;
     int32_t u_pitch = frame->GetUPitch();
     int32_t v_pitch = frame->GetVPitch();
-    for (size_t i = 0; i < chroma_height; ++i) {
-      for (size_t j = 0; j < chroma_width; ++j) {
+    for (int i = 0; i < chroma_height; ++i) {
+      for (int j = 0; j < chroma_width; ++j) {
         uint8_t u_value = *(u_pos + j);
         if (u_value < u_min || u_value > u_max) {
           return false;
         }
         uint8_t v_value = *(v_pos + j);
         if (v_value < v_min || v_value > v_max) {
           return false;
         }
       }
       u_pos += u_pitch;
       v_pos += v_pitch;
     }
     return true;
   }
 
   int errors_;
   int width_;
   int height_;
   webrtc::VideoRotation rotation_;
   int64_t timestamp_;
   int num_rendered_frames_;
   bool black_frame_;
   rtc::CriticalSection crit_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_