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

media/base/simd/linear_scale_yuv_to_rgb_mmx.inc

 ; Copyright (c) 2011 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 "media/base/simd/media_export.asm"
 
   EXPORT    SYMBOL
   align     function_align
 
 mangle(SYMBOL):
   %assign   stack_offset 0
 
+  extern    mangle(kCoefficientsRgbY)
+
 ; Parameters are in the following order:
 ; 1. Y plane
 ; 2. U plane
 ; 3. V plane
 ; 4. ARGB frame
 ; 5. Width
 ; 6. Source dx
-; 7. Conversion lookup table
 
-PROLOGUE  7, 7, 3, Y, R0, R1, ARGB, R2, TEMP, R3
+PROLOGUE  6, 7, 3, Y, R0, R1, ARGB, R2, R3, TEMP
 
 %if gprsize == 8
 %define     WORD_SIZE   QWORD
 %else
 %define     WORD_SIZE   DWORD
 %endif
 
 ; Define register aliases.
 %define     Xq                  R1q     ; Current X position
 %define     COMPLq              R2q     ; Component A value
 %define     COMPLd              R2d     ; Component A value
 %define     U_ARG_REGq          R0q     ; U plane address argument
 %define     V_ARG_REGq          R1q     ; V plane address argument
-%define     SOURCE_DX_ARG_REGq  TEMPq   ; Source dx argument
+%define     SOURCE_DX_ARG_REGq  R3q     ; Source dx argument
 %define     WIDTH_ARG_REGq      R2q     ; Width argument
 
 %define     COMPRq              R0q     ; Component B value
 %define     COMPRd              R0d     ; Component B value
 %define     Uq                  R0q     ; U plane address
 %define     Vq                  R0q     ; V plane address
 %define     U_PLANE             WORD_SIZE [rsp + 3 * gprsize]
 %define     TABLE               R3q     ; Address of the table
 
 ; Defines for stack variables.
 %define     V_PLANE             WORD_SIZE [rsp + 2 * gprsize]
 %define     SOURCE_DX           WORD_SIZE [rsp + gprsize]
 %define     SOURCE_WIDTH        WORD_SIZE [rsp]
 
 ; Define stack usage.
   PUSH      U_ARG_REGq
   PUSH      V_ARG_REGq
   PUSH      SOURCE_DX_ARG_REGq
   imul      WIDTH_ARG_REGq, SOURCE_DX_ARG_REGq  ; source_width = width * source_dx
   PUSH      WIDTH_ARG_REGq
 
+; Load the address of kCoefficientsRgbY into TABLE
+  mov       TEMPq, SOURCE_DX_ARG_REGq    ; Need to save source_dx first
+  LOAD_SYM  TABLE, mangle(kCoefficientsRgbY)
+%define     SOURCE_DX_ARG_REGq  TEMPq   ; Overwrite SOURCE_DX_ARG_REGq to TEMPq
+
 %macro EPILOGUE 0
   ADD       rsp, 4 * gprsize
 %endmacro
 
   xor       Xq, Xq                       ; x = 0
   cmp       SOURCE_DX_ARG_REGq, 0x20000
   jl        .lscaleend
   mov       Xq, 0x8000                   ; x = 0.5 for 1/2 or less
   jmp       .lscaleend
 
@@ skipping 58 matching lines @@
   EPILOGUE
   RET
 
 .lscalelastpixel:
   paddsw    mm1, mm0
   psraw     mm1, 6
   packuswb  mm1, mm1
   movd      [ARGBq], mm1
   EPILOGUE
   RET