History

Merge pull request #1043 from mstorsjo/avoid-globals

Get rid of global non-readonly variables within the library

ruil2 committed 12 years ago

Commit bdf9f6b2 parents dce9541 e5609bc14 files · +270 −251Browse files

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

Unified · Split

test/encoder/EncUT_GetIntraPredictor.cpp+0−21
@@ -14,8 +14,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredV) { · 13 unmodified lines
14 pRef[i] = rand() % 256;14 pRef[i] = rand() % 256;
15 15
16 const int32_t kkiStride = 0;16 const int32_t kkiStride = 0;
17 const uint32_t kuiCpuFlag = 0;
18 WelsInitFillingPredFuncs (kuiCpuFlag);
19 WelsI4x4LumaPredV_c (pPred, pRef, kkiStride);17 WelsI4x4LumaPredV_c (pPred, pRef, kkiStride);
20 18
21 for (int i = 0; i < 4; i++)19 for (int i = 0; i < 4; i++)
@@ -47,15 +45,12 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredH) { · 25 unmodified lines
47 const uint8_t kuiV3[4] = {kuiH3, kuiH3, kuiH3, kuiH3};45 const uint8_t kuiV3[4] = {kuiH3, kuiH3, kuiH3, kuiH3};
48 const uint8_t kuiV4[4] = {kuiH4, kuiH4, kuiH4, kuiH4};46 const uint8_t kuiV4[4] = {kuiH4, kuiH4, kuiH4, kuiH4};
49 47
50 const uint32_t kuiCpuFlag = 0;
51
52 ENFORCE_STACK_ALIGN_1D (uint8_t, uiV, 16, 16) // TobeCont'd about assign opt as follows48 ENFORCE_STACK_ALIGN_1D (uint8_t, uiV, 16, 16) // TobeCont'd about assign opt as follows
53 ST32 (&uiV[0], LD32 (kuiV1));49 ST32 (&uiV[0], LD32 (kuiV1));
54 ST32 (&uiV[4], LD32 (kuiV2));50 ST32 (&uiV[4], LD32 (kuiV2));
55 ST32 (&uiV[8], LD32 (kuiV3));51 ST32 (&uiV[8], LD32 (kuiV3));
56 ST32 (&uiV[12], LD32 (kuiV4));52 ST32 (&uiV[12], LD32 (kuiV4));
57 53
58 WelsInitFillingPredFuncs (kuiCpuFlag);
59 WelsI4x4LumaPredH_c (pPred, pRef, kiStride);54 WelsI4x4LumaPredH_c (pPred, pRef, kiStride);
60 55
61 for (int i = 0; i < 4; i++)56 for (int i = 0; i < 4; i++)
@@ -99,8 +94,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredDDL) { · 37 unmodified lines
99 uiV[11] = uiV[14] = kuiDDL5;94 uiV[11] = uiV[14] = kuiDDL5;
100 uiV[15] = kuiDDL6;95 uiV[15] = kuiDDL6;
101 96
102 const uint32_t kuiCpuFlag = 0;
103 WelsInitFillingPredFuncs (kuiCpuFlag);
104 WelsI4x4LumaPredDDL_c (pPred, pRef, kiStride);97 WelsI4x4LumaPredDDL_c (pPred, pRef, kiStride);
105 98
106 for (int i = 0; i < 4; i++)99 for (int i = 0; i < 4; i++)
@@ -133,8 +126,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredDDLTop) { · 26 unmodified lines
133 uiV[2] = uiV[5] = uiV[8] = kuiDLT2;126 uiV[2] = uiV[5] = uiV[8] = kuiDLT2;
134 uiV[3] = kuiDLT3;127 uiV[3] = kuiDLT3;
135 128
136 const uint32_t kuiCpuFlag = 0;
137 WelsInitFillingPredFuncs (kuiCpuFlag);
138 WelsI4x4LumaPredDDLTop_c (pPred, pRef, kiStride);129 WelsI4x4LumaPredDDLTop_c (pPred, pRef, kiStride);
139 130
140 for (int i = 0; i < 4; i++)131 for (int i = 0; i < 4; i++)
@@ -190,8 +181,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredDDR) { · 49 unmodified lines
190 uiV[8] = uiV[13] = kuiDDR5;181 uiV[8] = uiV[13] = kuiDDR5;
191 uiV[12] = kuiDDR6;182 uiV[12] = kuiDDR6;
192 183
193 const uint32_t kuiCpuFlag = 0;
194 WelsInitFillingPredFuncs (kuiCpuFlag);
195 WelsI4x4LumaPredDDR_c (pPred, pRef, kiStride);184 WelsI4x4LumaPredDDR_c (pPred, pRef, kiStride);
196 185
197 for (int i = 0; i < 4; i++)186 for (int i = 0; i < 4; i++)
@@ -240,8 +229,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredVL) { · 42 unmodified lines
240 uiV[11] = kuiVL4;229 uiV[11] = kuiVL4;
241 uiV[15] = kuiVL9;230 uiV[15] = kuiVL9;
242 231
243 const uint32_t kuiCpuFlag = 0;
244 WelsInitFillingPredFuncs (kuiCpuFlag);
245 WelsI4x4LumaPredVL_c (pPred, pRef, kiStride);232 WelsI4x4LumaPredVL_c (pPred, pRef, kiStride);
246 233
247 for (int i = 0; i < 4; i++)234 for (int i = 0; i < 4; i++)
@@ -285,8 +272,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredVLTop) { · 37 unmodified lines
285 uiV[6] = uiV[13] = kuiVLT6;272 uiV[6] = uiV[13] = kuiVLT6;
286 uiV[7] = uiV[14] = uiV[15] = kuiVLT7;273 uiV[7] = uiV[14] = uiV[15] = kuiVLT7;
287 274
288 const uint32_t kuiCpuFlag = 0;
289 WelsInitFillingPredFuncs (kuiCpuFlag);
290 WelsI4x4LumaPredVLTop_c (pPred, pRef, kiStride);275 WelsI4x4LumaPredVLTop_c (pPred, pRef, kiStride);
291 276
292 for (int i = 0; i < 4; i++)277 for (int i = 0; i < 4; i++)
@@ -340,8 +325,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredVR) { · 47 unmodified lines
340 uiV[8] = kuiVR8;325 uiV[8] = kuiVR8;
341 uiV[12] = kuiVR9;326 uiV[12] = kuiVR9;
342 327
343 const uint32_t kuiCpuFlag = 0;
344 WelsInitFillingPredFuncs (kuiCpuFlag);
345 WelsI4x4LumaPredVR_c (pPred, pRef, kiStride);328 WelsI4x4LumaPredVR_c (pPred, pRef, kiStride);
346 329
347 for (int i = 0; i < 4; i++)330 for (int i = 0; i < 4; i++)
@@ -388,8 +371,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredHU) { · 40 unmodified lines
388 uiV[7] = uiV[9] = kuiHU5;371 uiV[7] = uiV[9] = kuiHU5;
389 memset (&uiV[10], kuiL3, 6 * sizeof (uint8_t));372 memset (&uiV[10], kuiL3, 6 * sizeof (uint8_t));
390 373
391 const uint32_t kuiCpuFlag = 0;
392 WelsInitFillingPredFuncs (kuiCpuFlag);
393 WelsI4x4LumaPredHU_c (pPred, pRef, kiStride);374 WelsI4x4LumaPredHU_c (pPred, pRef, kiStride);
394 375
395 for (int i = 0; i < 4; i++)376 for (int i = 0; i < 4; i++)
@@ -444,8 +425,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredHD) { · 48 unmodified lines
444 uiV[12] = kuiHD8;425 uiV[12] = kuiHD8;
445 uiV[13] = kuiHD9;426 uiV[13] = kuiHD9;
446 427
447 const uint32_t kuiCpuFlag = 0;
448 WelsInitFillingPredFuncs (kuiCpuFlag);
449 WelsI4x4LumaPredHD_c (pPred, pRef, kiStride);428 WelsI4x4LumaPredHD_c (pPred, pRef, kiStride);
450 429
451 for (int i = 0; i < 4; i++)430 for (int i = 0; i < 4; i++)

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