History

Remove the array_stack_align.h header from the encoder lib

All of these macros are already available in the common macros.h header. Unify all the macros to be named ENFORCE_* instead of mixed FORCE/ENFORCE.

Martin Storsjö committed 12 years ago

Commit 66c39a41 parent e413ed216 files · +41 −174Browse files

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

Unified · Split

codec/decoder/core/src/mc.cpp+21−21
@@ -420,7 +420,7 @@ static inline void_t McHorVer22_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 419 unmodified lines
420 420
421static inline void_t McHorVer01_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,421static inline void_t McHorVer01_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
422 int32_t iWidth, int32_t iHeight) {422 int32_t iWidth, int32_t iHeight) {
423 FORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);423 ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);
424 if (iWidth == 16) {424 if (iWidth == 16) {
425 McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight);425 McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight);
426 PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);426 PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
@@ -434,7 +434,7 @@ static inline void_t McHorVer01_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 7 unmodified lines
434}434}
435static inline void_t McHorVer03_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,435static inline void_t McHorVer03_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
436 int32_t iWidth, int32_t iHeight) {436 int32_t iWidth, int32_t iHeight) {
437 FORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);437 ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);
438 if (iWidth == 16) {438 if (iWidth == 16) {
439 McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight);439 McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight);
440 PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, pTmp, 16, iHeight);440 PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, pTmp, 16, iHeight);
@@ -448,7 +448,7 @@ static inline void_t McHorVer03_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 7 unmodified lines
448}448}
449static inline void_t McHorVer10_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,449static inline void_t McHorVer10_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
450 int32_t iWidth, int32_t iHeight) {450 int32_t iWidth, int32_t iHeight) {
451 FORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);451 ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);
452 if (iWidth == 16) {452 if (iWidth == 16) {
453 McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight);453 McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight);
454 PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);454 PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
@@ -462,8 +462,8 @@ static inline void_t McHorVer10_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 7 unmodified lines
462}462}
463static inline void_t McHorVer11_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,463static inline void_t McHorVer11_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
464 int32_t iWidth, int32_t iHeight) {464 int32_t iWidth, int32_t iHeight) {
465 FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);465 ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
466 FORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);466 ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
467 if (iWidth == 16) {467 if (iWidth == 16) {
468 McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);468 McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);
469 McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pVerTmp, 16, iHeight);469 McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pVerTmp, 16, iHeight);
@@ -480,8 +480,8 @@ static inline void_t McHorVer11_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines
480}480}
481static inline void_t McHorVer12_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,481static inline void_t McHorVer12_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
482 int32_t iWidth, int32_t iHeight) {482 int32_t iWidth, int32_t iHeight) {
483 FORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);483 ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
484 FORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);484 ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
485 if (iWidth == 16) {485 if (iWidth == 16) {
486 McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pVerTmp, 16, iHeight);486 McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pVerTmp, 16, iHeight);
487 McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight);487 McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
@@ -498,8 +498,8 @@ static inline void_t McHorVer12_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines
498}498}
499static inline void_t McHorVer13_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,499static inline void_t McHorVer13_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
500 int32_t iWidth, int32_t iHeight) {500 int32_t iWidth, int32_t iHeight) {
501 FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);501 ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
502 FORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);502 ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
503 if (iWidth == 16) {503 if (iWidth == 16) {
504 McHorVer20WidthEq16_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);504 McHorVer20WidthEq16_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
505 McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pVerTmp, 16, iHeight);505 McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pVerTmp, 16, iHeight);
@@ -516,8 +516,8 @@ static inline void_t McHorVer13_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines
516}516}
517static inline void_t McHorVer21_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,517static inline void_t McHorVer21_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
518 int32_t iWidth, int32_t iHeight) {518 int32_t iWidth, int32_t iHeight) {
519 FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);519 ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
520 FORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);520 ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
521 if (iWidth == 16) {521 if (iWidth == 16) {
522 McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);522 McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);
523 McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight);523 McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
@@ -534,8 +534,8 @@ static inline void_t McHorVer21_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines
534}534}
535static inline void_t McHorVer23_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,535static inline void_t McHorVer23_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
536 int32_t iWidth, int32_t iHeight) {536 int32_t iWidth, int32_t iHeight) {
537 FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);537 ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
538 FORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);538 ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
539 if (iWidth == 16) {539 if (iWidth == 16) {
540 McHorVer20WidthEq16_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);540 McHorVer20WidthEq16_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
541 McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight);541 McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
@@ -552,7 +552,7 @@ static inline void_t McHorVer23_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines
552}552}
553static inline void_t McHorVer30_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,553static inline void_t McHorVer30_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
554 int32_t iWidth, int32_t iHeight) {554 int32_t iWidth, int32_t iHeight) {
555 FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);555 ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
556 if (iWidth == 16) {556 if (iWidth == 16) {
557 McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);557 McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);
558 PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc + 1, iSrcStride, pHorTmp, 16, iHeight);558 PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc + 1, iSrcStride, pHorTmp, 16, iHeight);
@@ -566,8 +566,8 @@ static inline void_t McHorVer30_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 7 unmodified lines
566}566}
567static inline void_t McHorVer31_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,567static inline void_t McHorVer31_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
568 int32_t iWidth, int32_t iHeight) {568 int32_t iWidth, int32_t iHeight) {
569 FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);569 ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
570 FORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);570 ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
571 if (iWidth == 16) {571 if (iWidth == 16) {
572 McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);572 McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);
573 McHorVer02WidthEq16_sse2 (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);573 McHorVer02WidthEq16_sse2 (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
@@ -584,8 +584,8 @@ static inline void_t McHorVer31_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines
584}584}
585static inline void_t McHorVer32_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,585static inline void_t McHorVer32_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
586 int32_t iWidth, int32_t iHeight) {586 int32_t iWidth, int32_t iHeight) {
587 FORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);587 ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
588 FORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);588 ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
589 if (iWidth == 16) {589 if (iWidth == 16) {
590 McHorVer02WidthEq16_sse2 (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);590 McHorVer02WidthEq16_sse2 (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
591 McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight);591 McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
@@ -602,8 +602,8 @@ static inline void_t McHorVer32_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t · 10 unmodified lines
602}602}
603static inline void_t McHorVer33_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,603static inline void_t McHorVer33_sse2 (uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
604 int32_t iWidth, int32_t iHeight) {604 int32_t iWidth, int32_t iHeight) {
605 FORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);605 ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
606 FORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);606 ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
607 if (iWidth == 16) {607 if (iWidth == 16) {
608 McHorVer20WidthEq16_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);608 McHorVer20WidthEq16_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
609 McHorVer02WidthEq16_sse2 (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);609 McHorVer02WidthEq16_sse2 (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
@@ -666,4 +666,4 @@ void_t InitMcFunc (SMcFunc* pMcFunc, int32_t iCpu) { · 56 unmodified lines
666#endif //(X86_ASM)666#endif //(X86_ASM)
667}667}
668 668
669} // namespace WelsDec669} // namespace WelsDec

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