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

media/base/simd/convert_yuv_to_rgb_x86.cc

Index: media/base/simd/convert_yuv_to_rgb_x86.cc
diff --git a/media/base/simd/convert_yuv_to_rgb_x86.cc b/media/base/simd/convert_yuv_to_rgb_x86.cc
index 969890dbbefd386e0754d19c24e00000b52d44f0..d1d6e16beb7901c097431fe118f8036bb6ed1c46 100644
--- a/media/base/simd/convert_yuv_to_rgb_x86.cc
+++ b/media/base/simd/convert_yuv_to_rgb_x86.cc
@@ -9,7 +9,6 @@
 #endif
 
 #include "media/base/simd/convert_yuv_to_rgb.h"
-#include "media/base/simd/yuv_to_rgb_table.h"
 #include "media/base/yuv_convert.h"
 
 namespace media {
@@ -24,7 +23,7 @@
                            int uvstride,
                            int rgbstride,
                            YUVType yuv_type) {
-  unsigned int y_shift = GetVerticalShift(yuv_type);
+  unsigned int y_shift = yuv_type;
   for (int y = 0; y < height; ++y) {
     uint8* rgb_row = rgbframe + y * rgbstride;
     const uint8* y_ptr = yplane + y * ystride;
@@ -35,8 +34,7 @@
                              u_ptr,
                              v_ptr,
                              rgb_row,
-                             width,
-                             GetLookupTable(yuv_type));
+                             width);
   }
 
   EmptyRegisterState();
@@ -54,7 +52,7 @@
                            int astride,
                            int rgbstride,
                            YUVType yuv_type) {
-  unsigned int y_shift = GetVerticalShift(yuv_type);
+  unsigned int y_shift = yuv_type;
   for (int y = 0; y < height; ++y) {
     uint8* rgb_row = rgbframe + y * rgbstride;
     const uint8* y_ptr = yplane + y * ystride;
@@ -67,8 +65,7 @@
                              v_ptr,
                              a_ptr,
                              rgb_row,
-                             width,
-                             GetLookupTable(yuv_type));
+                             width);
   }
 
   EmptyRegisterState();
@@ -84,7 +81,7 @@
                            int uvstride,
                            int rgbstride,
                            YUVType yuv_type) {
-  unsigned int y_shift = GetVerticalShift(yuv_type);
+  unsigned int y_shift = yuv_type;
   for (int y = 0; y < height; ++y) {
     uint8* rgb_row = rgbframe + y * rgbstride;
     const uint8* y_ptr = yplane + y * ystride;
@@ -95,8 +92,7 @@
                              u_ptr,
                              v_ptr,
                              rgb_row,
-                             width,
-                             GetLookupTable(yuv_type));
+                             width);
   }
 
   EmptyRegisterState();