History

Convert tabs to spaces in assignment of SIMD function pointers

Martin Storsjö committed 11 years ago

Commit 0ca7ff41 parent 95ac72712 files · +245 −245Browse files

Showing the changes to codec/encoder/core/src/encode_mb_aux.cpp (1 of 12 files). Show all

Unified · Split

codec/encoder/core/src/encode_mb_aux.cpp+73−73
@@ -462,63 +462,63 @@ int32_t WelsHadamardQuant2x2Skip_AArch64_neon (int16_t* pRes, int16_t iFF, int1 · 461 unmodified lines
462462 }
463463 #endif
464464 void WelsInitEncodingFuncs (SWelsFuncPtrList* pFuncList, uint32_t uiCpuFlag) {
465− pFuncList->pfCopy8x8Aligned = WelsCopy8x8_c;
466− pFuncList->pfCopy16x16Aligned =
467− pFuncList->pfCopy16x16NotAligned = WelsCopy16x16_c;
468− pFuncList->pfCopy16x8NotAligned = WelsCopy16x8_c;
469− pFuncList->pfCopy8x16Aligned = WelsCopy8x16_c;
465+ pFuncList->pfCopy8x8Aligned = WelsCopy8x8_c;
466+ pFuncList->pfCopy16x16Aligned =
467+ pFuncList->pfCopy16x16NotAligned = WelsCopy16x16_c;
468+ pFuncList->pfCopy16x8NotAligned = WelsCopy16x8_c;
469+ pFuncList->pfCopy8x16Aligned = WelsCopy8x16_c;
470470
471− pFuncList->pfQuantizationHadamard2x2 = WelsHadamardQuant2x2_c;
472− pFuncList->pfQuantizationHadamard2x2Skip = WelsHadamardQuant2x2Skip_c;
473− pFuncList->pfTransformHadamard4x4Dc = WelsHadamardT4Dc_c;
471+ pFuncList->pfQuantizationHadamard2x2 = WelsHadamardQuant2x2_c;
472+ pFuncList->pfQuantizationHadamard2x2Skip = WelsHadamardQuant2x2Skip_c;
473+ pFuncList->pfTransformHadamard4x4Dc = WelsHadamardT4Dc_c;
474474
475− pFuncList->pfDctT4 = WelsDctT4_c;
476− pFuncList->pfDctFourT4 = WelsDctFourT4_c;
475+ pFuncList->pfDctT4 = WelsDctT4_c;
476+ pFuncList->pfDctFourT4 = WelsDctFourT4_c;
477477
478− pFuncList->pfScan4x4 = WelsScan4x4DcAc_c;
479− pFuncList->pfScan4x4Ac = WelsScan4x4Ac_c;
480− pFuncList->pfCalculateSingleCtr4x4 = WelsCalculateSingleCtr4x4_c;
478+ pFuncList->pfScan4x4 = WelsScan4x4DcAc_c;
479+ pFuncList->pfScan4x4Ac = WelsScan4x4Ac_c;
480+ pFuncList->pfCalculateSingleCtr4x4 = WelsCalculateSingleCtr4x4_c;
481481
482− pFuncList->pfGetNoneZeroCount = WelsGetNoneZeroCount_c;
482+ pFuncList->pfGetNoneZeroCount = WelsGetNoneZeroCount_c;
483483
484− pFuncList->pfQuantization4x4 = WelsQuant4x4_c;
485− pFuncList->pfQuantizationDc4x4 = WelsQuant4x4Dc_c;
486− pFuncList->pfQuantizationFour4x4 = WelsQuantFour4x4_c;
487− pFuncList->pfQuantizationFour4x4Max = WelsQuantFour4x4Max_c;
484+ pFuncList->pfQuantization4x4 = WelsQuant4x4_c;
485+ pFuncList->pfQuantizationDc4x4 = WelsQuant4x4Dc_c;
486+ pFuncList->pfQuantizationFour4x4 = WelsQuantFour4x4_c;
487+ pFuncList->pfQuantizationFour4x4Max = WelsQuantFour4x4Max_c;
488488
489489 #if defined(X86_ASM)
490490 if (uiCpuFlag & WELS_CPU_MMXEXT) {
491491
492− pFuncList->pfQuantizationHadamard2x2 = WelsHadamardQuant2x2_mmx;
493− pFuncList->pfQuantizationHadamard2x2Skip = WelsHadamardQuant2x2Skip_mmx;
492+ pFuncList->pfQuantizationHadamard2x2 = WelsHadamardQuant2x2_mmx;
493+ pFuncList->pfQuantizationHadamard2x2Skip = WelsHadamardQuant2x2Skip_mmx;
494494
495− pFuncList->pfDctT4 = WelsDctT4_mmx;
495+ pFuncList->pfDctT4 = WelsDctT4_mmx;
496496
497− pFuncList->pfCopy8x8Aligned = WelsCopy8x8_mmx;
498− pFuncList->pfCopy8x16Aligned = WelsCopy8x16_mmx;
497+ pFuncList->pfCopy8x8Aligned = WelsCopy8x8_mmx;
498+ pFuncList->pfCopy8x16Aligned = WelsCopy8x16_mmx;
499499 }
500500 if (uiCpuFlag & WELS_CPU_SSE2) {
501− pFuncList->pfGetNoneZeroCount = WelsGetNoneZeroCount_sse2;
502− pFuncList->pfTransformHadamard4x4Dc = WelsHadamardT4Dc_sse2;
501+ pFuncList->pfGetNoneZeroCount = WelsGetNoneZeroCount_sse2;
502+ pFuncList->pfTransformHadamard4x4Dc = WelsHadamardT4Dc_sse2;
503503
504− pFuncList->pfQuantization4x4 = WelsQuant4x4_sse2;
505− pFuncList->pfQuantizationDc4x4 = WelsQuant4x4Dc_sse2;
506− pFuncList->pfQuantizationFour4x4 = WelsQuantFour4x4_sse2;
507− pFuncList->pfQuantizationFour4x4Max = WelsQuantFour4x4Max_sse2;
504+ pFuncList->pfQuantization4x4 = WelsQuant4x4_sse2;
505+ pFuncList->pfQuantizationDc4x4 = WelsQuant4x4Dc_sse2;
506+ pFuncList->pfQuantizationFour4x4 = WelsQuantFour4x4_sse2;
507+ pFuncList->pfQuantizationFour4x4Max = WelsQuantFour4x4Max_sse2;
508508
509− pFuncList->pfCopy16x16Aligned = WelsCopy16x16_sse2;
510− pFuncList->pfCopy16x16NotAligned = WelsCopy16x16NotAligned_sse2;
511− pFuncList->pfCopy16x8NotAligned = WelsCopy16x8NotAligned_sse2;
509+ pFuncList->pfCopy16x16Aligned = WelsCopy16x16_sse2;
510+ pFuncList->pfCopy16x16NotAligned = WelsCopy16x16NotAligned_sse2;
511+ pFuncList->pfCopy16x8NotAligned = WelsCopy16x8NotAligned_sse2;
512512
513− pFuncList->pfScan4x4 = WelsScan4x4DcAc_sse2;
514− pFuncList->pfScan4x4Ac = WelsScan4x4Ac_sse2;
515− pFuncList->pfCalculateSingleCtr4x4 = WelsCalculateSingleCtr4x4_sse2;
513+ pFuncList->pfScan4x4 = WelsScan4x4DcAc_sse2;
514+ pFuncList->pfScan4x4Ac = WelsScan4x4Ac_sse2;
515+ pFuncList->pfCalculateSingleCtr4x4 = WelsCalculateSingleCtr4x4_sse2;
516516
517− pFuncList->pfDctFourT4 = WelsDctFourT4_sse2;
517+ pFuncList->pfDctFourT4 = WelsDctFourT4_sse2;
518518 }
519519 //#ifndef MACOS
520520 if (uiCpuFlag & WELS_CPU_SSSE3) {
521− pFuncList->pfScan4x4 = WelsScan4x4DcAc_ssse3;
521+ pFuncList->pfScan4x4 = WelsScan4x4DcAc_ssse3;
522522 }
523523
524524 //#endif//MACOS
@@ -527,47 +527,47 @@ void WelsInitEncodingFuncs (SWelsFuncPtrList* pFuncList, uint32_t uiCpuFlag) { · 2 unmodified lines
527527
528528 #if defined(HAVE_NEON)
529529 if (uiCpuFlag & WELS_CPU_NEON) {
530− pFuncList->pfQuantizationHadamard2x2 = WelsHadamardQuant2x2_neon;
531− pFuncList->pfQuantizationHadamard2x2Skip = WelsHadamardQuant2x2Skip_neon;
532− pFuncList->pfDctT4 = WelsDctT4_neon;
533− pFuncList->pfCopy8x8Aligned = WelsCopy8x8_neon;
534− pFuncList->pfCopy8x16Aligned = WelsCopy8x16_neon;
535−
536− pFuncList->pfGetNoneZeroCount = WelsGetNoneZeroCount_neon;
537− pFuncList->pfTransformHadamard4x4Dc = WelsHadamardT4Dc_neon;
538−
539− pFuncList->pfQuantization4x4 = WelsQuant4x4_neon;
540− pFuncList->pfQuantizationDc4x4 = WelsQuant4x4Dc_neon;
541− pFuncList->pfQuantizationFour4x4 = WelsQuantFour4x4_neon;
542− pFuncList->pfQuantizationFour4x4Max = WelsQuantFour4x4Max_neon;
543−
544− pFuncList->pfCopy16x16Aligned = WelsCopy16x16_neon;
545− pFuncList->pfCopy16x16NotAligned = WelsCopy16x16NotAligned_neon;
546− pFuncList->pfCopy16x8NotAligned = WelsCopy16x8NotAligned_neon;
547− pFuncList->pfDctFourT4 = WelsDctFourT4_neon;
530+ pFuncList->pfQuantizationHadamard2x2 = WelsHadamardQuant2x2_neon;
531+ pFuncList->pfQuantizationHadamard2x2Skip = WelsHadamardQuant2x2Skip_neon;
532+ pFuncList->pfDctT4 = WelsDctT4_neon;
533+ pFuncList->pfCopy8x8Aligned = WelsCopy8x8_neon;
534+ pFuncList->pfCopy8x16Aligned = WelsCopy8x16_neon;
535+
536+ pFuncList->pfGetNoneZeroCount = WelsGetNoneZeroCount_neon;
537+ pFuncList->pfTransformHadamard4x4Dc = WelsHadamardT4Dc_neon;
538+
539+ pFuncList->pfQuantization4x4 = WelsQuant4x4_neon;
540+ pFuncList->pfQuantizationDc4x4 = WelsQuant4x4Dc_neon;
541+ pFuncList->pfQuantizationFour4x4 = WelsQuantFour4x4_neon;
542+ pFuncList->pfQuantizationFour4x4Max = WelsQuantFour4x4Max_neon;
543+
544+ pFuncList->pfCopy16x16Aligned = WelsCopy16x16_neon;
545+ pFuncList->pfCopy16x16NotAligned = WelsCopy16x16NotAligned_neon;
546+ pFuncList->pfCopy16x8NotAligned = WelsCopy16x8NotAligned_neon;
547+ pFuncList->pfDctFourT4 = WelsDctFourT4_neon;
548548 }
549549 #endif
550550
551551 #if defined(HAVE_NEON_AARCH64)
552552 if (uiCpuFlag & WELS_CPU_NEON) {
553− pFuncList->pfQuantizationHadamard2x2 = WelsHadamardQuant2x2_AArch64_neon;
554− pFuncList->pfQuantizationHadamard2x2Skip = WelsHadamardQuant2x2Skip_AArch64_neon;
555− pFuncList->pfDctT4 = WelsDctT4_AArch64_neon;
556− pFuncList->pfCopy8x8Aligned = WelsCopy8x8_AArch64_neon;
557− pFuncList->pfCopy8x16Aligned = WelsCopy8x16_AArch64_neon;
558−
559− pFuncList->pfGetNoneZeroCount = WelsGetNoneZeroCount_AArch64_neon;
560− pFuncList->pfTransformHadamard4x4Dc = WelsHadamardT4Dc_AArch64_neon;
561−
562− pFuncList->pfQuantization4x4 = WelsQuant4x4_AArch64_neon;
563− pFuncList->pfQuantizationDc4x4 = WelsQuant4x4Dc_AArch64_neon;
564− pFuncList->pfQuantizationFour4x4 = WelsQuantFour4x4_AArch64_neon;
565− pFuncList->pfQuantizationFour4x4Max = WelsQuantFour4x4Max_AArch64_neon;
566−
567− pFuncList->pfCopy16x16Aligned = WelsCopy16x16_AArch64_neon;
568− pFuncList->pfCopy16x16NotAligned = WelsCopy16x16NotAligned_AArch64_neon;
569− pFuncList->pfCopy16x8NotAligned = WelsCopy16x8NotAligned_AArch64_neon;
570− pFuncList->pfDctFourT4 = WelsDctFourT4_AArch64_neon;
553+ pFuncList->pfQuantizationHadamard2x2 = WelsHadamardQuant2x2_AArch64_neon;
554+ pFuncList->pfQuantizationHadamard2x2Skip = WelsHadamardQuant2x2Skip_AArch64_neon;
555+ pFuncList->pfDctT4 = WelsDctT4_AArch64_neon;
556+ pFuncList->pfCopy8x8Aligned = WelsCopy8x8_AArch64_neon;
557+ pFuncList->pfCopy8x16Aligned = WelsCopy8x16_AArch64_neon;
558+
559+ pFuncList->pfGetNoneZeroCount = WelsGetNoneZeroCount_AArch64_neon;
560+ pFuncList->pfTransformHadamard4x4Dc = WelsHadamardT4Dc_AArch64_neon;
561+
562+ pFuncList->pfQuantization4x4 = WelsQuant4x4_AArch64_neon;
563+ pFuncList->pfQuantizationDc4x4 = WelsQuant4x4Dc_AArch64_neon;
564+ pFuncList->pfQuantizationFour4x4 = WelsQuantFour4x4_AArch64_neon;
565+ pFuncList->pfQuantizationFour4x4Max = WelsQuantFour4x4Max_AArch64_neon;
566+
567+ pFuncList->pfCopy16x16Aligned = WelsCopy16x16_AArch64_neon;
568+ pFuncList->pfCopy16x16NotAligned = WelsCopy16x16NotAligned_AArch64_neon;
569+ pFuncList->pfCopy16x8NotAligned = WelsCopy16x8NotAligned_AArch64_neon;
570+ pFuncList->pfDctFourT4 = WelsDctFourT4_AArch64_neon;
571571 }
572572 #endif
573573 }

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