Revert of Add correct support for videos with YUVJ420P color format, in the software conversion path.

media/base/yuv_convert_perftest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/base_paths.h"
 #include "base/cpu.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/time/time.h"
 #include "media/base/simd/convert_yuv_to_rgb.h"
-#include "media/base/simd/yuv_to_rgb_table.h"
 #include "media/base/yuv_convert.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/perf/perf_test.h"
 
 namespace media {
 #if !defined(ARCH_CPU_ARM_FAMILY) && !defined(ARCH_CPU_MIPS_FAMILY)
 // Size of raw image.
 static const int kSourceWidth = 640;
 static const int kSourceHeight = 360;
 static const int kSourceYSize = kSourceWidth * kSourceHeight;
@@ skipping 47 matching lines @@
 
   base::TimeTicks start = base::TimeTicks::HighResNow();
   for (int i = 0; i < kPerfTestIterations; ++i) {
     for (int row = 0; row < kSourceHeight; ++row) {
       int chroma_row = row / 2;
       ConvertYUVToRGB32Row_MMX(
           yuv_bytes_.get() + row * kSourceWidth,
           yuv_bytes_.get() + kSourceUOffset + (chroma_row * kSourceWidth / 2),
           yuv_bytes_.get() + kSourceVOffset + (chroma_row * kSourceWidth / 2),
           rgb_bytes_converted_.get(),
-          kWidth,
-          kCoefficientsRgbY);
+          kWidth);
     }
   }
   double total_time_seconds =
       (base::TimeTicks::HighResNow() - start).InSecondsF();
   perf_test::PrintResult(
       "yuv_convert_perftest", "", "ConvertYUVToRGB32Row_MMX",
       kPerfTestIterations / total_time_seconds, "runs/s", true);
 
   media::EmptyRegisterState();
 }
 
 TEST_F(YUVConvertPerfTest, ConvertYUVToRGB32Row_SSE) {
   ASSERT_TRUE(base::CPU().has_sse());
 
   base::TimeTicks start = base::TimeTicks::HighResNow();
   for (int i = 0; i < kPerfTestIterations; ++i) {
     for (int row = 0; row < kSourceHeight; ++row) {
       int chroma_row = row / 2;
       ConvertYUVToRGB32Row_SSE(
           yuv_bytes_.get() + row * kSourceWidth,
           yuv_bytes_.get() + kSourceUOffset + (chroma_row * kSourceWidth / 2),
           yuv_bytes_.get() + kSourceVOffset + (chroma_row * kSourceWidth / 2),
           rgb_bytes_converted_.get(),
-          kWidth,
-          kCoefficientsRgbY);
+          kWidth);
     }
   }
   double total_time_seconds =
       (base::TimeTicks::HighResNow() - start).InSecondsF();
   perf_test::PrintResult(
       "yuv_convert_perftest", "", "ConvertYUVToRGB32Row_SSE",
       kPerfTestIterations / total_time_seconds, "runs/s", true);
   media::EmptyRegisterState();
 }
 
 TEST_F(YUVConvertPerfTest, ScaleYUVToRGB32Row_MMX) {
   ASSERT_TRUE(base::CPU().has_mmx());
 
   const int kSourceDx = 80000;  // This value means a scale down.
 
   base::TimeTicks start = base::TimeTicks::HighResNow();
   for (int i = 0; i < kPerfTestIterations; ++i) {
     for (int row = 0; row < kSourceHeight; ++row) {
       int chroma_row = row / 2;
       ScaleYUVToRGB32Row_MMX(
           yuv_bytes_.get() + row * kSourceWidth,
           yuv_bytes_.get() + kSourceUOffset + (chroma_row * kSourceWidth / 2),
           yuv_bytes_.get() + kSourceVOffset + (chroma_row * kSourceWidth / 2),
           rgb_bytes_converted_.get(),
           kWidth,
-          kSourceDx,
-          kCoefficientsRgbY);
+          kSourceDx);
     }
   }
   double total_time_seconds =
       (base::TimeTicks::HighResNow() - start).InSecondsF();
   perf_test::PrintResult(
       "yuv_convert_perftest", "", "ScaleYUVToRGB32Row_MMX",
       kPerfTestIterations / total_time_seconds, "runs/s", true);
   media::EmptyRegisterState();
 }
 
 TEST_F(YUVConvertPerfTest, ScaleYUVToRGB32Row_SSE) {
   ASSERT_TRUE(base::CPU().has_sse());
 
   const int kSourceDx = 80000;  // This value means a scale down.
 
   base::TimeTicks start = base::TimeTicks::HighResNow();
   for (int i = 0; i < kPerfTestIterations; ++i) {
     for (int row = 0; row < kSourceHeight; ++row) {
       int chroma_row = row / 2;
       ScaleYUVToRGB32Row_SSE(
           yuv_bytes_.get() + row * kSourceWidth,
           yuv_bytes_.get() + kSourceUOffset + (chroma_row * kSourceWidth / 2),
           yuv_bytes_.get() + kSourceVOffset + (chroma_row * kSourceWidth / 2),
           rgb_bytes_converted_.get(),
           kWidth,
-          kSourceDx,
-          kCoefficientsRgbY);
+          kSourceDx);
     }
   }
   double total_time_seconds =
       (base::TimeTicks::HighResNow() - start).InSecondsF();
   perf_test::PrintResult(
       "yuv_convert_perftest", "", "ScaleYUVToRGB32Row_SSE",
       kPerfTestIterations / total_time_seconds, "runs/s", true);
   media::EmptyRegisterState();
 }
 
 TEST_F(YUVConvertPerfTest, LinearScaleYUVToRGB32Row_MMX) {
   ASSERT_TRUE(base::CPU().has_mmx());
 
   const int kSourceDx = 80000;  // This value means a scale down.
 
   base::TimeTicks start = base::TimeTicks::HighResNow();
   for (int i = 0; i < kPerfTestIterations; ++i) {
     for (int row = 0; row < kSourceHeight; ++row) {
       int chroma_row = row / 2;
       LinearScaleYUVToRGB32Row_MMX(
           yuv_bytes_.get() + row * kSourceWidth,
           yuv_bytes_.get() + kSourceUOffset + (chroma_row * kSourceWidth / 2),
           yuv_bytes_.get() + kSourceVOffset + (chroma_row * kSourceWidth / 2),
           rgb_bytes_converted_.get(),
           kWidth,
-          kSourceDx,
-          kCoefficientsRgbY);
+          kSourceDx);
     }
   }
   double total_time_seconds =
       (base::TimeTicks::HighResNow() - start).InSecondsF();
   perf_test::PrintResult(
       "yuv_convert_perftest", "", "LinearScaleYUVToRGB32Row_MMX",
       kPerfTestIterations / total_time_seconds, "runs/s", true);
   media::EmptyRegisterState();
 }
 
 TEST_F(YUVConvertPerfTest, LinearScaleYUVToRGB32Row_SSE) {
   ASSERT_TRUE(base::CPU().has_sse());
 
   const int kSourceDx = 80000;  // This value means a scale down.
 
   base::TimeTicks start = base::TimeTicks::HighResNow();
   for (int i = 0; i < kPerfTestIterations; ++i) {
     for (int row = 0; row < kSourceHeight; ++row) {
       int chroma_row = row / 2;
       LinearScaleYUVToRGB32Row_SSE(
           yuv_bytes_.get() + row * kSourceWidth,
           yuv_bytes_.get() + kSourceUOffset + (chroma_row * kSourceWidth / 2),
           yuv_bytes_.get() + kSourceVOffset + (chroma_row * kSourceWidth / 2),
           rgb_bytes_converted_.get(),
           kWidth,
-          kSourceDx,
-          kCoefficientsRgbY);
+          kSourceDx);
     }
   }
   double total_time_seconds =
       (base::TimeTicks::HighResNow() - start).InSecondsF();
   perf_test::PrintResult(
       "yuv_convert_perftest", "", "LinearScaleYUVToRGB32Row_SSE",
       kPerfTestIterations / total_time_seconds, "runs/s", true);
   media::EmptyRegisterState();
 }
 
 #endif  // !defined(ARCH_CPU_ARM_FAMILY) && !defined(ARCH_CPU_MIPS_FAMILY)
 
 }  // namespace media