Merge pull request #460 from mstorsjo/add-const

Mark pointers as const where possible in vaacalc

ruil2 committed 12 years ago

Commit e99df332 parents 02bafd9 2a23a503 files · +40 −40Browse files

Showing the changes to codec/processing/src (3 of 3 files). Show all

Unified · Split

3 files

codec/processing/src/asm/vaa.asm +10 −10
codec/processing/src/vaacalc/vaacalcfuncs.cpp +25 −25
codec/processing/src/vaacalc/vaacalculation.h +5 −5

@@ -359,7 +359,7 @@ SampleVariance16x16_sse2: · 358 unmodified lines
359	359
360	360	WELS_EXTERN VAACalcSad_sse2
361	361	;*************************************************************************************************************
362		−;void VAACalcSad_sse2( uint8_t cur_data, uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight
	362	+;void VAACalcSad_sse2( const uint8_t cur_data, const uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight
363	363	; int32_t iPicStride, int32_t psadframe, int32_t psad8x8)
364	364	;*************************************************************************************************************
365	365
@@ -551,7 +551,7 @@ SampleVariance16x16_sse2: · 185 unmodified lines
551	551
552	552	WELS_EXTERN VAACalcSad_sse2
553	553	;*************************************************************************************************************
554		−;void VAACalcSad_sse2( uint8_t cur_data, uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight
	554	+;void VAACalcSad_sse2( const uint8_t cur_data, const uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight
555	555	; int32_t iPicStride, int32_t psadframe, int32_t psad8x8)
556	556	;*************************************************************************************************************
557	557
@@ -649,7 +649,7 @@ width_loop: · 91 unmodified lines
649	649	%ifdef X86_32
650	650	WELS_EXTERN VAACalcSadVar_sse2
651	651	;*************************************************************************************************************
652		−;void VAACalcSadVar_sse2( uint8_t cur_data, uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight
	652	+;void VAACalcSadVar_sse2( const uint8_t cur_data, const uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight
653	653	; int32_t iPicStride, int32_t psadframe, int32_t psad8x8, int32_t psum16x16, int32_t psqsum16x16)
654	654	;*************************************************************************************************************
655	655
@@ -785,7 +785,7 @@ var_width_loop: · 129 unmodified lines
785	785
786	786	WELS_EXTERN VAACalcSadVar_sse2
787	787	;*************************************************************************************************************
788		−;void VAACalcSadVar_sse2( uint8_t cur_data, uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight
	788	+;void VAACalcSadVar_sse2( const uint8_t cur_data, const uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight
789	789	; int32_t iPicStride, int32_t psadframe, int32_t psad8x8, int32_t psum16x16, int32_t psqsum16x16)
790	790	;*************************************************************************************************************
791	791
@@ -928,7 +928,7 @@ var_width_loop: · 136 unmodified lines
928	928
929	929	WELS_EXTERN VAACalcSadSsd_sse2
930	930	;*************************************************************************************************************
931		−;void VAACalcSadSsd_sse2(uint8_t cur_data, uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight,
	931	+;void VAACalcSadSsd_sse2(const uint8_t cur_data, const uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight,
932	932	; int32_t iPicStride,int32_t psadframe, int32_t psad8x8, int32_t psum16x16, int32_t psqsum16x16, int32_t *psqdiff16x16)
933	933	;*************************************************************************************************************
934	934
@@ -1084,7 +1084,7 @@ sqdiff_width_loop: · 149 unmodified lines
1084	1084
1085	1085	WELS_EXTERN VAACalcSadSsd_sse2
1086	1086	;*************************************************************************************************************
1087		−;void VAACalcSadSsd_sse2(uint8_t cur_data, uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight,
	1087	+;void VAACalcSadSsd_sse2(const uint8_t cur_data, const uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight,
1088	1088	; int32_t iPicStride,int32_t psadframe, int32_t psad8x8, int32_t psum16x16, int32_t psqsum16x16, int32_t *psqdiff16x16)
1089	1089	;*************************************************************************************************************
1090	1090
@@ -1248,7 +1248,7 @@ sqdiff_width_loop: · 157 unmodified lines
1248	1248	%ifdef X86_32
1249	1249	WELS_EXTERN VAACalcSadBgd_sse2
1250	1250	;*************************************************************************************************************
1251		−;void VAACalcSadBgd_sse2(uint8_t cur_data, uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight,
	1251	+;void VAACalcSadBgd_sse2(const uint8_t cur_data, const uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight,
1252	1252	; int32_t iPicStride, int32_t psadframe, int32_t psad8x8, int32_t p_sd8x8, uint8_t p_mad8x8)
1253	1253	;*************************************************************************************************************
1254	1254
@@ -1427,7 +1427,7 @@ bgd_width_loop: · 172 unmodified lines
1427	1427
1428	1428	WELS_EXTERN VAACalcSadSsdBgd_sse2
1429	1429	;*************************************************************************************************************
1430		−;void VAACalcSadSsdBgd_sse2(uint8_t cur_data, uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight,
	1430	+;void VAACalcSadSsdBgd_sse2(const uint8_t cur_data, const uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight,
1431	1431	; int32_t iPicStride, int32_t psadframe, int32_t psad8x8, int32_t psum16x16, int32_t psqsum16x16,
1432	1432	; int32_t psqdiff16x16, int32_t p_sd8x8, uint8_t *p_mad8x8)
1433	1433	;*************************************************************************************************************
@@ -1658,7 +1658,7 @@ sqdiff_bgd_width_loop: · 224 unmodified lines
1658	1658
1659	1659	WELS_EXTERN VAACalcSadBgd_sse2
1660	1660	;*************************************************************************************************************
1661		−;void VAACalcSadBgd_sse2(uint8_t cur_data, uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight,
	1661	+;void VAACalcSadBgd_sse2(const uint8_t cur_data, const uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight,
1662	1662	; int32_t iPicStride, int32_t psadframe, int32_t psad8x8, int32_t p_sd8x8, uint8_t p_mad8x8)
1663	1663	;*************************************************************************************************************
1664	1664
@@ -1829,7 +1829,7 @@ bgd_width_loop: · 164 unmodified lines
1829	1829
1830	1830	WELS_EXTERN VAACalcSadSsdBgd_sse2
1831	1831	;*************************************************************************************************************
1832		−;void VAACalcSadSsdBgd_sse2(uint8_t cur_data, uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight,
	1832	+;void VAACalcSadSsdBgd_sse2(const uint8_t cur_data, const uint8_t ref_data, int32_t iPicWidth, int32_t iPicHeight,
1833	1833	; int32_t iPicStride, int32_t psadframe, int32_t psad8x8, int32_t psum16x16, int32_t psqsum16x16,
1834	1834	; int32_t psqdiff16x16, int32_t p_sd8x8, uint8_t *p_mad8x8)
1835	1835	;*************************************************************************************************************

codec/processing/src/vaacalc/vaacalcfuncs.cpp+25−25

@@ -34,10 +34,10 @@ · 33 unmodified lines
34	34
35	35	WELSVP_NAMESPACE_BEGIN
36	36
37		−void VAACalcSadSsd_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight, int32_t iPicStride,
	37	+void VAACalcSadSsd_c (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight, int32_t iPicStride,
38	38	int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* psqsum16x16, int32_t* psqdiff16x16) {
39		− uint8_t* tmp_ref = pRefData;
40		− uint8_t* tmp_cur = pCurData;
	39	+ const uint8_t* tmp_ref = pRefData;
	40	+ const uint8_t* tmp_cur = pCurData;
41	41	int32_t iMbWidth = (iPicWidth >> 4);
42	42	int32_t mb_height = (iPicHeight >> 4);
43	43	int32_t mb_index = 0;
@@ -49,8 +49,8 @@ void VAACalcSadSsd_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, i · 5 unmodified lines
49	49	for (int32_t j = 0; j < iMbWidth; j ++) {
50	50	int32_t k, l;
51	51	int32_t l_sad, l_sqdiff, l_sum, l_sqsum;
52		− uint8_t* tmp_cur_row;
53		− uint8_t* tmp_ref_row;
	52	+ const uint8_t* tmp_cur_row;
	53	+ const uint8_t* tmp_ref_row;
54	54
55	55	pSum16x16[mb_index] = 0;
56	56	psqsum16x16[mb_index] = 0;
@@ -145,10 +145,10 @@ void VAACalcSadSsd_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, i · 88 unmodified lines
145	145	tmp_cur += step;
146	146	}
147	147	}
148		−void VAACalcSadVar_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight, int32_t iPicStride,
	148	+void VAACalcSadVar_c (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight, int32_t iPicStride,
149	149	int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* psqsum16x16) {
150		− uint8_t* tmp_ref = pRefData;
151		− uint8_t* tmp_cur = pCurData;
	150	+ const uint8_t* tmp_ref = pRefData;
	151	+ const uint8_t* tmp_cur = pCurData;
152	152	int32_t iMbWidth = (iPicWidth >> 4);
153	153	int32_t mb_height = (iPicHeight >> 4);
154	154	int32_t mb_index = 0;
@@ -160,8 +160,8 @@ void VAACalcSadVar_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, i · 5 unmodified lines
160	160	for (int32_t j = 0; j < iMbWidth; j ++) {
161	161	int32_t k, l;
162	162	int32_t l_sad, l_sum, l_sqsum;
163		− uint8_t* tmp_cur_row;
164		− uint8_t* tmp_ref_row;
	163	+ const uint8_t* tmp_cur_row;
	164	+ const uint8_t* tmp_ref_row;
165	165
166	166	pSum16x16[mb_index] = 0;
167	167	psqsum16x16[mb_index] = 0;
@@ -249,10 +249,10 @@ void VAACalcSadVar_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, i · 81 unmodified lines
249	249	}
250	250
251	251
252		−void VAACalcSad_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight, int32_t iPicStride,
	252	+void VAACalcSad_c (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight, int32_t iPicStride,
253	253	int32_t* pFrameSad, int32_t* pSad8x8) {
254		− uint8_t* tmp_ref = pRefData;
255		− uint8_t* tmp_cur = pCurData;
	254	+ const uint8_t* tmp_ref = pRefData;
	255	+ const uint8_t* tmp_cur = pCurData;
256	256	int32_t iMbWidth = (iPicWidth >> 4);
257	257	int32_t mb_height = (iPicHeight >> 4);
258	258	int32_t mb_index = 0;
@@ -264,8 +264,8 @@ void VAACalcSad_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, int3 · 5 unmodified lines
264	264	for (int32_t j = 0; j < iMbWidth; j ++) {
265	265	int32_t k, l;
266	266	int32_t l_sad;
267		− uint8_t* tmp_cur_row;
268		− uint8_t* tmp_ref_row;
	267	+ const uint8_t* tmp_cur_row;
	268	+ const uint8_t* tmp_ref_row;
269	269
270	270	l_sad = 0;
271	271	tmp_cur_row = tmp_cur;
@@ -332,14 +332,14 @@ void VAACalcSad_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, int3 · 60 unmodified lines
332	332	}
333	333	}
334	334
335		−void VAACalcSadSsdBgd_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
	335	+void VAACalcSadSsdBgd_c (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
336	336	int32_t iPicStride,
337	337	int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* psqsum16x16, int32_t* psqdiff16x16, int32_t* pSd8x8,
338	338	uint8_t* pMad8x8)
339	339
340	340	{
341		− uint8_t* tmp_ref = pRefData;
342		− uint8_t* tmp_cur = pCurData;
	341	+ const uint8_t* tmp_ref = pRefData;
	342	+ const uint8_t* tmp_cur = pCurData;
343	343	int32_t iMbWidth = (iPicWidth >> 4);
344	344	int32_t mb_height = (iPicHeight >> 4);
345	345	int32_t mb_index = 0;
@@ -351,8 +351,8 @@ void VAACalcSadSsdBgd_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth · 5 unmodified lines
351	351	for (int32_t j = 0; j < iMbWidth; j ++) {
352	352	int32_t k, l;
353	353	int32_t l_sad, l_sqdiff, l_sum, l_sqsum, l_sd, l_mad;
354		− uint8_t* tmp_cur_row;
355		− uint8_t* tmp_ref_row;
	354	+ const uint8_t* tmp_cur_row;
	355	+ const uint8_t* tmp_ref_row;
356	356
357	357	pSum16x16[mb_index] = 0;
358	358	psqsum16x16[mb_index] = 0;
@@ -480,10 +480,10 @@ void VAACalcSadSsdBgd_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth · 121 unmodified lines
480	480	}
481	481	}
482	482
483		−void VAACalcSadBgd_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight, int32_t iPicStride,
	483	+void VAACalcSadBgd_c (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight, int32_t iPicStride,
484	484	int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSd8x8, uint8_t* pMad8x8) {
485		− uint8_t* tmp_ref = pRefData;
486		− uint8_t* tmp_cur = pCurData;
	485	+ const uint8_t* tmp_ref = pRefData;
	486	+ const uint8_t* tmp_cur = pCurData;
487	487	int32_t iMbWidth = (iPicWidth >> 4);
488	488	int32_t mb_height = (iPicHeight >> 4);
489	489	int32_t mb_index = 0;
@@ -495,8 +495,8 @@ void VAACalcSadBgd_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, i · 5 unmodified lines
495	495	for (int32_t j = 0; j < iMbWidth; j ++) {
496	496	int32_t k, l;
497	497	int32_t l_sad, l_sd, l_mad;
498		− uint8_t* tmp_cur_row;
499		− uint8_t* tmp_ref_row;
	498	+ const uint8_t* tmp_cur_row;
	499	+ const uint8_t* tmp_ref_row;
500	500
501	501	l_mad = l_sd = l_sad = 0;
502	502	tmp_cur_row = tmp_cur;

codec/processing/src/vaacalc/vaacalculation.h+5−5

@@ -49,24 +49,24 @@ · 48 unmodified lines
49	49
50	50	WELSVP_NAMESPACE_BEGIN
51	51
52		−typedef void (VAACalcSadBgdFunc) (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
	52	+typedef void (VAACalcSadBgdFunc) (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
53	53	int32_t iPicStride,
54	54	int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSd8x8, uint8_t* pMad8x8);
55	55
56		−typedef void (VAACalcSadSsdBgdFunc) (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
	56	+typedef void (VAACalcSadSsdBgdFunc) (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
57	57	int32_t iPicStride,
58	58	int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* pSumSquare16x16,
59	59	int32_t* pSsd16x16, int32_t* pSd8x8, uint8_t* pMad8x8);
60	60
61		−typedef void (VAACalcSadFunc) (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
	61	+typedef void (VAACalcSadFunc) (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
62	62	int32_t iPicStride,
63	63	int32_t* pFrameSad, int32_t* pSad8x8);
64	64
65		−typedef void (VAACalcSadVarFunc) (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
	65	+typedef void (VAACalcSadVarFunc) (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
66	66	int32_t iPicStride,
67	67	int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* pSumSquare16x16);
68	68
69		−typedef void (VAACalcSadSsdFunc) (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
	69	+typedef void (VAACalcSadSsdFunc) (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
70	70	int32_t iPicStride,
71	71	int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* pSumSquare16x16, int32_t* pSsd16x16);
72	72

Merge pull request #460 from mstorsjo/add-const

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code