Skip to content

L
libyuv
Commit 0bc626a5 authored by Frank Barchard's avatar Frank Barchard
Browse files
Options

nolint removed 

R=harryjin@google.com
BUG=none

Review URL: https://webrtc-codereview.appspot.com/59389004.
parent 0735245c
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 20 deletions
source/compare_gcc.cc
View file @ 0bc626a5
...@@ -24,7 +24,7 @@ extern "C" { ...@@ -24,7 +24,7 @@ extern "C" {
uint32 SumSquareError_SSE2(const uint8* src_a, const uint8* src_b, int count) { uint32 SumSquareError_SSE2(const uint8* src_a, const uint8* src_b, int count) {
uint32 sse; uint32 sse;
asm volatile ( // NOLINT asm volatile (
"pxor %%xmm0,%%xmm0 \n" "pxor %%xmm0,%%xmm0 \n"
"pxor %%xmm5,%%xmm5 \n" "pxor %%xmm5,%%xmm5 \n"
LABELALIGN LABELALIGN
...@@ -58,7 +58,7 @@ uint32 SumSquareError_SSE2(const uint8* src_a, const uint8* src_b, int count) { ...@@ -58,7 +58,7 @@ uint32 SumSquareError_SSE2(const uint8* src_a, const uint8* src_b, int count) {
"+r"(count), // %2 "+r"(count), // %2
"=g"(sse) // %3 "=g"(sse) // %3
:: "memory", "cc", "xmm0", "xmm1", "xmm2", "xmm3", "xmm5" :: "memory", "cc", "xmm0", "xmm1", "xmm2", "xmm3", "xmm5"
); // NOLINT );
return sse; return sse;
} }
...@@ -90,7 +90,7 @@ static uvec32 kHashMul3 = { ...@@ -90,7 +90,7 @@ static uvec32 kHashMul3 = {
uint32 HashDjb2_SSE41(const uint8* src, int count, uint32 seed) { uint32 HashDjb2_SSE41(const uint8* src, int count, uint32 seed) {
uint32 hash; uint32 hash;
asm volatile ( // NOLINT asm volatile (
"movd %2,%%xmm0 \n" "movd %2,%%xmm0 \n"
"pxor %%xmm7,%%xmm7 \n" "pxor %%xmm7,%%xmm7 \n"
"movdqa %4,%%xmm6 \n" "movdqa %4,%%xmm6 \n"
...@@ -139,7 +139,7 @@ uint32 HashDjb2_SSE41(const uint8* src, int count, uint32 seed) { ...@@ -139,7 +139,7 @@ uint32 HashDjb2_SSE41(const uint8* src, int count, uint32 seed) {
"m"(kHashMul3) // %8 "m"(kHashMul3) // %8
: "memory", "cc" : "memory", "cc"
, "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7" , "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7"
); // NOLINT );
return hash; return hash;
} }
#endif // defined(__x86_64__) || (defined(__i386__) && !defined(__pic__))) #endif // defined(__x86_64__) || (defined(__i386__) && !defined(__pic__)))
......
source/cpu_id.cc
View file @ 0bc626a5
...@@ -73,7 +73,7 @@ void CpuId(uint32 info_eax, uint32 info_ecx, uint32* cpu_info) { ...@@ -73,7 +73,7 @@ void CpuId(uint32 info_eax, uint32 info_ecx, uint32* cpu_info) {
// GCC version uses inline x86 assembly. // GCC version uses inline x86 assembly.
#else // (defined(_MSC_VER) && !defined(__clang__)) && !defined(__clang__) #else // (defined(_MSC_VER) && !defined(__clang__)) && !defined(__clang__)
uint32 info_ebx, info_edx; uint32 info_ebx, info_edx;
asm volatile ( // NOLINT asm volatile (
#if defined( __i386__) && defined(__PIC__) #if defined( __i386__) && defined(__PIC__)
// Preserve ebx for fpic 32 bit. // Preserve ebx for fpic 32 bit.
"mov %%ebx, %%edi \n" "mov %%ebx, %%edi \n"
......
source/mjpeg_decoder.cc
View file @ 0bc626a5
...@@ -59,8 +59,7 @@ const int MJpegDecoder::kColorSpaceYCCK = JCS_YCCK; ...@@ -59,8 +59,7 @@ const int MJpegDecoder::kColorSpaceYCCK = JCS_YCCK;
// Methods that are passed to jpeglib. // Methods that are passed to jpeglib.
boolean fill_input_buffer(jpeg_decompress_struct* cinfo); boolean fill_input_buffer(jpeg_decompress_struct* cinfo);
void init_source(jpeg_decompress_struct* cinfo); void init_source(jpeg_decompress_struct* cinfo);
void skip_input_data(jpeg_decompress_struct* cinfo, void skip_input_data(jpeg_decompress_struct* cinfo, long num_bytes); // NOLINT
long num_bytes); // NOLINT
void term_source(jpeg_decompress_struct* cinfo); void term_source(jpeg_decompress_struct* cinfo);
void ErrorHandler(jpeg_common_struct* cinfo); void ErrorHandler(jpeg_common_struct* cinfo);
...@@ -429,8 +428,7 @@ boolean fill_input_buffer(j_decompress_ptr cinfo) { ...@@ -429,8 +428,7 @@ boolean fill_input_buffer(j_decompress_ptr cinfo) {
return TRUE; return TRUE;
} }
void skip_input_data(j_decompress_ptr cinfo, void skip_input_data(j_decompress_ptr cinfo, long num_bytes) { // NOLINT
long num_bytes) { // NOLINT
cinfo->src->next_input_byte += num_bytes; cinfo->src->next_input_byte += num_bytes;
} }
......
source/row_win.cc
View file @ 0bc626a5
...@@ -1932,8 +1932,8 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb, ...@@ -1932,8 +1932,8 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb,
// Read 16 UV from 444 // Read 16 UV from 444
#define READYUV444_AVX2 __asm { \ #define READYUV444_AVX2 __asm { \
__asm vmovdqu xmm0, [esi] /* U */ /* NOLINT */ \ __asm vmovdqu xmm0, [esi] /* U */ \
__asm vmovdqu xmm1, [esi + edi] /* V */ /* NOLINT */ \ __asm vmovdqu xmm1, [esi + edi] /* V */ \
__asm lea esi, [esi + 16] \ __asm lea esi, [esi + 16] \
__asm vpermq ymm0, ymm0, 0xd8 \ __asm vpermq ymm0, ymm0, 0xd8 \
__asm vpermq ymm1, ymm1, 0xd8 \ __asm vpermq ymm1, ymm1, 0xd8 \
...@@ -1942,8 +1942,8 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb, ...@@ -1942,8 +1942,8 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb,
// Read 8 UV from 422, upsample to 16 UV. // Read 8 UV from 422, upsample to 16 UV.
#define READYUV422_AVX2 __asm { \ #define READYUV422_AVX2 __asm { \
__asm vmovq xmm0, qword ptr [esi] /* U */ /* NOLINT */ \ __asm vmovq xmm0, qword ptr [esi] /* U */ \
__asm vmovq xmm1, qword ptr [esi + edi] /* V */ /* NOLINT */ \ __asm vmovq xmm1, qword ptr [esi + edi] /* V */ \
__asm lea esi, [esi + 8] \ __asm lea esi, [esi + 8] \
__asm vpunpcklbw ymm0, ymm0, ymm1 /* UV */ \ __asm vpunpcklbw ymm0, ymm0, ymm1 /* UV */ \
__asm vpermq ymm0, ymm0, 0xd8 \ __asm vpermq ymm0, ymm0, 0xd8 \
...@@ -1952,8 +1952,8 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb, ...@@ -1952,8 +1952,8 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb,
// Read 4 UV from 411, upsample to 16 UV. // Read 4 UV from 411, upsample to 16 UV.
#define READYUV411_AVX2 __asm { \ #define READYUV411_AVX2 __asm { \
__asm vmovd xmm0, dword ptr [esi] /* U */ /* NOLINT */ \ __asm vmovd xmm0, dword ptr [esi] /* U */ \
__asm vmovd xmm1, dword ptr [esi + edi] /* V */ /* NOLINT */ \ __asm vmovd xmm1, dword ptr [esi + edi] /* V */ \
__asm lea esi, [esi + 4] \ __asm lea esi, [esi + 4] \
__asm vpunpcklbw ymm0, ymm0, ymm1 /* UV */ \ __asm vpunpcklbw ymm0, ymm0, ymm1 /* UV */ \
__asm vpunpcklwd ymm0, ymm0, ymm0 /* UVUV (upsample) */ \ __asm vpunpcklwd ymm0, ymm0, ymm0 /* UVUV (upsample) */ \
...@@ -1982,7 +1982,7 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb, ...@@ -1982,7 +1982,7 @@ void RGBAToUVRow_SSSE3(const uint8* src_argb0, int src_stride_argb,
__asm vmovdqu ymm3, ymmword ptr [YuvConstants + KUVBIASB] \ __asm vmovdqu ymm3, ymmword ptr [YuvConstants + KUVBIASB] \
__asm vpsubw ymm0, ymm3, ymm0 \ __asm vpsubw ymm0, ymm3, ymm0 \
/* Step 2: Find Y contribution to 16 R,G,B values */ \ /* Step 2: Find Y contribution to 16 R,G,B values */ \
__asm vmovdqu xmm3, [eax] /* NOLINT */ \ __asm vmovdqu xmm3, [eax] \
__asm lea eax, [eax + 16] \ __asm lea eax, [eax + 16] \
__asm vpermq ymm3, ymm3, 0xd8 \ __asm vpermq ymm3, ymm3, 0xd8 \
__asm vpunpcklbw ymm3, ymm3, ymm3 \ __asm vpunpcklbw ymm3, ymm3, ymm3 \
...@@ -2361,8 +2361,8 @@ void I422ToABGRRow_AVX2(const uint8* y_buf, ...@@ -2361,8 +2361,8 @@ void I422ToABGRRow_AVX2(const uint8* y_buf,
// Read 8 UV from 444. // Read 8 UV from 444.
#define READYUV444 __asm { \ #define READYUV444 __asm { \
__asm movq xmm0, qword ptr [esi] /* U */ /* NOLINT */ \ __asm movq xmm0, qword ptr [esi] /* U */ \
__asm movq xmm1, qword ptr [esi + edi] /* V */ /* NOLINT */ \ __asm movq xmm1, qword ptr [esi + edi] /* V */ \
__asm lea esi, [esi + 8] \ __asm lea esi, [esi + 8] \
__asm punpcklbw xmm0, xmm1 /* UV */ \ __asm punpcklbw xmm0, xmm1 /* UV */ \
} }
...@@ -2388,7 +2388,7 @@ void I422ToABGRRow_AVX2(const uint8* y_buf, ...@@ -2388,7 +2388,7 @@ void I422ToABGRRow_AVX2(const uint8* y_buf,
// Read 4 UV from NV12, upsample to 8 UV. // Read 4 UV from NV12, upsample to 8 UV.
#define READNV12 __asm { \ #define READNV12 __asm { \
__asm movq xmm0, qword ptr [esi] /* UV */ /* NOLINT */ \ __asm movq xmm0, qword ptr [esi] /* UV */ \
__asm lea esi, [esi + 8] \ __asm lea esi, [esi + 8] \
__asm punpcklwd xmm0, xmm0 /* UVUV (upsample) */ \ __asm punpcklwd xmm0, xmm0 /* UVUV (upsample) */ \
} }
...@@ -2409,7 +2409,7 @@ void I422ToABGRRow_AVX2(const uint8* y_buf, ...@@ -2409,7 +2409,7 @@ void I422ToABGRRow_AVX2(const uint8* y_buf,
__asm pmaddubsw xmm3, xmmword ptr [YuvConstants + KUVTOR] \ __asm pmaddubsw xmm3, xmmword ptr [YuvConstants + KUVTOR] \
__asm psubw xmm2, xmm3 \ __asm psubw xmm2, xmm3 \
/* Step 2: Find Y contribution to 8 R,G,B values */ \ /* Step 2: Find Y contribution to 8 R,G,B values */ \
__asm movq xmm3, qword ptr [eax] /* NOLINT */ \ __asm movq xmm3, qword ptr [eax] \
__asm lea eax, [eax + 8] \ __asm lea eax, [eax + 8] \
__asm punpcklbw xmm3, xmm3 \ __asm punpcklbw xmm3, xmm3 \
__asm pmulhuw xmm3, xmmword ptr [YuvConstants + KYTORGB] \ __asm pmulhuw xmm3, xmmword ptr [YuvConstants + KYTORGB] \
......
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