History

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/vaacalc (2 of 3 files). Show all

Unified · Split

2 files
  1. codec/processing/src/vaacalc/vaacalcfuncs.cpp +25 −25
  2. codec/processing/src/vaacalc/vaacalculation.h +5 −5
codec/processing/src/vaacalc/vaacalcfuncs.cpp+25−25
@@ -34,10 +34,10 @@ · 33 unmodified lines
3434
3535 WELSVP_NAMESPACE_BEGIN
3636
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,
3838 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;
4141 int32_t iMbWidth = (iPicWidth >> 4);
4242 int32_t mb_height = (iPicHeight >> 4);
4343 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
4949 for (int32_t j = 0; j < iMbWidth; j ++) {
5050 int32_t k, l;
5151 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;
5454
5555 pSum16x16[mb_index] = 0;
5656 psqsum16x16[mb_index] = 0;
@@ -145,10 +145,10 @@ void VAACalcSadSsd_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, i · 88 unmodified lines
145145 tmp_cur += step;
146146 }
147147 }
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,
149149 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;
152152 int32_t iMbWidth = (iPicWidth >> 4);
153153 int32_t mb_height = (iPicHeight >> 4);
154154 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
160160 for (int32_t j = 0; j < iMbWidth; j ++) {
161161 int32_t k, l;
162162 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;
165165
166166 pSum16x16[mb_index] = 0;
167167 psqsum16x16[mb_index] = 0;
@@ -249,10 +249,10 @@ void VAACalcSadVar_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth, i · 81 unmodified lines
249249 }
250250
251251
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,
253253 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;
256256 int32_t iMbWidth = (iPicWidth >> 4);
257257 int32_t mb_height = (iPicHeight >> 4);
258258 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
264264 for (int32_t j = 0; j < iMbWidth; j ++) {
265265 int32_t k, l;
266266 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;
269269
270270 l_sad = 0;
271271 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
332332 }
333333 }
334334
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,
336336 int32_t iPicStride,
337337 int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* psqsum16x16, int32_t* psqdiff16x16, int32_t* pSd8x8,
338338 uint8_t* pMad8x8)
339339
340340 {
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;
343343 int32_t iMbWidth = (iPicWidth >> 4);
344344 int32_t mb_height = (iPicHeight >> 4);
345345 int32_t mb_index = 0;
@@ -351,8 +351,8 @@ void VAACalcSadSsdBgd_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth · 5 unmodified lines
351351 for (int32_t j = 0; j < iMbWidth; j ++) {
352352 int32_t k, l;
353353 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;
356356
357357 pSum16x16[mb_index] = 0;
358358 psqsum16x16[mb_index] = 0;
@@ -480,10 +480,10 @@ void VAACalcSadSsdBgd_c (uint8_t* pCurData, uint8_t* pRefData, int32_t iPicWidth · 121 unmodified lines
480480 }
481481 }
482482
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,
484484 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;
487487 int32_t iMbWidth = (iPicWidth >> 4);
488488 int32_t mb_height = (iPicHeight >> 4);
489489 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
495495 for (int32_t j = 0; j < iMbWidth; j ++) {
496496 int32_t k, l;
497497 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;
500500
501501 l_mad = l_sd = l_sad = 0;
502502 tmp_cur_row = tmp_cur;
codec/processing/src/vaacalc/vaacalculation.h+5−5
@@ -49,24 +49,24 @@ · 48 unmodified lines
4949
5050 WELSVP_NAMESPACE_BEGIN
5151
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,
5353 int32_t iPicStride,
5454 int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSd8x8, uint8_t* pMad8x8);
5555
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,
5757 int32_t iPicStride,
5858 int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* pSumSquare16x16,
5959 int32_t* pSsd16x16, int32_t* pSd8x8, uint8_t* pMad8x8);
6060
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,
6262 int32_t iPicStride,
6363 int32_t* pFrameSad, int32_t* pSad8x8);
6464
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,
6666 int32_t iPicStride,
6767 int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* pSumSquare16x16);
6868
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,
7070 int32_t iPicStride,
7171 int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* pSumSquare16x16, int32_t* pSsd16x16);
7272

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t