History

add refine mc.cpp on decoder 1. remove unecessary init 2. add static to constant function pointer array

Licai Guo committed 12 years ago

Commit d0a7f9b1 parent 278597b1 file · +22 −22Browse files

Showing the changes to codec/decoder/core/src/mc.cpp (1 of 1 file). Show all

Unified · Split

codec/decoder/core/src/mc.cpp+22−22
@@ -220,88 +220,88 @@ static inline void McHorVer22_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDs · 219 unmodified lines
220220 /////////////////////luma MC//////////////////////////
221221 static inline void McHorVer01_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
222222 int32_t iHeight) {
223− uint8_t uiTmp[256] = { 0 };
223+ uint8_t uiTmp[256];
224224 McHorVer02_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
225225 PixelAvg_c (pDst, iDstStride, pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
226226 }
227227 static inline void McHorVer03_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
228228 int32_t iHeight) {
229− uint8_t uiTmp[256] = { 0 };
229+ uint8_t uiTmp[256];
230230 McHorVer02_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
231231 PixelAvg_c (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, uiTmp, 16, iWidth, iHeight);
232232 }
233233 static inline void McHorVer10_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
234234 int32_t iHeight) {
235− uint8_t uiTmp[256] = { 0 };
235+ uint8_t uiTmp[256];
236236 McHorVer20_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
237237 PixelAvg_c (pDst, iDstStride, pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
238238 }
239239 static inline void McHorVer11_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
240240 int32_t iHeight) {
241− uint8_t uiHorTmp[256] = { 0 };
242− uint8_t uiVerTmp[256] = { 0 };
241+ uint8_t uiHorTmp[256];
242+ uint8_t uiVerTmp[256];
243243 McHorVer20_c (pSrc, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
244244 McHorVer02_c (pSrc, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
245245 PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight);
246246 }
247247 static inline void McHorVer12_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
248248 int32_t iHeight) {
249− uint8_t uiVerTmp[256] = { 0 };
250− uint8_t uiCtrTmp[256] = { 0 };
249+ uint8_t uiVerTmp[256];
250+ uint8_t uiCtrTmp[256];
251251 McHorVer02_c (pSrc, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
252252 McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight);
253253 PixelAvg_c (pDst, iDstStride, uiVerTmp, 16, uiCtrTmp, 16, iWidth, iHeight);
254254 }
255255 static inline void McHorVer13_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
256256 int32_t iHeight) {
257− uint8_t uiHorTmp[256] = { 0 };
258− uint8_t uiVerTmp[256] = { 0 };
257+ uint8_t uiHorTmp[256];
258+ uint8_t uiVerTmp[256];
259259 McHorVer20_c (pSrc + iSrcStride, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
260260 McHorVer02_c (pSrc, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
261261 PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight);
262262 }
263263 static inline void McHorVer21_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
264264 int32_t iHeight) {
265− uint8_t uiHorTmp[256] = { 0 };
266− uint8_t uiCtrTmp[256] = { 0 };
265+ uint8_t uiHorTmp[256];
266+ uint8_t uiCtrTmp[256];
267267 McHorVer20_c (pSrc, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
268268 McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight);
269269 PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiCtrTmp, 16, iWidth, iHeight);
270270 }
271271 static inline void McHorVer23_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
272272 int32_t iHeight) {
273− uint8_t uiHorTmp[256] = { 0 };
274− uint8_t uiCtrTmp[256] = { 0 };
273+ uint8_t uiHorTmp[256];
274+ uint8_t uiCtrTmp[256];
275275 McHorVer20_c (pSrc + iSrcStride, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
276276 McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight);
277277 PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiCtrTmp, 16, iWidth, iHeight);
278278 }
279279 static inline void McHorVer30_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
280280 int32_t iHeight) {
281− uint8_t uiHorTmp[256] = { 0 };
281+ uint8_t uiHorTmp[256];
282282 McHorVer20_c (pSrc, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
283283 PixelAvg_c (pDst, iDstStride, pSrc + 1, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
284284 }
285285 static inline void McHorVer31_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
286286 int32_t iHeight) {
287− uint8_t uiHorTmp[256] = { 0 };
288− uint8_t uiVerTmp[256] = { 0 };
287+ uint8_t uiHorTmp[256];
288+ uint8_t uiVerTmp[256];
289289 McHorVer20_c (pSrc, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
290290 McHorVer02_c (pSrc + 1, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
291291 PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight);
292292 }
293293 static inline void McHorVer32_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
294294 int32_t iHeight) {
295− uint8_t uiVerTmp[256] = { 0 };
296− uint8_t uiCtrTmp[256] = { 0 };
295+ uint8_t uiVerTmp[256];
296+ uint8_t uiCtrTmp[256];
297297 McHorVer02_c (pSrc + 1, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
298298 McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight);
299299 PixelAvg_c (pDst, iDstStride, uiVerTmp, 16, uiCtrTmp, 16, iWidth, iHeight);
300300 }
301301 static inline void McHorVer33_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
302302 int32_t iHeight) {
303− uint8_t uiHorTmp[256] = { 0 };
304− uint8_t uiVerTmp[256] = { 0 };
303+ uint8_t uiHorTmp[256];
304+ uint8_t uiVerTmp[256];
305305 McHorVer20_c (pSrc + iSrcStride, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
306306 McHorVer02_c (pSrc + 1, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
307307 PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight);
@@ -311,7 +311,7 @@ void McLuma_c (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStr · 3 unmodified lines
311311 int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight)
312312 //pSrc has been added the offset of mv
313313 {
314− PWelsMcWidthHeightFunc pWelsMcFunc[4][4] = { //[x][y]
314+ static const PWelsMcWidthHeightFunc pWelsMcFunc[4][4] = { //[x][y]
315315 {McCopy_c, McHorVer01_c, McHorVer02_c, McHorVer03_c},
316316 {McHorVer10_c, McHorVer11_c, McHorVer12_c, McHorVer13_c},
317317 {McHorVer20_c, McHorVer21_c, McHorVer22_c, McHorVer23_c},
@@ -623,7 +623,7 @@ void McLuma_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDst · 305 unmodified lines
623623 int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight)
624624 //pSrc has been added the offset of mv
625625 {
626− PWelsMcWidthHeightFunc pWelsMcFunc[4][4] = { //[x][y]
626+ static const PWelsMcWidthHeightFunc pWelsMcFunc[4][4] = { //[x][y]
627627 {McCopy_sse2, McHorVer01_sse2, McHorVer02_sse2, McHorVer03_sse2},
628628 {McHorVer10_sse2, McHorVer11_sse2, McHorVer12_sse2, McHorVer13_sse2},
629629 {McHorVer20_sse2, McHorVer21_sse2, McHorVer22_sse2, McHorVer23_sse2},

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