History

Align C version to asm function.

zhiliang wang committed 12 years ago

Commit eaf7d651 parent ae12fbd3 files · +6 −10Browse files

Showing the changes to codec/processing/src/downsample (3 of 3 files). Show all

Unified · Split

3 files
  1. codec/processing/src/downsample/downsample.cpp +2 −2
  2. codec/processing/src/downsample/downsample.h +2 −6
  3. codec/processing/src/downsample/downsamplefuncs.cpp +2 −2
codec/processing/src/downsample/downsample.cpp+2−2
@@ -66,8 +66,8 @@ void CDownsampling::InitDownsampleFuncs (SDownsampleFuncs& sDownsampleFunc, int · 65 unmodified lines
6666 sDownsampleFunc.pfGeneralRatioLuma = GeneralBilinearFastDownsamplerWrap_sse2;
6767 }
6868 if (iCpuFlag & WELS_CPU_SSSE3) {
69− sDownsampleFunc.pfHalfAverage[0] = DyadicBilinearDownsamplerWidthx32_ssse3;
70− sDownsampleFunc.pfHalfAverage[1] = DyadicBilinearDownsamplerWidthx16_ssse3;
69+ sDownsampleFunc.pfHalfAverage[0] = DyadicBilinearDownsamplerWidthx32_ssse3;
70+ sDownsampleFunc.pfHalfAverage[1] = DyadicBilinearDownsamplerWidthx16_ssse3;
7171 }
7272 if (iCpuFlag & WELS_CPU_SSE41) {
7373 sDownsampleFunc.pfHalfAverage[0] = DyadicBilinearDownsamplerWidthx32_sse4;
codec/processing/src/downsample/downsample.h+2−6
@@ -94,13 +94,9 @@ GeneralDownsampleFunc GeneralBilinearFastDownsamplerWrap_sse2; · 93 unmodified lines
9494 GeneralDownsampleFunc GeneralBilinearAccurateDownsamplerWrap_sse2;
9595
9696 void GeneralBilinearFastDownsampler_sse2 (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth,
97− const int32_t kiDstHeight,
98− uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight,
99− const uint32_t kuiScaleX, const uint32_t kuiScaleY);
97+ const int32_t kiDstHeight, uint8_t* pSrc, const int32_t kiSrcStride, const uint32_t kuiScaleX, const uint32_t kuiScaleY);
10098 void GeneralBilinearAccurateDownsampler_sse2 (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth,
101− const int32_t kiDstHeight,
102− uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight,
103− const uint32_t kuiScaleX, const uint32_t kuiScaleY);
99+ const int32_t kiDstHeight, uint8_t* pSrc, const int32_t kiSrcStride, const uint32_t kuiScaleX, const uint32_t kuiScaleY);
104100 WELSVP_EXTERN_C_END
105101 #endif
106102
codec/processing/src/downsample/downsamplefuncs.cpp+2−2
@@ -212,7 +212,7 @@ void GeneralBilinearFastDownsamplerWrap_sse2 (uint8_t* pDst, const int32_t kiDst · 211 unmodified lines
212212 uint32_t uiScaley = WELS_ROUND ((float)kiSrcHeight / (float)kiDstHeight * kuiScaleHeight);
213213
214214 GeneralBilinearFastDownsampler_sse2 (pDst, kiDstStride, kiDstWidth, kiDstHeight,
215− pSrc, kiSrcStride, kiSrcWidth, kiSrcHeight, uiScalex, uiScaley);
215+ pSrc, kiSrcStride, uiScalex, uiScaley);
216216 }
217217
218218 void GeneralBilinearAccurateDownsamplerWrap_sse2 (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth,
@@ -225,7 +225,7 @@ void GeneralBilinearAccurateDownsamplerWrap_sse2 (uint8_t* pDst, const int32_t k · 6 unmodified lines
225225 uint32_t uiScaley = WELS_ROUND ((float)kiSrcHeight / (float)kiDstHeight * kuiScale);
226226
227227 GeneralBilinearAccurateDownsampler_sse2 (pDst, kiDstStride, kiDstWidth, kiDstHeight,
228− pSrc, kiSrcStride, kiSrcWidth, kiSrcHeight, uiScalex, uiScaley);
228+ pSrc, kiSrcStride, uiScalex, uiScaley);
229229 }
230230 #endif //X86_ASM
231231

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