dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-08-29 23:32:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

dsp/lossless{,_enc}_sse2.c: reorder *_SSE assignments

Browse Source 
When `WEBP_USE_THREAD` is not defined the assignments of *_SSE and their
unsuffixed counterparts may race. Assigning *_SSE directly rather than
relying on the unsuffixed values avoids a case where the *_SSE variants
may refer to the calling function (i.e., AVX2) resulting in infinite
recursion.

Defining `WEBP_USE_THREAD` is recommended when decode/encode calls can
be made from different threads.

Bug: 435213378
Change-Id: Id5549730cb72be99b3014ed8e4e355f3ea988659
This commit is contained in:
James Zern
2025-08-07 13:23:11 -07:00
parent 4bcea04803
commit 2246828be3
3 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/dsp/lossless_sse2.c
View File

@@ -695,23 +695,28 @@ WEBP_TSAN_IGNORE_FUNCTION void VP8LDspInitSSE2(void) {
VP8LPredictors[12] = Predictor12_SSE2;
VP8LPredictors[13] = Predictor13_SSE2;
VP8LPredictorsAdd[0] = PredictorAdd0_SSE2;
VP8LPredictorsAdd[1] = PredictorAdd1_SSE2;
VP8LPredictorsAdd[2] = PredictorAdd2_SSE2;
VP8LPredictorsAdd[3] = PredictorAdd3_SSE2;
VP8LPredictorsAdd[4] = PredictorAdd4_SSE2;
VP8LPredictorsAdd[5] = PredictorAdd5_SSE2;
VP8LPredictorsAdd[6] = PredictorAdd6_SSE2;
VP8LPredictorsAdd[7] = PredictorAdd7_SSE2;
VP8LPredictorsAdd[8] = PredictorAdd8_SSE2;
VP8LPredictorsAdd[9] = PredictorAdd9_SSE2;
VP8LPredictorsAdd[10] = PredictorAdd10_SSE2;
VP8LPredictorsAdd[11] = PredictorAdd11_SSE2;
VP8LPredictorsAdd[12] = PredictorAdd12_SSE2;
VP8LPredictorsAdd[13] = PredictorAdd13_SSE2;
// SSE exports for AVX and above.
VP8LPredictorsAdd_SSE[0] = PredictorAdd0_SSE2;
VP8LPredictorsAdd_SSE[1] = PredictorAdd1_SSE2;
VP8LPredictorsAdd_SSE[2] = PredictorAdd2_SSE2;
VP8LPredictorsAdd_SSE[3] = PredictorAdd3_SSE2;
VP8LPredictorsAdd_SSE[4] = PredictorAdd4_SSE2;
VP8LPredictorsAdd_SSE[5] = PredictorAdd5_SSE2;
VP8LPredictorsAdd_SSE[6] = PredictorAdd6_SSE2;
VP8LPredictorsAdd_SSE[7] = PredictorAdd7_SSE2;
VP8LPredictorsAdd_SSE[8] = PredictorAdd8_SSE2;
VP8LPredictorsAdd_SSE[9] = PredictorAdd9_SSE2;
VP8LPredictorsAdd_SSE[10] = PredictorAdd10_SSE2;
VP8LPredictorsAdd_SSE[11] = PredictorAdd11_SSE2;
VP8LPredictorsAdd_SSE[12] = PredictorAdd12_SSE2;
VP8LPredictorsAdd_SSE[13] = PredictorAdd13_SSE2;
memcpy(VP8LPredictorsAdd, VP8LPredictorsAdd_SSE, sizeof(VP8LPredictorsAdd));
VP8LAddGreenToBlueAndRed = AddGreenToBlueAndRed_SSE2;
VP8LTransformColorInverse = TransformColorInverse_SSE2;
// SSE exports for AVX and above.
VP8LAddGreenToBlueAndRed_SSE = AddGreenToBlueAndRed_SSE2;
VP8LTransformColorInverse_SSE = TransformColorInverse_SSE2;
VP8LAddGreenToBlueAndRed = VP8LAddGreenToBlueAndRed_SSE;
VP8LTransformColorInverse = VP8LTransformColorInverse_SSE;
VP8LConvertBGRAToRGB = ConvertBGRAToRGB_SSE2;
VP8LConvertBGRAToRGBA = ConvertBGRAToRGBA_SSE2;
@@ -719,12 +724,6 @@ WEBP_TSAN_IGNORE_FUNCTION void VP8LDspInitSSE2(void) {
VP8LConvertBGRAToRGB565 = ConvertBGRAToRGB565_SSE2;
VP8LConvertBGRAToBGR = ConvertBGRAToBGR_SSE2;
// SSE exports for AVX and above.
memcpy(VP8LPredictorsAdd_SSE, VP8LPredictorsAdd, sizeof(VP8LPredictorsAdd));
VP8LAddGreenToBlueAndRed_SSE = AddGreenToBlueAndRed_SSE2;
VP8LTransformColorInverse_SSE = TransformColorInverse_SSE2;
VP8LConvertBGRAToRGB_SSE = ConvertBGRAToRGB_SSE2;
VP8LConvertBGRAToRGBA_SSE = ConvertBGRAToRGBA_SSE2;
}