libvpx: Pull from upstream

source/libvpx/vp9/encoder/x86/vp9_quantize_sse2.c

 /*
  *  Copyright (c) 2014 The WebM 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.
  */
 
 #include <emmintrin.h>
 #include <xmmintrin.h>
 
 #include "vpx/vpx_integer.h"
 
 void vp9_quantize_b_sse2(const int16_t* coeff_ptr, intptr_t n_coeffs,
                          int skip_block, const int16_t* zbin_ptr,
                          const int16_t* round_ptr, const int16_t* quant_ptr,
                          const int16_t* quant_shift_ptr, int16_t* qcoeff_ptr,
                          int16_t* dqcoeff_ptr, const int16_t* dequant_ptr,
-                         int zbin_oq_value, uint16_t* eob_ptr,
+                         uint16_t* eob_ptr,
                          const int16_t* scan_ptr,
                          const int16_t* iscan_ptr) {
   __m128i zero;
   (void)scan_ptr;
 
   coeff_ptr += n_coeffs;
   iscan_ptr += n_coeffs;
   qcoeff_ptr += n_coeffs;
   dqcoeff_ptr += n_coeffs;
   n_coeffs = -n_coeffs;
   zero = _mm_setzero_si128();
   if (!skip_block) {
     __m128i eob;
     __m128i zbin;
     __m128i round, quant, dequant, shift;
     {
       __m128i coeff0, coeff1;
 
       // Setup global values
       {
-        __m128i zbin_oq;
         __m128i pw_1;
-        zbin_oq = _mm_set1_epi16(zbin_oq_value);
         zbin = _mm_load_si128((const __m128i*)zbin_ptr);
         round = _mm_load_si128((const __m128i*)round_ptr);
         quant = _mm_load_si128((const __m128i*)quant_ptr);
-        zbin = _mm_add_epi16(zbin, zbin_oq);
         pw_1 = _mm_set1_epi16(1);
         zbin = _mm_sub_epi16(zbin, pw_1);
         dequant = _mm_load_si128((const __m128i*)dequant_ptr);
         shift = _mm_load_si128((const __m128i*)quant_shift_ptr);
       }
 
       {
         __m128i coeff0_sign, coeff1_sign;
         __m128i qcoeff0, qcoeff1;
         __m128i qtmp0, qtmp1;
@@ skipping 163 matching lines @@
     } while (n_coeffs < 0);
     *eob_ptr = 0;
   }
 }
 
 void vp9_quantize_fp_sse2(const int16_t* coeff_ptr, intptr_t n_coeffs,
                           int skip_block, const int16_t* zbin_ptr,
                           const int16_t* round_ptr, const int16_t* quant_ptr,
                           const int16_t* quant_shift_ptr, int16_t* qcoeff_ptr,
                           int16_t* dqcoeff_ptr, const int16_t* dequant_ptr,
-                          int zbin_oq_value, uint16_t* eob_ptr,
+                          uint16_t* eob_ptr,
                           const int16_t* scan_ptr,
                           const int16_t* iscan_ptr) {
   __m128i zero;
   (void)scan_ptr;
   (void)zbin_ptr;
   (void)quant_shift_ptr;
-  (void)zbin_oq_value;
 
   coeff_ptr += n_coeffs;
   iscan_ptr += n_coeffs;
   qcoeff_ptr += n_coeffs;
   dqcoeff_ptr += n_coeffs;
   n_coeffs = -n_coeffs;
   zero = _mm_setzero_si128();
 
   if (!skip_block) {
     __m128i eob;
@@ skipping 148 matching lines @@
     do {
       _mm_store_si128((__m128i*)(dqcoeff_ptr + n_coeffs), zero);
       _mm_store_si128((__m128i*)(dqcoeff_ptr + n_coeffs) + 1, zero);
       _mm_store_si128((__m128i*)(qcoeff_ptr + n_coeffs), zero);
       _mm_store_si128((__m128i*)(qcoeff_ptr + n_coeffs) + 1, zero);
       n_coeffs += 8 * 2;
     } while (n_coeffs < 0);
     *eob_ptr = 0;
   }
 }