virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

avfilter/x86/vf_overlay: simplify function signature

Browse Source 
No reason to pass all the variables again, if we're already passing the
context.
This commit is contained in:
Niklas Haas
2025-08-13 15:16:38 +02:00
parent 59bb51a8f2
commit ba8aa0e7b3
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/vf_overlay.c
View File

@@ -836,7 +836,7 @@ static int init_slice_fn(AVFilterContext *ctx)
} }
#if ARCH_X86 #if ARCH_X86
ff_overlay_init_x86(s, s->format, main->format, overlay->alpha_mode, s->main_has_alpha); ff_overlay_init_x86(ctx);
#endif #endif
return 0; return 0;

3
libavfilter/vf_overlay.h
View File

@@ -82,7 +82,6 @@ typedef struct OverlayContext {
int (*blend_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); int (*blend_slice)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs);
} OverlayContext; } OverlayContext;
void ff_overlay_init_x86(OverlayContext *s, int format, int pix_format, void ff_overlay_init_x86(AVFilterContext *ctx);
enum AVAlphaMode overlay_alpha, int main_has_alpha);
#endif /* AVFILTER_OVERLAY_H */ #endif /* AVFILTER_OVERLAY_H */

23
libavfilter/x86/vf_overlay_init.c
View File

@@ -32,32 +32,35 @@ int ff_overlay_row_20_sse4(uint8_t *d, uint8_t *da, uint8_t *s, uint8_t *a,
int ff_overlay_row_22_sse4(uint8_t *d, uint8_t *da, uint8_t *s, uint8_t *a, int ff_overlay_row_22_sse4(uint8_t *d, uint8_t *da, uint8_t *s, uint8_t *a,
int w, ptrdiff_t alinesize); int w, ptrdiff_t alinesize);
av_cold void ff_overlay_init_x86(OverlayContext *s, int format, int pix_format, av_cold void ff_overlay_init_x86(AVFilterContext *ctx)
enum AVAlphaMode overlay_alpha, int main_has_alpha)
{ {
OverlayContext *s = ctx->priv;
const AVFilterLink *main = ctx->inputs[0];
const AVFilterLink *overlay = ctx->inputs[0];
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
int main_has_alpha = s->main_has_alpha;
if (EXTERNAL_SSE4(cpu_flags) && if (EXTERNAL_SSE4(cpu_flags) &&
(format == OVERLAY_FORMAT_YUV444 || (s->format == OVERLAY_FORMAT_YUV444 ||
format == OVERLAY_FORMAT_GBRP) && s->format == OVERLAY_FORMAT_GBRP) &&
overlay_alpha != AVALPHA_MODE_PREMULTIPLIED && main_has_alpha == 0) { overlay->alpha_mode != AVALPHA_MODE_PREMULTIPLIED && !main_has_alpha) {
s->blend_row[0] = ff_overlay_row_44_sse4; s->blend_row[0] = ff_overlay_row_44_sse4;
s->blend_row[1] = ff_overlay_row_44_sse4; s->blend_row[1] = ff_overlay_row_44_sse4;
s->blend_row[2] = ff_overlay_row_44_sse4; s->blend_row[2] = ff_overlay_row_44_sse4;
} }
if (EXTERNAL_SSE4(cpu_flags) && if (EXTERNAL_SSE4(cpu_flags) &&
(pix_format == AV_PIX_FMT_YUV420P) && (main->format == AV_PIX_FMT_YUV420P) &&
(format == OVERLAY_FORMAT_YUV420) && (s->format == OVERLAY_FORMAT_YUV420) &&
overlay_alpha != AVALPHA_MODE_PREMULTIPLIED && main_has_alpha == 0) { overlay->alpha_mode != AVALPHA_MODE_PREMULTIPLIED && !main_has_alpha) {
s->blend_row[0] = ff_overlay_row_44_sse4; s->blend_row[0] = ff_overlay_row_44_sse4;
s->blend_row[1] = ff_overlay_row_20_sse4; s->blend_row[1] = ff_overlay_row_20_sse4;
s->blend_row[2] = ff_overlay_row_20_sse4; s->blend_row[2] = ff_overlay_row_20_sse4;
} }
if (EXTERNAL_SSE4(cpu_flags) && if (EXTERNAL_SSE4(cpu_flags) &&
(format == OVERLAY_FORMAT_YUV422) && (s->format == OVERLAY_FORMAT_YUV422) &&
overlay_alpha != AVALPHA_MODE_PREMULTIPLIED && main_has_alpha == 0) { overlay->alpha_mode != AVALPHA_MODE_PREMULTIPLIED && !main_has_alpha) {
s->blend_row[0] = ff_overlay_row_44_sse4; s->blend_row[0] = ff_overlay_row_44_sse4;
s->blend_row[1] = ff_overlay_row_22_sse4; s->blend_row[1] = ff_overlay_row_22_sse4;
s->blend_row[2] = ff_overlay_row_22_sse4; s->blend_row[2] = ff_overlay_row_22_sse4;