Revert of Delete remnants of non-square pixel support from cricket::VideoFrame.

talk/media/webrtc/webrtcvideoframe_unittest.cc

 /*
  * libjingle
  * Copyright 2011 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 21 matching lines @@
 #include "webrtc/test/fake_texture_frame.h"
 
 namespace {
 
 class WebRtcVideoTestFrame : public cricket::WebRtcVideoFrame {
  public:
   using cricket::WebRtcVideoFrame::SetRotation;
 
   virtual VideoFrame* CreateEmptyFrame(int w,
                                        int h,
+                                       size_t pixel_width,
+                                       size_t pixel_height,
                                        int64_t time_stamp) const override {
     WebRtcVideoTestFrame* frame = new WebRtcVideoTestFrame();
-    frame->InitToBlack(w, h, time_stamp);
+    frame->InitToBlack(w, h, pixel_width, pixel_height, time_stamp);
     return frame;
   }
 };
 
 }  // namespace
 
 class WebRtcVideoFrameTest : public VideoFrameTest<cricket::WebRtcVideoFrame> {
  public:
   WebRtcVideoFrameTest() {
   }
 
   void TestInit(int cropped_width, int cropped_height,
                 webrtc::VideoRotation frame_rotation,
                 bool apply_rotation) {
     const int frame_width = 1920;
     const int frame_height = 1080;
 
     // Build the CapturedFrame.
     cricket::CapturedFrame captured_frame;
     captured_frame.fourcc = cricket::FOURCC_I420;
+    captured_frame.pixel_width = 1;
+    captured_frame.pixel_height = 1;
     captured_frame.time_stamp = 5678;
     captured_frame.rotation = frame_rotation;
     captured_frame.width = frame_width;
     captured_frame.height = frame_height;
     captured_frame.data_size = (frame_width * frame_height) +
         ((frame_width + 1) / 2) * ((frame_height + 1) / 2) * 2;
     rtc::scoped_ptr<uint8_t[]> captured_frame_buffer(
         new uint8_t[captured_frame.data_size]);
     // Initialize memory to satisfy DrMemory tests.
     memset(captured_frame_buffer.get(), 0, captured_frame.data_size);
     captured_frame.data = captured_frame_buffer.get();
 
     // Create the new frame from the CapturedFrame.
     cricket::WebRtcVideoFrame frame;
     EXPECT_TRUE(
         frame.Init(&captured_frame, cropped_width, cropped_height,
                    apply_rotation));
 
     // Verify the new frame.
+    EXPECT_EQ(1u, frame.GetPixelWidth());
+    EXPECT_EQ(1u, frame.GetPixelHeight());
     EXPECT_EQ(5678, frame.GetTimeStamp());
     if (apply_rotation)
       EXPECT_EQ(webrtc::kVideoRotation_0, frame.GetRotation());
     else
       EXPECT_EQ(frame_rotation, frame.GetRotation());
     // 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());
@@ skipping 243 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));
 }