RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-11 03:32:39 +00:00
Code Issues Projects Releases Wiki Activity

avfilter/vf_mix: improve speed of processing

Browse Source
This commit is contained in:
Paul B Mahol 2022-02-14 23:54:24 +01:00
parent e235c76487
commit 0da255dd10
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/vf_mix.c
View File

@ -138,6 +138,7 @@ static int mix_frames(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
ThreadData *td = arg; ThreadData *td = arg;
AVFrame **in = td->in; AVFrame **in = td->in;
AVFrame *out = td->out; AVFrame *out = td->out;
const float *weights = s->weights;
int i, p, x, y; int i, p, x, y;
if (s->depth <= 8) { if (s->depth <= 8) {
@ -148,15 +149,15 @@ static int mix_frames(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
for (y = slice_start; y < slice_end; y++) { for (y = slice_start; y < slice_end; y++) {
for (x = 0; x < s->linesize[p]; x++) { for (x = 0; x < s->linesize[p]; x++) {
int val = 0; float val = 0.f;
for (i = 0; i < s->nb_inputs; i++) { for (i = 0; i < s->nb_inputs; i++) {
uint8_t src = in[i]->data[p][y * in[i]->linesize[p] + x]; uint8_t src = in[i]->data[p][y * in[i]->linesize[p] + x];
val += src * s->weights[i]; val += src * weights[i];
} }
dst[x] = av_clip_uint8(val * s->wfactor); dst[x] = av_clip_uint8(lrintf(val * s->wfactor));
} }
dst += out->linesize[p]; dst += out->linesize[p];
@ -170,15 +171,15 @@ static int mix_frames(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
for (y = slice_start; y < slice_end; y++) { for (y = slice_start; y < slice_end; y++) {
for (x = 0; x < s->linesize[p] / 2; x++) { for (x = 0; x < s->linesize[p] / 2; x++) {
int val = 0; float val = 0.f;
for (i = 0; i < s->nb_inputs; i++) { for (i = 0; i < s->nb_inputs; i++) {
uint16_t src = AV_RN16(in[i]->data[p] + y * in[i]->linesize[p] + x * 2); uint16_t src = AV_RN16(in[i]->data[p] + y * in[i]->linesize[p] + x * 2);
val += src * s->weights[i]; val += src * weights[i];
} }
dst[x] = av_clip(val * s->wfactor, 0, s->max); dst[x] = av_clip(lrintf(val * s->wfactor), 0, s->max);
} }
dst += out->linesize[p] / 2; dst += out->linesize[p] / 2;