Unified · Split
| @@ -261,10 +261,11 @@ static inline float prelut_interp_1d_linear(const Lut3DPreLut *prelut, · 260 unmodified lines | |||
| 261 | static inline struct rgbvec apply_prelut(const Lut3DPreLut *prelut, | 261 | static inline struct rgbvec apply_prelut(const Lut3DPreLut *prelut, |
| 262 | const struct rgbvec *s) | 262 | const struct rgbvec *s) |
| 263 | { | 263 | { |
| 264 | struct rgbvec c; | ||
| 265 | |||
| 264 | if (prelut->size <= 0) | 266 | if (prelut->size <= 0) |
| 265 | return *s; | 267 | return *s; |
| 266 | 268 | ||
| 267 | struct rgbvec c; | ||
| 268 | c.r = prelut_interp_1d_linear(prelut, 0, s->r); | 269 | c.r = prelut_interp_1d_linear(prelut, 0, s->r); |
| 269 | c.g = prelut_interp_1d_linear(prelut, 1, s->g); | 270 | c.g = prelut_interp_1d_linear(prelut, 1, s->g); |
| 270 | c.b = prelut_interp_1d_linear(prelut, 2, s->b); | 271 | c.b = prelut_interp_1d_linear(prelut, 2, s->b); |
| @@ -975,17 +976,16 @@ static int parse_cinespace(AVFilterContext *ctx, FILE *f) · 704 unmodified lines | |||
| 975 | 976 | ||
| 976 | for (int i = 0; i < lut3d->prelut.size; ++i) { | 977 | for (int i = 0; i < lut3d->prelut.size; ++i) { |
| 977 | float mix = (float) i / (float)(lut3d->prelut.size - 1); | 978 | float mix = (float) i / (float)(lut3d->prelut.size - 1); |
| 978 | float x = lerpf(in_min[c], in_max[c], mix); | 979 | float x = lerpf(in_min[c], in_max[c], mix), a, b; |
| 979 | 980 | ||
| 980 | int idx = nearest_sample_index(in_prelut[c], x, 0, prelut_sizes[c]-1); | 981 | int idx = nearest_sample_index(in_prelut[c], x, 0, prelut_sizes[c]-1); |
| 981 | av_assert0(idx + 1 < prelut_sizes[c]); | 982 | av_assert0(idx + 1 < prelut_sizes[c]); |
| 982 | 983 | ||
| 983 | float a = out_prelut[c][idx + 0]; | 984 | a = out_prelut[c][idx + 0]; |
| 984 | float b = out_prelut[c][idx + 1]; | 985 | b = out_prelut[c][idx + 1]; |
| 985 | mix = x - in_prelut[c][idx]; | 986 | mix = x - in_prelut[c][idx]; |
| 986 | 987 | ||
| 987 | float outval = lerpf(a, b, mix); | 988 | lut3d->prelut.lut[c][i] = sanitizef(lerpf(a, b, mix)); |
| 988 | lut3d->prelut.lut[c][i] = sanitizef(outval); | ||
| 989 | } | 989 | } |
| 990 | } | 990 | } |
| 991 | lut3d->scale.r = 1.00f; | 991 | lut3d->scale.r = 1.00f; |