Change pfSampleAveraging to be a single function with internal width handling

This makes it match the behaviour of pMcLumaFunc and pMcChromaFunc.

Martin Storsjö committed 11 years ago

Commit 9a9fc4c1 parent 1127aa74 files · +52 −23Browse files

Showing the changes to test/encoder/EncUT_MotionCompensation.cpp (1 of 4 files). Show all

Unified · Split

@@ -40,8 +40,8 @@ TEST (EncMcAvg, PixelAvg) { · 39 unmodified lines
40	}	40	}
41	PixelAvgAnchor (uDstAnchor[0], MC_BUFF_DST_STRIDE, uSrc1[0], MC_BUFF_SRC_STRIDE, uSrc2[0], MC_BUFF_SRC_STRIDE, width,	41	PixelAvgAnchor (uDstAnchor[0], MC_BUFF_DST_STRIDE, uSrc1[0], MC_BUFF_SRC_STRIDE, uSrc2[0], MC_BUFF_SRC_STRIDE, width,
42	height);	42	height);
43	sMcFunc.pfSampleAveraging[w] (uDstTest[0], MC_BUFF_DST_STRIDE, uSrc1[0], MC_BUFF_SRC_STRIDE, uSrc2[0],	43	sMcFunc.pfSampleAveraging (uDstTest[0], MC_BUFF_DST_STRIDE, uSrc1[0], MC_BUFF_SRC_STRIDE, uSrc2[0],
44	MC_BUFF_SRC_STRIDE, height);	44	MC_BUFF_SRC_STRIDE, width, height);
45	for (int32_t j = 0; j < height; j++) {	45	for (int32_t j = 0; j < height; j++) {
46	for (int32_t i = 0; i < width; i++) {	46	for (int32_t i = 0; i < width; i++) {
47	ASSERT_EQ (uDstAnchor[j][i], uDstTest[j][i]);	47	ASSERT_EQ (uDstAnchor[j][i], uDstTest[j][i]);

Keyboard shortcuts