Move InitToBlack and Reset methods from cricket::VideoFrame to its subclass cricket::WebRtcVideoFra…

webrtc/media/base/videoframe_unittest.h

 /*
  *  Copyright (c) 2004 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 1353 matching lines @@
         EXPECT_TRUE(ConvertRgb(ms.get(), cricket::FOURCC_ARGB,
                                kOddWidth + i, kOddHeight + j,
                                &frame1));
         EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_ARGB,
                               kOddWidth + i, kOddHeight + j, &frame2));
         EXPECT_TRUE(IsEqual(frame1, frame2, 64));
       }
     }
   }
 
-  // Tests re-initing an existing image.
-  void Reset(webrtc::VideoRotation rotation, bool apply_rotation) {
-    T frame1, frame2;
-    std::unique_ptr<rtc::MemoryStream> ms(
-        LoadSample(kImageFilename));
-    ASSERT_TRUE(ms.get() != NULL);
-    size_t data_size;
-    ms->GetSize(&data_size);
-    EXPECT_TRUE(frame1.InitToBlack(kWidth, kHeight, 0));
-    EXPECT_TRUE(frame2.InitToBlack(kWidth, kHeight, 0));
-    EXPECT_TRUE(IsBlack(frame1));
-    EXPECT_TRUE(IsEqual(frame1, frame2, 0));
-    EXPECT_TRUE(frame1.Reset(cricket::FOURCC_I420, kWidth, kHeight, kWidth,
-                             kHeight,
-                             reinterpret_cast<uint8_t*>(ms->GetBuffer()),
-                             data_size, 0, rotation, apply_rotation));
-    if (apply_rotation)
-      EXPECT_EQ(webrtc::kVideoRotation_0, frame1.GetVideoRotation());
-    else
-      EXPECT_EQ(rotation, frame1.GetVideoRotation());
-
-    // Swapp width and height if the frame is rotated 90 or 270 degrees.
-    if (apply_rotation && (rotation == webrtc::kVideoRotation_90
-        || rotation == webrtc::kVideoRotation_270)) {
-      EXPECT_TRUE(kHeight == frame1.width());
-      EXPECT_TRUE(kWidth == frame1.height());
-    } else {
-      EXPECT_TRUE(kWidth == frame1.width());
-      EXPECT_TRUE(kHeight == frame1.height());
-    }
-    EXPECT_FALSE(IsBlack(frame1));
-    EXPECT_FALSE(IsEqual(frame1, frame2, 0));
-  }
-
-  void ResetAndApplyRotation() {
-    Reset(webrtc::kVideoRotation_90, true);
-  }
-
-  void ResetAndDontApplyRotation() {
-    Reset(webrtc::kVideoRotation_90, false);
-  }
-
   //////////////////////
   // Conversion tests //
   //////////////////////
 
   enum ToFrom { TO, FROM };
 
   // Helper function for test converting from I420 to packed formats.
   inline void ConvertToBuffer(int bpp,
                               int rowpad,
                               bool invert,
@@ skipping 400 matching lines @@
     ASSERT_TRUE(LoadFrameNoRepeat(&target2));
     source.StretchToFrame(&target2, true, true);
     EXPECT_TRUE(IsBlack(target2));
     EXPECT_EQ(source.GetTimeStamp(), target2.GetTimeStamp());
   }
 
   int repeat_;
 };
 
 #endif  // WEBRTC_MEDIA_BASE_VIDEOFRAME_UNITTEST_H_