Commit d937cdbe authored by James Zern's avatar James Zern

x86: _mm_set_epi64x -> _mm_{set_epi32,cvtsi32_si128}

_mm_set_epi64x is incompatible with visual studio x86 configurations

Change-Id: I7986e43d0471699553affeefabae66a512d9d46a
parent cab708b7
......@@ -16,8 +16,8 @@ static void calc_block(__m128i sum, __m128i sum_sq, __m128i n,
if (bit_depth > 8) {
__m128i rounding_a = _mm_set1_epi32((1 << (2 * (bit_depth - 8))) >> 1);
__m128i rounding_b = _mm_set1_epi32((1 << (bit_depth - 8)) >> 1);
__m128i shift_a = _mm_set_epi64x(0, 2 * (bit_depth - 8));
__m128i shift_b = _mm_set_epi64x(0, bit_depth - 8);
__m128i shift_a = _mm_cvtsi32_si128(2 * (bit_depth - 8));
__m128i shift_b = _mm_cvtsi32_si128(bit_depth - 8);
a = _mm_srl_epi32(_mm_add_epi32(sum_sq, rounding_a), shift_a);
b = _mm_srl_epi32(_mm_add_epi32(sum, rounding_b), shift_b);
a = _mm_mullo_epi32(a, n);
......
......@@ -135,8 +135,8 @@ void av1_highbd_quantize_fp_sse4_1(
qparam[0] =
_mm_set_epi32(round_ptr[1] >> log_scale, round_ptr[1] >> log_scale,
round_ptr[1] >> log_scale, round_ptr[0] >> log_scale);
qparam[1] = _mm_set_epi64x(quant_ptr[1], quant_ptr[0]);
qparam[2] = _mm_set_epi64x(dequant_ptr[1], dequant_ptr[0]);
qparam[1] = _mm_set_epi32(0, quant_ptr[1], 0, quant_ptr[0]);
qparam[2] = _mm_set_epi32(0, dequant_ptr[1], 0, dequant_ptr[0]);
// DC and first 3 AC
quantize_coeff_phase1(&coeff[0], qparam, shift, log_scale, qcoeff, dequant,
......@@ -144,8 +144,8 @@ void av1_highbd_quantize_fp_sse4_1(
// update round/quan/dquan for AC
qparam[0] = _mm_unpackhi_epi64(qparam[0], qparam[0]);
qparam[1] = _mm_set_epi64x(quant_ptr[1], quant_ptr[1]);
qparam[2] = _mm_set_epi64x(dequant_ptr[1], dequant_ptr[1]);
qparam[1] = _mm_set_epi32(0, quant_ptr[1], 0, quant_ptr[1]);
qparam[2] = _mm_set_epi32(0, dequant_ptr[1], 0, dequant_ptr[1]);
quantize_coeff_phase2(qcoeff, dequant, &coeff_sign, qparam, shift,
log_scale, quanAddr, dquanAddr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment