diff options
| author | Paul B Mahol <onemda@gmail.com> | 2017-08-24 14:43:00 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2017-08-24 14:45:52 +0200 |
| commit | f8d0689d3ff56bdeda708a14fad322cef8a219af (patch) | |
| tree | 062e50d0eede0f49b765bdec921916ab54e037eb /libavfilter/x86 | |
| parent | f61e2dcfc399113e1b0408e58a085fca329d0da4 (diff) | |
| download | ffmpeg-f8d0689d3ff56bdeda708a14fad322cef8a219af.tar.gz | |
avfilter/vf_blend: rename addition128 and difference128 to grainmerge and grainextract
Diffstat (limited to 'libavfilter/x86')
| -rw-r--r-- | libavfilter/x86/vf_blend.asm | 4 | ||||
| -rw-r--r-- | libavfilter/x86/vf_blend_init.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libavfilter/x86/vf_blend.asm b/libavfilter/x86/vf_blend.asm index cef479d995..4916aaf251 100644 --- a/libavfilter/x86/vf_blend.asm +++ b/libavfilter/x86/vf_blend.asm @@ -83,7 +83,7 @@ BLEND_SIMPLE subtract, subusb BLEND_SIMPLE darken, minub BLEND_SIMPLE lighten, maxub -BLEND_INIT difference128, 4 +BLEND_INIT grainextract, 4 pxor m2, m2 mova m3, [pw_128] .nextrow: @@ -181,7 +181,7 @@ BLEND_INIT average, 3 jl .loop BLEND_END -BLEND_INIT addition128, 4 +BLEND_INIT grainmerge, 4 pxor m2, m2 mova m3, [pw_128] .nextrow: diff --git a/libavfilter/x86/vf_blend_init.c b/libavfilter/x86/vf_blend_init.c index 71f9b0a685..a4fc9af246 100644 --- a/libavfilter/x86/vf_blend_init.c +++ b/libavfilter/x86/vf_blend_init.c @@ -31,11 +31,11 @@ void ff_blend_##name##_##opt(const uint8_t *top, ptrdiff_t top_linesize, \ struct FilterParams *param, double *values, int starty); BLEND_FUNC(addition, sse2) -BLEND_FUNC(addition128, sse2) +BLEND_FUNC(grainmerge, sse2) BLEND_FUNC(average, sse2) BLEND_FUNC(and, sse2) BLEND_FUNC(darken, sse2) -BLEND_FUNC(difference128, sse2) +BLEND_FUNC(grainextract, sse2) BLEND_FUNC(multiply, sse2) BLEND_FUNC(screen, sse2) BLEND_FUNC(hardmix, sse2) @@ -59,29 +59,29 @@ av_cold void ff_blend_init_x86(FilterParams *param, int is_16bit) if (EXTERNAL_SSE2(cpu_flags) && param->opacity == 1 && !is_16bit) { switch (param->mode) { case BLEND_ADDITION: param->blend = ff_blend_addition_sse2; break; - case BLEND_ADDITION128: param->blend = ff_blend_addition128_sse2; break; + case BLEND_GRAINMERGE: param->blend = ff_blend_grainmerge_sse2; break; case BLEND_AND: param->blend = ff_blend_and_sse2; break; case BLEND_AVERAGE: param->blend = ff_blend_average_sse2; break; case BLEND_DARKEN: param->blend = ff_blend_darken_sse2; break; - case BLEND_DIFFERENCE128: param->blend = ff_blend_difference128_sse2; break; + case BLEND_GRAINEXTRACT: param->blend = ff_blend_grainextract_sse2; break; case BLEND_DIVIDE: param->blend = ff_blend_divide_sse2; break; case BLEND_HARDMIX: param->blend = ff_blend_hardmix_sse2; break; case BLEND_LIGHTEN: param->blend = ff_blend_lighten_sse2; break; case BLEND_MULTIPLY: param->blend = ff_blend_multiply_sse2; break; case BLEND_OR: param->blend = ff_blend_or_sse2; break; case BLEND_PHOENIX: param->blend = ff_blend_phoenix_sse2; break; - case BLEND_SCREEN: param->blend = ff_blend_screen_sse2; break; + case BLEND_SCREEN: param->blend = ff_blend_screen_sse2; break; case BLEND_SUBTRACT: param->blend = ff_blend_subtract_sse2; break; case BLEND_XOR: param->blend = ff_blend_xor_sse2; break; case BLEND_DIFFERENCE: param->blend = ff_blend_difference_sse2; break; - case BLEND_EXTREMITY: param->blend = ff_blend_extremity_sse2; break; + case BLEND_EXTREMITY: param->blend = ff_blend_extremity_sse2; break; case BLEND_NEGATION: param->blend = ff_blend_negation_sse2; break; } } if (EXTERNAL_SSSE3(cpu_flags) && param->opacity == 1 && !is_16bit) { switch (param->mode) { case BLEND_DIFFERENCE: param->blend = ff_blend_difference_ssse3; break; - case BLEND_EXTREMITY: param->blend = ff_blend_extremity_ssse3; break; + case BLEND_EXTREMITY: param->blend = ff_blend_extremity_ssse3; break; case BLEND_NEGATION: param->blend = ff_blend_negation_ssse3; break; } } |