Skip to content

L
libyuv
Commit 2b92ec8d authored by Frank Barchard's avatar Frank Barchard
Browse files
Options

Fix git markers introduced on landing previous CL 

BUG=none

Review URL: https://codereview.chromium.org/1359023003 .
parent 5f3d4270
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 59 deletions
README.chromium
View file @ 2b92ec8d
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 1488
Version: 1489
License: BSD
License File: LICENSE
......
include/libyuv/version.h
View file @ 2b92ec8d
......@@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1488
#define LIBYUV_VERSION 1489
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT
source/row_gcc.cc
View file @ 2b92ec8d
......@@ -1326,10 +1326,7 @@ void RGBAToUVRow_SSSE3(const uint8* src_rgba0, int src_stride_rgba,
"lea " MEMLEA(0x8, [u_buf]) ",%[u_buf] \n" \
"punpcklbw %%xmm1,%%xmm0 \n" \
"movq " MEMACCESS([y_buf]) ",%%xmm4 \n" \
<<<<<<< HEAD
"punpcklbw %%xmm4,%%xmm4 \n" \
=======
>>>>>>> refs/remotes/origin/master
"lea " MEMLEA(0x8, [y_buf]) ",%[y_buf] \n"
// Read 4 UV from 422, upsample to 8 UV
......@@ -1340,10 +1337,7 @@ void RGBAToUVRow_SSSE3(const uint8* src_rgba0, int src_stride_rgba,
"punpcklbw %%xmm1,%%xmm0 \n" \
"punpcklwd %%xmm0,%%xmm0 \n" \
"movq " MEMACCESS([y_buf]) ",%%xmm4 \n" \
<<<<<<< HEAD
"punpcklbw %%xmm4,%%xmm4 \n" \
=======
>>>>>>> refs/remotes/origin/master
"lea " MEMLEA(0x8, [y_buf]) ",%[y_buf] \n"
// Read 2 UV from 411, upsample to 8 UV
......@@ -1355,10 +1349,7 @@ void RGBAToUVRow_SSSE3(const uint8* src_rgba0, int src_stride_rgba,
"punpcklwd %%xmm0,%%xmm0 \n" \
"punpckldq %%xmm0,%%xmm0 \n" \
"movq " MEMACCESS([y_buf]) ",%%xmm4 \n" \
<<<<<<< HEAD
"punpcklbw %%xmm4,%%xmm4 \n" \
=======
>>>>>>> refs/remotes/origin/master
"lea " MEMLEA(0x8, [y_buf]) ",%[y_buf] \n"
// Read 4 UV from NV12, upsample to 8 UV
......@@ -1367,7 +1358,6 @@ void RGBAToUVRow_SSSE3(const uint8* src_rgba0, int src_stride_rgba,
"lea " MEMLEA(0x8, [uv_buf]) ",%[uv_buf] \n" \
"punpcklwd %%xmm0,%%xmm0 \n" \
"movq " MEMACCESS([y_buf]) ",%%xmm4 \n" \
<<<<<<< HEAD
"punpcklbw %%xmm4,%%xmm4 \n" \
"lea " MEMLEA(0x8, [y_buf]) ",%[y_buf] \n"
......@@ -1406,9 +1396,6 @@ static const vec8 kShuffleUYVYUV = {
"movdqu " MEMACCESS([uyvy_buf]) ",%%xmm0 \n" \
"pshufb %[kShuffleUYVYUV], %%xmm0 \n" \
"lea " MEMLEA(0x10, [uyvy_buf]) ",%[uyvy_buf] \n"
=======
"lea " MEMLEA(0x8, [y_buf]) ",%[y_buf] \n"
>>>>>>> refs/remotes/origin/master
// Convert 8 pixels: 8 UV and 8 Y
#define YUVTORGB(yuvconstants) \
......@@ -1424,10 +1411,6 @@ static const vec8 kShuffleUYVYUV = {
"movdqa " MEMACCESS2(160, [yuvconstants]) ",%%xmm2 \n" \
"pmaddubsw " MEMACCESS2(64, [yuvconstants]) ",%%xmm3 \n" \
"psubw %%xmm3,%%xmm2 \n" \
<<<<<<< HEAD
=======
"punpcklbw %%xmm4,%%xmm4 \n" \
>>>>>>> refs/remotes/origin/master
"pmulhuw " MEMACCESS2(192, [yuvconstants]) ",%%xmm4 \n" \
"paddsw %%xmm4,%%xmm0 \n" \
"paddsw %%xmm4,%%xmm1 \n" \
......
source/row_win.cc
View file @ 2b92ec8d
......@@ -36,10 +36,7 @@ extern "C" {
xmm0 = _mm_unpacklo_epi16(xmm0, xmm0); \
u_buf += 4; \
xmm4 = _mm_loadl_epi64((__m128i*)y_buf); \
<<<<<<< HEAD
xmm4 = _mm_unpacklo_epi8(xmm4, xmm4); \
=======
>>>>>>> refs/remotes/origin/master
y_buf += 8; \
// Convert 8 pixels: 8 UV and 8 Y.
......@@ -52,10 +49,6 @@ extern "C" {
xmm0 = _mm_sub_epi16(*(__m128i*)YuvConstants->kUVBiasB, xmm0); \
xmm1 = _mm_sub_epi16(*(__m128i*)YuvConstants->kUVBiasG, xmm1); \
xmm2 = _mm_sub_epi16(*(__m128i*)YuvConstants->kUVBiasR, xmm2); \
<<<<<<< HEAD
=======
xmm4 = _mm_unpacklo_epi8(xmm4, xmm4); \
>>>>>>> refs/remotes/origin/master
xmm4 = _mm_mulhi_epu16(xmm4, *(__m128i*)YuvConstants->kYToRgb); \
xmm0 = _mm_adds_epi16(xmm0, xmm4); \
xmm1 = _mm_adds_epi16(xmm1, xmm4); \
......@@ -1860,11 +1853,8 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb,
__asm vpermq ymm1, ymm1, 0xd8 \
__asm vpunpcklbw ymm0, ymm0, ymm1 /* UV */ \
__asm vmovdqu xmm4, [eax] /* Y */ \
<<<<<<< HEAD
__asm vpermq ymm4, ymm4, 0xd8 \
__asm vpunpcklbw ymm4, ymm4, ymm4 \
=======
>>>>>>> refs/remotes/origin/master
__asm lea eax, [eax + 16] \
}
......@@ -1877,11 +1867,8 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb,
__asm vpermq ymm0, ymm0, 0xd8 \
__asm vpunpcklwd ymm0, ymm0, ymm0 /* UVUV (upsample) */ \
__asm vmovdqu xmm4, [eax] /* Y */ \
<<<<<<< HEAD
__asm vpermq ymm4, ymm4, 0xd8 \
__asm vpunpcklbw ymm4, ymm4, ymm4 \
=======
>>>>>>> refs/remotes/origin/master
__asm lea eax, [eax + 16] \
}
......@@ -1895,11 +1882,8 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb,
__asm vpermq ymm0, ymm0, 0xd8 \
__asm vpunpckldq ymm0, ymm0, ymm0 /* UVUVUVUV (upsample) */ \
__asm vmovdqu xmm4, [eax] /* Y */ \
<<<<<<< HEAD
__asm vpermq ymm4, ymm4, 0xd8 \
__asm vpunpcklbw ymm4, ymm4, ymm4 \
=======
>>>>>>> refs/remotes/origin/master
__asm lea eax, [eax + 16] \
}
......@@ -1910,11 +1894,8 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb,
__asm vpermq ymm0, ymm0, 0xd8 \
__asm vpunpcklwd ymm0, ymm0, ymm0 /* UVUV (upsample) */ \
__asm vmovdqu xmm4, [eax] /* Y */ \
<<<<<<< HEAD
__asm vpermq ymm4, ymm4, 0xd8 \
__asm vpunpcklbw ymm4, ymm4, ymm4 \
=======
>>>>>>> refs/remotes/origin/master
__asm lea eax, [eax + 16] \
}
......@@ -1930,11 +1911,6 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb,
__asm vmovdqu ymm3, ymmword ptr [YuvConstants + KUVBIASB] \
__asm vpsubw ymm0, ymm3, ymm0 \
/* Step 2: Find Y contribution to 16 R,G,B values */ \
<<<<<<< HEAD
=======
__asm vpermq ymm4, ymm4, 0xd8 \
__asm vpunpcklbw ymm4, ymm4, ymm4 \
>>>>>>> refs/remotes/origin/master
__asm vpmulhuw ymm4, ymm4, ymmword ptr [YuvConstants + KYTORGB] \
__asm vpaddsw ymm0, ymm0, ymm4 /* B += Y */ \
__asm vpaddsw ymm1, ymm1, ymm4 /* G += Y */ \
......@@ -2323,10 +2299,7 @@ void I422ToABGRRow_AVX2(const uint8* y_buf,
__asm lea esi, [esi + 8] \
__asm punpcklbw xmm0, xmm1 /* UV */ \
__asm movq xmm4, qword ptr [eax] \
<<<<<<< HEAD
__asm punpcklbw xmm4, xmm4 \
=======
>>>>>>> refs/remotes/origin/master
__asm lea eax, [eax + 8] \
}
......@@ -2338,10 +2311,7 @@ void I422ToABGRRow_AVX2(const uint8* y_buf,
__asm punpcklbw xmm0, xmm1 /* UV */ \
__asm punpcklwd xmm0, xmm0 /* UVUV (upsample) */ \
__asm movq xmm4, qword ptr [eax] \
<<<<<<< HEAD
__asm punpcklbw xmm4, xmm4 \
=======
>>>>>>> refs/remotes/origin/master
__asm lea eax, [eax + 8] \
}
......@@ -2354,10 +2324,7 @@ void I422ToABGRRow_AVX2(const uint8* y_buf,
__asm punpcklwd xmm0, xmm0 /* UVUV (upsample) */ \
__asm punpckldq xmm0, xmm0 /* UVUVUVUV (upsample) */ \
__asm movq xmm4, qword ptr [eax] \
<<<<<<< HEAD
__asm punpcklbw xmm4, xmm4 \
=======
>>>>>>> refs/remotes/origin/master
__asm lea eax, [eax + 8] \
}
......@@ -2367,7 +2334,6 @@ void I422ToABGRRow_AVX2(const uint8* y_buf,
__asm lea esi, [esi + 8] \
__asm punpcklwd xmm0, xmm0 /* UVUV (upsample) */ \
__asm movq xmm4, qword ptr [eax] \
<<<<<<< HEAD
__asm punpcklbw xmm4, xmm4 \
__asm lea eax, [eax + 8] \
}
......@@ -2408,9 +2374,7 @@ static const vec8 kShuffleUYVYUV = {
__asm movdqu xmm0, [eax] /* UV */ \
__asm pshufb xmm0, xmmword ptr kShuffleUYVYUV \
__asm lea eax, [eax + 16] \
=======
__asm lea eax, [eax + 8] \
>>>>>>> refs/remotes/origin/master
}
// Convert 8 pixels: 8 UV and 8 Y.
......@@ -2427,10 +2391,6 @@ static const vec8 kShuffleUYVYUV = {
__asm movdqa xmm2, xmmword ptr [YuvConstants + KUVBIASR] \
__asm pmaddubsw xmm3, xmmword ptr [YuvConstants + KUVTOR] \
__asm psubw xmm2, xmm3 \
<<<<<<< HEAD
=======
__asm punpcklbw xmm4, xmm4 \
>>>>>>> refs/remotes/origin/master
__asm pmulhuw xmm4, xmmword ptr [YuvConstants + KYTORGB] \
__asm paddsw xmm0, xmm4 /* B += Y */ \
__asm paddsw xmm1, xmm4 /* G += Y */ \
......
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