virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/vf_overlay: exclude nv12/nv21 formats from x86 asm check

Browse Source 
They are yet to be supported,

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2018-05-03 09:22:28 +02:00
parent bad42e9b40
commit 0f0d468fbc
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/vf_overlay.c
View File

@ -921,7 +921,8 @@ static int config_input_main(AVFilterLink *inlink)
end: end:
if (ARCH_X86) if (ARCH_X86)
ff_overlay_init_x86(s, s->format, s->alpha_format, s->main_has_alpha); ff_overlay_init_x86(s, s->format, inlink->format,
s->alpha_format, s->main_has_alpha);
return 0; return 0;
} }

3
libavfilter/vf_overlay.h
View File

@ -80,6 +80,7 @@ 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 alpha_format, int main_has_alpha); void ff_overlay_init_x86(OverlayContext *s, int format, int pix_format,
int alpha_format, int main_has_alpha);
#endif /* AVFILTER_OVERLAY_H */ #endif /* AVFILTER_OVERLAY_H */

4
libavfilter/x86/vf_overlay_init.c
View File

@ -32,7 +32,8 @@ 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 alpha_format, int main_has_alpha) av_cold void ff_overlay_init_x86(OverlayContext *s, int format, int pix_format,
int alpha_format, int main_has_alpha)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
@ -46,6 +47,7 @@ av_cold void ff_overlay_init_x86(OverlayContext *s, int format, int alpha_format
} }
if (EXTERNAL_SSE4(cpu_flags) && if (EXTERNAL_SSE4(cpu_flags) &&
(pix_format == AV_PIX_FMT_YUV420P) &&
(format == OVERLAY_FORMAT_YUV420) && (format == OVERLAY_FORMAT_YUV420) &&
alpha_format == 0 && main_has_alpha == 0) { alpha_format == 0 && main_has_alpha == 0) {
s->blend_row[0] = ff_overlay_row_44_sse4; s->blend_row[0] = ff_overlay_row_44_sse4;