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

webrtc/media/engine/webrtcvideoframe_unittest.cc

 /*
  *  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 57 matching lines @@
     // Verify the new frame.
     EXPECT_EQ(5678, frame.GetTimeStamp());
     if (apply_rotation)
       EXPECT_EQ(webrtc::kVideoRotation_0, frame.GetVideoRotation());
     else
       EXPECT_EQ(frame_rotation, frame.GetVideoRotation());
     // If |apply_rotation| and the frame rotation is 90 or 270, width and
     // height are flipped.
     if (apply_rotation && (frame_rotation == webrtc::kVideoRotation_90
         || frame_rotation == webrtc::kVideoRotation_270)) {
-      EXPECT_EQ(static_cast<size_t>(cropped_width), frame.GetHeight());
-      EXPECT_EQ(static_cast<size_t>(cropped_height), frame.GetWidth());
+      EXPECT_EQ(cropped_width, frame.height());
+      EXPECT_EQ(cropped_height, frame.width());
     } else {
-      EXPECT_EQ(static_cast<size_t>(cropped_width), frame.GetWidth());
-      EXPECT_EQ(static_cast<size_t>(cropped_height), frame.GetHeight());
+      EXPECT_EQ(cropped_width, frame.width());
+      EXPECT_EQ(cropped_height, frame.height());
     }
   }
 };
 
 #define TEST_WEBRTCVIDEOFRAME(X) TEST_F(WebRtcVideoFrameTest, X) { \
   VideoFrameTest<cricket::WebRtcVideoFrame>::X(); \
 }
 
 TEST_WEBRTCVIDEOFRAME(ConstructI420)
 TEST_WEBRTCVIDEOFRAME(ConstructI422)
@@ skipping 177 matching lines @@
 }
 
 TEST_F(WebRtcVideoFrameTest, TextureInitialValues) {
   webrtc::test::FakeNativeHandle* dummy_handle =
       new webrtc::test::FakeNativeHandle();
   webrtc::NativeHandleBuffer* buffer =
       new rtc::RefCountedObject<webrtc::test::FakeNativeHandleBuffer>(
           dummy_handle, 640, 480);
   cricket::WebRtcVideoFrame frame(buffer, 200, webrtc::kVideoRotation_0);
   EXPECT_EQ(dummy_handle, frame.GetNativeHandle());
-  EXPECT_EQ(640u, frame.GetWidth());
-  EXPECT_EQ(480u, frame.GetHeight());
+  EXPECT_EQ(640, frame.width());
+  EXPECT_EQ(480, frame.height());
   EXPECT_EQ(200, frame.GetTimeStamp());
   frame.SetTimeStamp(400);
   EXPECT_EQ(400, frame.GetTimeStamp());
 }
 
 TEST_F(WebRtcVideoFrameTest, CopyTextureFrame) {
   webrtc::test::FakeNativeHandle* dummy_handle =
       new webrtc::test::FakeNativeHandle();
   webrtc::NativeHandleBuffer* buffer =
       new rtc::RefCountedObject<webrtc::test::FakeNativeHandleBuffer>(
           dummy_handle, 640, 480);
   cricket::WebRtcVideoFrame frame1(buffer, 200, webrtc::kVideoRotation_0);
   cricket::VideoFrame* frame2 = frame1.Copy();
   EXPECT_EQ(frame1.GetNativeHandle(), frame2->GetNativeHandle());
-  EXPECT_EQ(frame1.GetWidth(), frame2->GetWidth());
-  EXPECT_EQ(frame1.GetHeight(), frame2->GetHeight());
+  EXPECT_EQ(frame1.width(), frame2->width());
+  EXPECT_EQ(frame1.height(), frame2->height());
   EXPECT_EQ(frame1.GetTimeStamp(), frame2->GetTimeStamp());
   delete frame2;
 }
 
 TEST_F(WebRtcVideoFrameTest, ApplyRotationToFrame) {
   WebRtcVideoTestFrame applied0;
   EXPECT_TRUE(IsNull(applied0));
   std::unique_ptr<rtc::MemoryStream> ms(CreateYuvSample(kWidth, kHeight, 12));
   EXPECT_TRUE(
       LoadFrame(ms.get(), cricket::FOURCC_I420, kWidth, kHeight, &applied0));
@@ skipping 11 matching lines @@
 
   // Claim the frame 2 needs to be rotated for another 270 degree. The output
   // from frame 2 rotation should be the same as frame 1.
   applied90->SetRotation(webrtc::kVideoRotation_270);
   const cricket::VideoFrame* applied360 =
       applied90->GetCopyWithRotationApplied();
   EXPECT_TRUE(applied360);
   EXPECT_EQ(applied360->GetVideoRotation(), webrtc::kVideoRotation_0);
   EXPECT_TRUE(IsEqual(applied0, *applied360, 0));
 }