Delete RawVideoType enum, use the VideoType enum instead.

webrtc/common_video/libyuv/libyuv_unittest.cc

 /*
  *  Copyright (c) 2012 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 35 matching lines @@
   const size_t frame_length_;
 };
 
 TestLibYuv::TestLibYuv()
     : source_file_(NULL),
       orig_frame_(),
       width_(352),
       height_(288),
       size_y_(width_ * height_),
       size_uv_(((width_ + 1) / 2) * ((height_ + 1) / 2)),
-      frame_length_(CalcBufferSize(kI420, 352, 288)) {}
+      frame_length_(CalcBufferSize(VideoType::kI420, 352, 288)) {}
 
 void TestLibYuv::SetUp() {
   const std::string input_file_name = webrtc::test::ResourcePath("foreman_cif",
                                                                  "yuv");
   source_file_  = fopen(input_file_name.c_str(), "rb");
   ASSERT_TRUE(source_file_ != NULL) << "Cannot read file: "<<
                                        input_file_name << "\n";
 
   rtc::scoped_refptr<VideoFrameBuffer> buffer(
       test::ReadI420Buffer(width_, height_, source_file_));
@@ skipping 20 matching lines @@
   FILE*  output_file = fopen(output_file_name.c_str(), "wb");
   ASSERT_TRUE(output_file != NULL);
 
   double psnr = 0.0;
 
   rtc::scoped_refptr<I420Buffer> res_i420_buffer = I420Buffer::Create(
       width_, height_, width_, (width_ + 1) / 2, (width_ + 1) / 2);
 
   printf("\nConvert #%d I420 <-> I420 \n", j);
   std::unique_ptr<uint8_t[]> out_i420_buffer(new uint8_t[frame_length_]);
-  EXPECT_EQ(0, ConvertFromI420(*orig_frame_, kI420, 0, out_i420_buffer.get()));
-  EXPECT_EQ(0, ConvertToI420(kI420, out_i420_buffer.get(), 0, 0, width_,
-                             height_, 0, kVideoRotation_0,
-                             res_i420_buffer.get()));
+  EXPECT_EQ(0, ConvertFromI420(*orig_frame_, VideoType::kI420, 0,
+                               out_i420_buffer.get()));
+  EXPECT_EQ(0,
+            ConvertToI420(VideoType::kI420, out_i420_buffer.get(), 0, 0, width_,
+                          height_, 0, kVideoRotation_0, res_i420_buffer.get()));
 
   if (PrintVideoFrame(*res_i420_buffer, output_file) < 0) {
     return;
   }
   psnr = I420PSNR(*orig_frame_->video_frame_buffer(), *res_i420_buffer);
   EXPECT_EQ(48.0, psnr);
   j++;
 
   printf("\nConvert #%d I420 <-> RGB24\n", j);
   std::unique_ptr<uint8_t[]> res_rgb_buffer2(new uint8_t[width_ * height_ * 3]);
   // Align the stride values for the output frame.
   int stride_y = 0;
   int stride_uv = 0;
   Calc16ByteAlignedStride(width_, &stride_y, &stride_uv);
   res_i420_buffer =
       I420Buffer::Create(width_, height_, stride_y, stride_uv, stride_uv);
-  EXPECT_EQ(0, ConvertFromI420(*orig_frame_, kRGB24, 0, res_rgb_buffer2.get()));
+  EXPECT_EQ(0, ConvertFromI420(*orig_frame_, VideoType::kRGB24, 0,
+                               res_rgb_buffer2.get()));
 
-  EXPECT_EQ(0, ConvertToI420(kRGB24, res_rgb_buffer2.get(), 0, 0, width_,
-                             height_, 0, kVideoRotation_0,
-                             res_i420_buffer.get()));
+  EXPECT_EQ(
+      0, ConvertToI420(VideoType::kRGB24, res_rgb_buffer2.get(), 0, 0, width_,
+                       height_, 0, kVideoRotation_0, res_i420_buffer.get()));
 
   if (PrintVideoFrame(*res_i420_buffer, output_file) < 0) {
     return;
   }
   psnr = I420PSNR(*orig_frame_->video_frame_buffer(), *res_i420_buffer);
 
   // Optimization Speed- quality trade-off => 45 dB only (platform dependant).
   EXPECT_GT(ceil(psnr), 44);
   j++;
 
   printf("\nConvert #%d I420 <-> UYVY\n", j);
   std::unique_ptr<uint8_t[]> out_uyvy_buffer(new uint8_t[width_ * height_ * 2]);
-  EXPECT_EQ(0, ConvertFromI420(*orig_frame_, kUYVY, 0, out_uyvy_buffer.get()));
-  EXPECT_EQ(0, ConvertToI420(kUYVY, out_uyvy_buffer.get(), 0, 0, width_,
-                             height_, 0, kVideoRotation_0,
-                             res_i420_buffer.get()));
+  EXPECT_EQ(0, ConvertFromI420(*orig_frame_, VideoType::kUYVY, 0,
+                               out_uyvy_buffer.get()));
+  EXPECT_EQ(0,
+            ConvertToI420(VideoType::kUYVY, out_uyvy_buffer.get(), 0, 0, width_,
+                          height_, 0, kVideoRotation_0, res_i420_buffer.get()));
   psnr = I420PSNR(*orig_frame_->video_frame_buffer(), *res_i420_buffer);
   EXPECT_EQ(48.0, psnr);
   if (PrintVideoFrame(*res_i420_buffer, output_file) < 0) {
     return;
   }
   j++;
 
   printf("\nConvert #%d I420 <-> YUY2\n", j);
   std::unique_ptr<uint8_t[]> out_yuy2_buffer(new uint8_t[width_ * height_ * 2]);
-  EXPECT_EQ(0, ConvertFromI420(*orig_frame_, kYUY2, 0, out_yuy2_buffer.get()));
+  EXPECT_EQ(0, ConvertFromI420(*orig_frame_, VideoType::kYUY2, 0,
+                               out_yuy2_buffer.get()));
 
-  EXPECT_EQ(0, ConvertToI420(kYUY2, out_yuy2_buffer.get(), 0, 0, width_,
-                             height_, 0,
-                             kVideoRotation_0, res_i420_buffer.get()));
+  EXPECT_EQ(0,
+            ConvertToI420(VideoType::kYUY2, out_yuy2_buffer.get(), 0, 0, width_,
+                          height_, 0, kVideoRotation_0, res_i420_buffer.get()));
 
   if (PrintVideoFrame(*res_i420_buffer, output_file) < 0) {
     return;
   }
 
   psnr = I420PSNR(*orig_frame_->video_frame_buffer(), *res_i420_buffer);
   EXPECT_EQ(48.0, psnr);
 
   printf("\nConvert #%d I420 <-> RGB565\n", j);
   std::unique_ptr<uint8_t[]> out_rgb565_buffer(
       new uint8_t[width_ * height_ * 2]);
-  EXPECT_EQ(0,
-            ConvertFromI420(*orig_frame_, kRGB565, 0, out_rgb565_buffer.get()));
+  EXPECT_EQ(0, ConvertFromI420(*orig_frame_, VideoType::kRGB565, 0,
+                               out_rgb565_buffer.get()));
 
-  EXPECT_EQ(0, ConvertToI420(kRGB565, out_rgb565_buffer.get(), 0, 0, width_,
-                             height_, 0,
-                             kVideoRotation_0, res_i420_buffer.get()));
+  EXPECT_EQ(0, ConvertToI420(VideoType::kRGB565, out_rgb565_buffer.get(), 0, 0,
+                             width_, height_, 0, kVideoRotation_0,
+                             res_i420_buffer.get()));
   if (PrintVideoFrame(*res_i420_buffer, output_file) < 0) {
     return;
   }
   j++;
 
   psnr = I420PSNR(*orig_frame_->video_frame_buffer(), *res_i420_buffer);
   // TODO(leozwang) Investigate the right psnr should be set for I420ToRGB565,
   // Another example is I420ToRGB24, the psnr is 44
   // TODO(mikhal): Add psnr for RGB565, 1555, 4444, convert to ARGB.
   EXPECT_GT(ceil(psnr), 40);
 
   printf("\nConvert #%d I420 <-> ARGB8888\n", j);
   std::unique_ptr<uint8_t[]> out_argb8888_buffer(
       new uint8_t[width_ * height_ * 4]);
-  EXPECT_EQ(0,
-            ConvertFromI420(*orig_frame_, kARGB, 0, out_argb8888_buffer.get()));
+  EXPECT_EQ(0, ConvertFromI420(*orig_frame_, VideoType::kARGB, 0,
+                               out_argb8888_buffer.get()));
 
-  EXPECT_EQ(0, ConvertToI420(kARGB, out_argb8888_buffer.get(), 0, 0, width_,
-                             height_, 0, kVideoRotation_0,
+  EXPECT_EQ(0, ConvertToI420(VideoType::kARGB, out_argb8888_buffer.get(), 0, 0,
+                             width_, height_, 0, kVideoRotation_0,
                              res_i420_buffer.get()));
 
   if (PrintVideoFrame(*res_i420_buffer, output_file) < 0) {
     return;
   }
 
   psnr = I420PSNR(*orig_frame_->video_frame_buffer(), *res_i420_buffer);
   // TODO(leozwang) Investigate the right psnr should be set for
   // I420ToARGB8888,
   EXPECT_GT(ceil(psnr), 42);
@@ skipping 10 matching lines @@
 
   double psnr = 0.0;
 
   int stride_y = 0;
   int stride_uv = 0;
   Calc16ByteAlignedStride(width_, &stride_y, &stride_uv);
 
   rtc::scoped_refptr<I420Buffer> res_i420_buffer =
       I420Buffer::Create(width_, height_, stride_y, stride_uv, stride_uv);
   std::unique_ptr<uint8_t[]> out_i420_buffer(new uint8_t[frame_length_]);
-  EXPECT_EQ(0, ConvertFromI420(*orig_frame_, kI420, 0,
+  EXPECT_EQ(0, ConvertFromI420(*orig_frame_, VideoType::kI420, 0,
                                out_i420_buffer.get()));
-  EXPECT_EQ(0, ConvertToI420(kI420, out_i420_buffer.get(), 0, 0, width_,
-                             height_, 0, kVideoRotation_0,
-                             res_i420_buffer.get()));
+  EXPECT_EQ(0,
+            ConvertToI420(VideoType::kI420, out_i420_buffer.get(), 0, 0, width_,
+                          height_, 0, kVideoRotation_0, res_i420_buffer.get()));
 
   if (PrintVideoFrame(*res_i420_buffer, output_file) < 0) {
     return;
   }
   psnr = I420PSNR(*orig_frame_->video_frame_buffer(), *res_i420_buffer);
   EXPECT_EQ(48.0, psnr);
 }
 
 TEST_F(TestLibYuv, RotateTest) {
   // Use ConvertToI420 for multiple rotations - see that nothing breaks, all
   // memory is properly allocated and end result is equal to the starting point.
   int rotated_width = height_;
   int rotated_height = width_;
   int stride_y;
   int stride_uv;
 
   // Assume compact layout, no padding.
   const uint8_t *orig_buffer = orig_frame_->video_frame_buffer()->DataY();
 
   Calc16ByteAlignedStride(rotated_width, &stride_y, &stride_uv);
   rtc::scoped_refptr<I420Buffer> rotated_res_i420_buffer = I420Buffer::Create(
       rotated_width, rotated_height, stride_y, stride_uv, stride_uv);
-  EXPECT_EQ(0, ConvertToI420(kI420, orig_buffer, 0, 0, width_, height_,
-                             0, kVideoRotation_90,
-                             rotated_res_i420_buffer.get()));
-  EXPECT_EQ(0, ConvertToI420(kI420, orig_buffer, 0, 0, width_, height_,
-                             0, kVideoRotation_270,
-                             rotated_res_i420_buffer.get()));
+  EXPECT_EQ(
+      0, ConvertToI420(VideoType::kI420, orig_buffer, 0, 0, width_, height_, 0,
+                       kVideoRotation_90, rotated_res_i420_buffer.get()));
+  EXPECT_EQ(
+      0, ConvertToI420(VideoType::kI420, orig_buffer, 0, 0, width_, height_, 0,
+                       kVideoRotation_270, rotated_res_i420_buffer.get()));
   rotated_res_i420_buffer = I420Buffer::Create(
       width_, height_, width_, (width_ + 1) / 2, (width_ + 1) / 2);
-  EXPECT_EQ(0, ConvertToI420(kI420, orig_buffer, 0, 0, width_, height_,
-                             0, kVideoRotation_180,
-                             rotated_res_i420_buffer.get()));
+  EXPECT_EQ(
+      0, ConvertToI420(VideoType::kI420, orig_buffer, 0, 0, width_, height_, 0,
+                       kVideoRotation_180, rotated_res_i420_buffer.get()));
 }
 
 static uint8_t Average(int a, int b, int c, int d) {
   return (a + b + c + d + 2) / 4;
 }
 
 TEST_F(TestLibYuv, NV12Scale2x2to2x2) {
   const std::vector<uint8_t> src_y = {0, 1,
                                       2, 3};
   const std::vector<uint8_t> src_uv = {0, 1};
@@ skipping 33 matching lines @@
             2, 2);
 
   EXPECT_THAT(dst_y, ::testing::ElementsAre(
                          Average(0, 1, 4, 5), Average(2, 3, 6, 7),
                          Average(8, 9, 12, 13), Average(10, 11, 14, 15)));
   EXPECT_THAT(dst_uv,
               ::testing::ElementsAre(Average(0, 2, 4, 6), Average(1, 3, 5, 7)));
 }
 
 }  // namespace webrtc