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
1414 pRef[i] = rand() % 256;
1515
1616 const int32_t kkiStride = 0;
17− const uint32_t kuiCpuFlag = 0;
18− WelsInitFillingPredFuncs (kuiCpuFlag);
1917 WelsI4x4LumaPredV_c (pPred, pRef, kkiStride);
2018
2119 for (int i = 0; i < 4; i++)
@@ -47,15 +45,12 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredH) { · 25 unmodified lines
4745 const uint8_t kuiV3[4] = {kuiH3, kuiH3, kuiH3, kuiH3};
4846 const uint8_t kuiV4[4] = {kuiH4, kuiH4, kuiH4, kuiH4};
4947
50− const uint32_t kuiCpuFlag = 0;
51−
5248 ENFORCE_STACK_ALIGN_1D (uint8_t, uiV, 16, 16) // TobeCont'd about assign opt as follows
5349 ST32 (&uiV[0], LD32 (kuiV1));
5450 ST32 (&uiV[4], LD32 (kuiV2));
5551 ST32 (&uiV[8], LD32 (kuiV3));
5652 ST32 (&uiV[12], LD32 (kuiV4));
5753
58− WelsInitFillingPredFuncs (kuiCpuFlag);
5954 WelsI4x4LumaPredH_c (pPred, pRef, kiStride);
6055
6156 for (int i = 0; i < 4; i++)
@@ -99,8 +94,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredDDL) { · 37 unmodified lines
9994 uiV[11] = uiV[14] = kuiDDL5;
10095 uiV[15] = kuiDDL6;
10196
102− const uint32_t kuiCpuFlag = 0;
103− WelsInitFillingPredFuncs (kuiCpuFlag);
10497 WelsI4x4LumaPredDDL_c (pPred, pRef, kiStride);
10598
10699 for (int i = 0; i < 4; i++)
@@ -133,8 +126,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredDDLTop) { · 26 unmodified lines
133126 uiV[2] = uiV[5] = uiV[8] = kuiDLT2;
134127 uiV[3] = kuiDLT3;
135128
136− const uint32_t kuiCpuFlag = 0;
137− WelsInitFillingPredFuncs (kuiCpuFlag);
138129 WelsI4x4LumaPredDDLTop_c (pPred, pRef, kiStride);
139130
140131 for (int i = 0; i < 4; i++)
@@ -190,8 +181,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredDDR) { · 49 unmodified lines
190181 uiV[8] = uiV[13] = kuiDDR5;
191182 uiV[12] = kuiDDR6;
192183
193− const uint32_t kuiCpuFlag = 0;
194− WelsInitFillingPredFuncs (kuiCpuFlag);
195184 WelsI4x4LumaPredDDR_c (pPred, pRef, kiStride);
196185
197186 for (int i = 0; i < 4; i++)
@@ -240,8 +229,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredVL) { · 42 unmodified lines
240229 uiV[11] = kuiVL4;
241230 uiV[15] = kuiVL9;
242231
243− const uint32_t kuiCpuFlag = 0;
244− WelsInitFillingPredFuncs (kuiCpuFlag);
245232 WelsI4x4LumaPredVL_c (pPred, pRef, kiStride);
246233
247234 for (int i = 0; i < 4; i++)
@@ -285,8 +272,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredVLTop) { · 37 unmodified lines
285272 uiV[6] = uiV[13] = kuiVLT6;
286273 uiV[7] = uiV[14] = uiV[15] = kuiVLT7;
287274
288− const uint32_t kuiCpuFlag = 0;
289− WelsInitFillingPredFuncs (kuiCpuFlag);
290275 WelsI4x4LumaPredVLTop_c (pPred, pRef, kiStride);
291276
292277 for (int i = 0; i < 4; i++)
@@ -340,8 +325,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredVR) { · 47 unmodified lines
340325 uiV[8] = kuiVR8;
341326 uiV[12] = kuiVR9;
342327
343− const uint32_t kuiCpuFlag = 0;
344− WelsInitFillingPredFuncs (kuiCpuFlag);
345328 WelsI4x4LumaPredVR_c (pPred, pRef, kiStride);
346329
347330 for (int i = 0; i < 4; i++)
@@ -388,8 +371,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredHU) { · 40 unmodified lines
388371 uiV[7] = uiV[9] = kuiHU5;
389372 memset (&uiV[10], kuiL3, 6 * sizeof (uint8_t));
390373
391− const uint32_t kuiCpuFlag = 0;
392− WelsInitFillingPredFuncs (kuiCpuFlag);
393374 WelsI4x4LumaPredHU_c (pPred, pRef, kiStride);
394375
395376 for (int i = 0; i < 4; i++)
@@ -444,8 +425,6 @@ TEST (GetIntraPredictorTest, TestGetI4x4LumaPredHD) { · 48 unmodified lines
444425 uiV[12] = kuiHD8;
445426 uiV[13] = kuiHD9;
446427
447− const uint32_t kuiCpuFlag = 0;
448− WelsInitFillingPredFuncs (kuiCpuFlag);
449428 WelsI4x4LumaPredHD_c (pPred, pRef, kiStride);
450429
451430 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