[x265] [PATCH 5 of 5] primitives: rename blockfil_s to blockfill_s_c
Steve Borho
steve at borho.org
Mon Oct 7 05:45:38 CEST 2013
# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1381117492 18000
# Sun Oct 06 22:44:52 2013 -0500
# Node ID e5b11164d5b27d179e45c498aeb255c1a422a456
# Parent 0d14c4378aae918d52d63c3044c76d5b4e82cfcd
primitives: rename blockfil_s to blockfill_s_c
diff -r 0d14c4378aae -r e5b11164d5b2 source/Lib/TLibCommon/TComTrQuant.cpp
--- a/source/Lib/TLibCommon/TComTrQuant.cpp Sun Oct 06 22:41:32 2013 -0500
+++ b/source/Lib/TLibCommon/TComTrQuant.cpp Sun Oct 06 22:44:52 2013 -0500
@@ -484,7 +484,7 @@
if (lastPos == 0 && !((width == 4) && (mode != REG_DCT)))
{
int dc_val = (((m_tmpCoeff[0] * 64 + 64) >> 7) * 64 + 2048) >> 12;
- primitives.blockfil_s[log2BlockSize](residual, stride, dc_val);
+ primitives.blockfill_s[log2BlockSize](residual, stride, dc_val);
return;
}
diff -r 0d14c4378aae -r e5b11164d5b2 source/Lib/TLibEncoder/TEncSearch.cpp
--- a/source/Lib/TLibEncoder/TEncSearch.cpp Sun Oct 06 22:41:32 2013 -0500
+++ b/source/Lib/TLibEncoder/TEncSearch.cpp Sun Oct 06 22:44:52 2013 -0500
@@ -517,7 +517,7 @@
{
short* resiTmp = residual;
memset(coeff, 0, sizeof(TCoeff) * width * height);
- primitives.blockfil_s[size](resiTmp, stride, 0);
+ primitives.blockfill_s[size](resiTmp, stride, 0);
}
//===== reconstruction =====
@@ -650,7 +650,7 @@
{
short* resiTmp = residual;
memset(coeff, 0, sizeof(TCoeff) * width * height);
- primitives.blockfil_s[size](resiTmp, stride, 0);
+ primitives.blockfill_s[size](resiTmp, stride, 0);
}
}
@@ -3217,7 +3217,7 @@
const UInt stride = m_qtTempTComYuv[qtlayer].m_width;
assert(trWidth == trHeight);
- primitives.blockfil_s[(int)g_convertToBit[trWidth]](ptr, stride, 0);
+ primitives.blockfill_s[(int)g_convertToBit[trWidth]](ptr, stride, 0);
}
UInt distU = 0;
@@ -3291,7 +3291,7 @@
const UInt stride = m_qtTempTComYuv[qtlayer].m_cwidth;
assert(trWidthC == trHeightC);
- primitives.blockfil_s[(int)g_convertToBit[trWidthC]](ptr, stride, 0);
+ primitives.blockfill_s[(int)g_convertToBit[trWidthC]](ptr, stride, 0);
}
distV = m_rdCost->scaleChromaDistCr(primitives.sse_sp[partSizeC](resiYuv->getCrAddr(absTUPartIdxC), resiYuv->m_cwidth, m_tempPel, trWidthC));
@@ -3357,7 +3357,7 @@
const UInt stride = m_qtTempTComYuv[qtlayer].m_cwidth;
assert(trWidthC == trHeightC);
- primitives.blockfil_s[(int)g_convertToBit[trWidthC]](ptr, stride, 0);
+ primitives.blockfill_s[(int)g_convertToBit[trWidthC]](ptr, stride, 0);
}
}
cu->setCbfSubParts(absSumY ? setCbf : 0, TEXT_LUMA, absPartIdx, depth);
diff -r 0d14c4378aae -r e5b11164d5b2 source/common/pixel.cpp
--- a/source/common/pixel.cpp Sun Oct 06 22:41:32 2013 -0500
+++ b/source/common/pixel.cpp Sun Oct 06 22:44:52 2013 -0500
@@ -754,11 +754,11 @@
p.blockcpy_sp = blockcopy_s_p;
p.blockcpy_sc = blockcopy_s_c;
- p.blockfil_s[BLOCK_4x4] = blockfil_s_c<4>;
- p.blockfil_s[BLOCK_8x8] = blockfil_s_c<8>;
- p.blockfil_s[BLOCK_16x16] = blockfil_s_c<16>;
- p.blockfil_s[BLOCK_32x32] = blockfil_s_c<32>;
- p.blockfil_s[BLOCK_64x64] = blockfil_s_c<64>;
+ p.blockfill_s[BLOCK_4x4] = blockfil_s_c<4>;
+ p.blockfill_s[BLOCK_8x8] = blockfil_s_c<8>;
+ p.blockfill_s[BLOCK_16x16] = blockfil_s_c<16>;
+ p.blockfill_s[BLOCK_32x32] = blockfil_s_c<32>;
+ p.blockfill_s[BLOCK_64x64] = blockfil_s_c<64>;
p.cvt16to32 = convert16to32;
p.cvt16to32_shl = convert16to32_shl;
diff -r 0d14c4378aae -r e5b11164d5b2 source/common/primitives.h
--- a/source/common/primitives.h Sun Oct 06 22:41:32 2013 -0500
+++ b/source/common/primitives.h Sun Oct 06 22:44:52 2013 -0500
@@ -172,7 +172,7 @@
typedef void (*pixeladd_ss_t)(int bx, int by, short *dst, intptr_t dstride, short *src0, short *src1, intptr_t sstride0, intptr_t sstride1);
typedef void (*pixeladd_pp_t)(int bx, int by, pixel *dst, intptr_t dstride, pixel *src0, pixel *src1, intptr_t sstride0, intptr_t sstride1);
typedef void (*pixelavg_pp_t)(pixel *dst, intptr_t dstride, pixel *src0, intptr_t sstride0, pixel *src1, intptr_t sstride1, int weight);
-typedef void (*blockfil_s_t)(short *dst, intptr_t dstride, short val);
+typedef void (*blockfill_s_t)(short *dst, intptr_t dstride, short val);
typedef void (*intra_dc_t)(pixel* above, pixel* left, pixel* dst, intptr_t dstStride, int width, int bFilter);
typedef void (*intra_planar_t)(pixel* above, pixel* left, pixel* dst, intptr_t dstStride, int width);
@@ -220,7 +220,7 @@
blockcpy_ps_t blockcpy_ps; // block copy pixel from short
blockcpy_sp_t blockcpy_sp; // block copy short from pixel
blockcpy_sc_t blockcpy_sc; // block copy short from unsigned char
- blockfil_s_t blockfil_s[NUM_SQUARE_BLOCKS]; // block fill with value
+ blockfill_s_t blockfill_s[NUM_SQUARE_BLOCKS]; // block fill with value
cvt16to32_t cvt16to32;
cvt16to32_shl_t cvt16to32_shl;
cvt16to16_shl_t cvt16to16_shl;
diff -r 0d14c4378aae -r e5b11164d5b2 source/common/vec/pixel-sse3.cpp
--- a/source/common/vec/pixel-sse3.cpp Sun Oct 06 22:41:32 2013 -0500
+++ b/source/common/vec/pixel-sse3.cpp Sun Oct 06 22:44:52 2013 -0500
@@ -324,10 +324,10 @@
p.transpose[1] = transpose8;
p.transpose[2] = transpose16;
p.transpose[3] = transpose32;
- p.blockfil_s[BLOCK_4x4] = blockfil_s_4;
- p.blockfil_s[BLOCK_8x8] = blockfil_s_8;
- p.blockfil_s[BLOCK_16x16] = blockfil_s_16;
- p.blockfil_s[BLOCK_32x32] = blockfil_s_32;
+ p.blockfill_s[BLOCK_4x4] = blockfil_s_4;
+ p.blockfill_s[BLOCK_8x8] = blockfil_s_8;
+ p.blockfill_s[BLOCK_16x16] = blockfil_s_16;
+ p.blockfill_s[BLOCK_32x32] = blockfil_s_32;
#endif /* if HIGH_BIT_DEPTH */
}
}
More information about the x265-devel
mailing list