Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avfilter/blend: put slice parameters to a single struct

Browse source 
This should make future extensibility easier.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2024-05-08 23:05:27 +02:00
parent 77fc047bd9
commit a69a0b689c
5 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libavfilter/blend.h
View file

@ -69,6 +69,11 @@ enum BlendMode {
BLEND_NB BLEND_NB
}; };
typedef struct SliceParams {
double *values;
int starty;
} SliceParams;
typedef struct FilterParams { typedef struct FilterParams {
enum BlendMode mode; enum BlendMode mode;
double opacity; double opacity;
@ -78,7 +83,7 @@ typedef struct FilterParams {
const uint8_t *bottom, ptrdiff_t bottom_linesize, const uint8_t *bottom, ptrdiff_t bottom_linesize,
uint8_t *dst, ptrdiff_t dst_linesize, uint8_t *dst, ptrdiff_t dst_linesize,
ptrdiff_t width, ptrdiff_t height, ptrdiff_t width, ptrdiff_t height,
struct FilterParams *param, double *values, int starty); struct FilterParams *param, SliceParams *sliceparam);
} FilterParams; } FilterParams;
void ff_blend_init_x86(FilterParams *param, int depth); void ff_blend_init_x86(FilterParams *param, int depth);

2
libavfilter/blend_modes.c
View file

@ -91,7 +91,7 @@ static void fn0(NAME)(const uint8_t *_top, ptrdiff_t top_linesize, \
const uint8_t *_bottom, ptrdiff_t bottom_linesize, \ const uint8_t *_bottom, ptrdiff_t bottom_linesize, \
uint8_t *_dst, ptrdiff_t dst_linesize, \ uint8_t *_dst, ptrdiff_t dst_linesize, \
ptrdiff_t width, ptrdiff_t height, \ ptrdiff_t width, ptrdiff_t height, \
FilterParams *param, double *values, int starty) \ FilterParams *param, SliceParams *sliceparam) \
{ \ { \
const PIXEL *top = (const PIXEL *)_top; \ const PIXEL *top = (const PIXEL *)_top; \
const PIXEL *bottom = (const PIXEL *)_bottom; \ const PIXEL *bottom = (const PIXEL *)_bottom; \

7
libavfilter/vf_blend.c
View file

@ -132,10 +132,12 @@ static void blend_expr_## name(const uint8_t *_top, ptrdiff_t top_linesize,
const uint8_t *_bottom, ptrdiff_t bottom_linesize, \ const uint8_t *_bottom, ptrdiff_t bottom_linesize, \
uint8_t *_dst, ptrdiff_t dst_linesize, \ uint8_t *_dst, ptrdiff_t dst_linesize, \
ptrdiff_t width, ptrdiff_t height, \ ptrdiff_t width, ptrdiff_t height, \
FilterParams *param, double *values, int starty) \ FilterParams *param, SliceParams *sliceparam) \
{ \ { \
const type *top = (const type*)_top; \ const type *top = (const type*)_top; \
const type *bottom = (const type*)_bottom; \ const type *bottom = (const type*)_bottom; \
double *values = sliceparam->values; \
int starty = sliceparam->starty; \
type *dst = (type*)_dst; \ type *dst = (type*)_dst; \
AVExpr *e = param->e; \ AVExpr *e = param->e; \
int y, x; \ int y, x; \
@ -171,6 +173,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
const uint8_t *bottom = td->bottom->data[td->plane]; const uint8_t *bottom = td->bottom->data[td->plane];
uint8_t *dst = td->dst->data[td->plane]; uint8_t *dst = td->dst->data[td->plane];
double values[VAR_VARS_NB]; double values[VAR_VARS_NB];
SliceParams sliceparam = {.values = &values[0], .starty = slice_start};
values[VAR_N] = td->inlink->frame_count_out; values[VAR_N] = td->inlink->frame_count_out;
values[VAR_T] = td->dst->pts == AV_NOPTS_VALUE ? NAN : td->dst->pts * av_q2d(td->inlink->time_base); values[VAR_T] = td->dst->pts == AV_NOPTS_VALUE ? NAN : td->dst->pts * av_q2d(td->inlink->time_base);
@ -185,7 +188,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
td->bottom->linesize[td->plane], td->bottom->linesize[td->plane],
dst + slice_start * td->dst->linesize[td->plane], dst + slice_start * td->dst->linesize[td->plane],
td->dst->linesize[td->plane], td->dst->linesize[td->plane],
td->w, height, td->param, &values[0], slice_start); td->w, height, td->param, &sliceparam);
return 0; return 0;
} }

4
libavfilter/vf_blend_init.h
View file

@ -58,7 +58,7 @@ static void blend_copy ## src##_##depth(const uint8_t *top, ptrdiff_t top_linesi
const uint8_t *bottom, ptrdiff_t bottom_linesize,\ const uint8_t *bottom, ptrdiff_t bottom_linesize,\
uint8_t *dst, ptrdiff_t dst_linesize, \ uint8_t *dst, ptrdiff_t dst_linesize, \
ptrdiff_t width, ptrdiff_t height, \ ptrdiff_t width, ptrdiff_t height, \
FilterParams *param, double *values, int starty) \ FilterParams *param, SliceParams *sliceparam) \
{ \ { \
av_image_copy_plane(dst, dst_linesize, src, src ## _linesize, \ av_image_copy_plane(dst, dst_linesize, src, src ## _linesize, \
width * depth / 8, height); \ width * depth / 8, height); \
@ -80,7 +80,7 @@ static void blend_normal_##name(const uint8_t *_top, ptrdiff_t top_linesize,
const uint8_t *_bottom, ptrdiff_t bottom_linesize,\ const uint8_t *_bottom, ptrdiff_t bottom_linesize,\
uint8_t *_dst, ptrdiff_t dst_linesize, \ uint8_t *_dst, ptrdiff_t dst_linesize, \
ptrdiff_t width, ptrdiff_t height, \ ptrdiff_t width, ptrdiff_t height, \
FilterParams *param, double *values, int starty) \ FilterParams *param, SliceParams *sliceparam) \
{ \ { \
const type *top = (const type*)_top; \ const type *top = (const type*)_top; \
const type *bottom = (const type*)_bottom; \ const type *bottom = (const type*)_bottom; \

2
libavfilter/x86/vf_blend_init.c
View file

@ -28,7 +28,7 @@ void ff_blend_##name##_##opt(const uint8_t *top, ptrdiff_t top_linesize, \
const uint8_t *bottom, ptrdiff_t bottom_linesize, \ const uint8_t *bottom, ptrdiff_t bottom_linesize, \
uint8_t *dst, ptrdiff_t dst_linesize, \ uint8_t *dst, ptrdiff_t dst_linesize, \
ptrdiff_t width, ptrdiff_t height, \ ptrdiff_t width, ptrdiff_t height, \
struct FilterParams *param, double *values, int starty); FilterParams *param, SliceParams *sliceparam);
BLEND_FUNC(addition, sse2) BLEND_FUNC(addition, sse2)
BLEND_FUNC(addition, avx2) BLEND_FUNC(addition, avx2)