Browse code

swscale/arm/yuv2rgb: disable neon if accurate_rnd is enabled

This disables the 32bit precision neon code path in favor of the
default C one and avoids breaking fate.

Matthieu Bouron authored on 2015/12/18 22:24:52
Showing 1 changed files
... ...
@@ -100,7 +100,6 @@ DECLARE_FF_NVX_TO_RGBX_FUNCS(nvx, bgra, precision)
100 100
 
101 101
 #define DECLARE_FF_NVX_TO_ALL_RGBX_ALL_PRECISION_FUNCS(nvx)                                 \
102 102
 DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx, 16)                                                   \
103
-DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx, 32)                                                   \
104 103
 
105 104
 DECLARE_FF_NVX_TO_ALL_RGBX_ALL_PRECISION_FUNCS(nv12)
106 105
 DECLARE_FF_NVX_TO_ALL_RGBX_ALL_PRECISION_FUNCS(nv21)
... ...
@@ -113,9 +112,9 @@ DECLARE_FF_NVX_TO_ALL_RGBX_ALL_PRECISION_FUNCS(nv21)
113 113
     if (c->srcFormat == AV_PIX_FMT_##IFMT                                                   \
114 114
         && c->dstFormat == AV_PIX_FMT_##OFMT                                                \
115 115
         && !(c->srcH & 1)                                                                   \
116
-        && !(c->srcW & 15)) {                                                               \
117
-        c->swscale = (accurate_rnd) ? ifmt##_to_##ofmt##_neon_wrapper_32 :                  \
118
-                                      ifmt##_to_##ofmt##_neon_wrapper_16 ;                  \
116
+        && !(c->srcW & 15)                                                                  \
117
+        && !accurate_rnd) {                                                                 \
118
+        c->swscale = ifmt##_to_##ofmt##_neon_wrapper_16;                                    \
119 119
     }                                                                                       \
120 120
 } while (0)
121 121