virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avfilter/vf_overlay: Pass variable type directly in macro

Browse Source 
Improves readability.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-06-04 16:28:08 +02:00
parent ca51a0fef7
commit b3edc84872
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libavfilter/vf_overlay.c
View File

@ -444,7 +444,7 @@ static av_always_inline void blend_slice_packed_rgb(AVFilterContext *ctx,
} }
} }
#define DEFINE_BLEND_PLANE(depth, nbits) \ #define DEFINE_BLEND_PLANE(depth, T, nbits) \
static av_always_inline void blend_plane_##depth##_##nbits##bits(AVFilterContext *ctx, \ static av_always_inline void blend_plane_##depth##_##nbits##bits(AVFilterContext *ctx, \
AVFrame *dst, const AVFrame *src, \ AVFrame *dst, const AVFrame *src, \
int src_w, int src_h, \ int src_w, int src_h, \
@ -469,8 +469,8 @@ static av_always_inline void blend_plane_##depth##_##nbits##bits(AVFilterContext
int xp = x>>hsub; \ int xp = x>>hsub; \
int jmax, j, k, kmax; \ int jmax, j, k, kmax; \
int slice_start, slice_end; \ int slice_start, slice_end; \
const uint##depth##_t max = (1 << nbits) - 1; \ const T max = (1 << nbits) - 1; \
const uint##depth##_t mid = (1 << (nbits -1)) ; \ const T mid = (1 << (nbits - 1)); \
int bytes = depth / 8; \ int bytes = depth / 8; \
\ \
dst_step /= bytes; \ dst_step /= bytes; \
@ -489,10 +489,10 @@ static av_always_inline void blend_plane_##depth##_##nbits##bits(AVFilterContext
\ \
for (j = slice_start; j < slice_end; j++) { \ for (j = slice_start; j < slice_end; j++) { \
k = FFMAX(-xp, 0); \ k = FFMAX(-xp, 0); \
const uint##depth##_t *s = (const uint##depth##_t *)sp + k; \ const T *s = (const T *)sp + k; \
const uint##depth##_t *a = (const uint##depth##_t *)ap + (k<<hsub); \ const T *a = (const T *)ap + (k << hsub); \
const uint##depth##_t *da = main_has_alpha ? (uint##depth##_t *)dap + ((xp + k) << hsub) : NULL; \ const T *da = main_has_alpha ? (T *)dap + ((xp + k) << hsub) : NULL; \
uint##depth##_t *d = (uint##depth##_t *)dp + (xp + k) * dst_step; \ T *d = (T *)dp + (xp + k) * dst_step; \
kmax = FFMIN(-xp + dst_wp, src_wp); \ kmax = FFMIN(-xp + dst_wp, src_wp); \
\ \
if (nbits == 8 && ((vsub && j+1 < src_hp) || !vsub) && octx->blend_row[i]) { \ if (nbits == 8 && ((vsub && j+1 < src_hp) || !vsub) && octx->blend_row[i]) { \
@ -571,20 +571,20 @@ static av_always_inline void blend_plane_##depth##_##nbits##bits(AVFilterContext
dap += (1 << vsub) * dst->linesize[3]; \ dap += (1 << vsub) * dst->linesize[3]; \
} \ } \
} }
DEFINE_BLEND_PLANE(8, 8) DEFINE_BLEND_PLANE(8, uint8_t, 8)
DEFINE_BLEND_PLANE(16, 10) DEFINE_BLEND_PLANE(16, uint16_t, 10)
#define DEFINE_ALPHA_COMPOSITE(depth, nbits) \ #define DEFINE_ALPHA_COMPOSITE(depth, T, nbits) \
static inline void alpha_composite_##depth##_##nbits##bits(const AVFrame *src, const AVFrame *dst, \ static inline void alpha_composite_##depth##_##nbits##bits(const AVFrame *src, const AVFrame *dst, \
int src_w, int src_h, \ int src_w, int src_h, \
int dst_w, int dst_h, \ int dst_w, int dst_h, \
int x, int y, \ int x, int y, \
int jobnr, int nb_jobs) \ int jobnr, int nb_jobs) \
{ \ { \
uint##depth##_t alpha; /* the amount of overlay to blend on to main */ \ T alpha; /* the amount of overlay to blend on to main */ \
int i, imax, j, jmax; \ int i, imax, j, jmax; \
int slice_start, slice_end; \ int slice_start, slice_end; \
const uint##depth##_t max = (1 << nbits) - 1; \ const T max = (1 << nbits) - 1; \
\ \
imax = FFMIN3(-y + dst_h, FFMIN(src_h, dst_h), y + src_h); \ imax = FFMIN3(-y + dst_h, FFMIN(src_h, dst_h), y + src_h); \
i = FFMAX(-y, 0); \ i = FFMAX(-y, 0); \
@ -597,8 +597,8 @@ static inline void alpha_composite_##depth##_##nbits##bits(const AVFrame *src, c
\ \
for (i = slice_start; i < slice_end; i++) { \ for (i = slice_start; i < slice_end; i++) { \
j = FFMAX(-x, 0); \ j = FFMAX(-x, 0); \
const uint##depth##_t *s = (const uint##depth##_t *)sa + j; \ const T *s = (const T *)sa + j; \
uint##depth##_t *d = (uint##depth##_t *)da + x+j; \ T *d = (T *)da + x + j; \
\ \
for (jmax = FFMIN(-x + dst_w, src_w); j < jmax; j++) { \ for (jmax = FFMIN(-x + dst_w, src_w); j < jmax; j++) { \
alpha = *s; \ alpha = *s; \
@ -622,8 +622,8 @@ static inline void alpha_composite_##depth##_##nbits##bits(const AVFrame *src, c
sa += src->linesize[3]; \ sa += src->linesize[3]; \
} \ } \
} }
DEFINE_ALPHA_COMPOSITE(8, 8) DEFINE_ALPHA_COMPOSITE(8, uint8_t, 8)
DEFINE_ALPHA_COMPOSITE(16, 10) DEFINE_ALPHA_COMPOSITE(16, uint16_t, 10)
#define DEFINE_BLEND_SLICE_YUV(depth, nbits) \ #define DEFINE_BLEND_SLICE_YUV(depth, nbits) \
static av_always_inline void blend_slice_yuv_##depth##_##nbits##bits(AVFilterContext *ctx, \ static av_always_inline void blend_slice_yuv_##depth##_##nbits##bits(AVFilterContext *ctx, \