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/vaacalcfuncs.cpp (1 of 3 files). Show all

Unified · Split

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

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