History

avfilter/avf_showcwt: reduce memory usage even more

Paul B Mahol committed 3 years ago

Commit 830e5221 parent 27804201 file · +4 −4Browse files

Unified · Split

libavfilter/avf_showcwt.c+4−4
@@ -578,6 +578,8 @@ static int run_channel_cwt(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo · 577 unmodified lines
578578 ShowCWTContext *s = ctx->priv;
579579 const int ch = *(int *)arg;
580580 const AVComplexFloat *fft_out = (const AVComplexFloat *)s->fft_out->extended_data[ch];
581+ AVComplexFloat *isrc = (AVComplexFloat *)s->ifft_in->extended_data[jobnr];
582+ AVComplexFloat *idst = (AVComplexFloat *)s->ifft_out->extended_data[jobnr];
581583 const int output_padding_size = s->output_padding_size;
582584 const int ihop_size = s->ihop_size;
583585 const int ioffset = (output_padding_size - ihop_size) >> 1;
@@ -586,8 +588,6 @@ static int run_channel_cwt(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo · 2 unmodified lines
586588 const int end = (count * (jobnr+1)) / nb_jobs;
587589
588590 for (int y = start; y < end; y++) {
589− AVComplexFloat *isrc = (AVComplexFloat *)s->ifft_in->extended_data[y];
590− AVComplexFloat *idst = (AVComplexFloat *)s->ifft_out->extended_data[y];
591591 AVComplexFloat *chout = ((AVComplexFloat *)s->ch_out->extended_data[ch]) + y * ihop_size;
592592 AVComplexFloat *dstx = (AVComplexFloat *)s->dst_x->extended_data[jobnr];
593593 AVComplexFloat *srcx = (AVComplexFloat *)s->src_x->extended_data[jobnr];
@@ -803,14 +803,14 @@ static int config_output(AVFilterLink *outlink) · 209 unmodified lines
803803
804804 s->ifft_in->format = inlink->format;
805805 s->ifft_in->nb_samples = s->ifft_in_size * 2;
806− s->ifft_in->ch_layout.nb_channels = s->frequency_band_count;
806+ s->ifft_in->ch_layout.nb_channels = s->nb_threads;
807807 ret = av_frame_get_buffer(s->ifft_in, 0);
808808 if (ret < 0)
809809 return ret;
810810
811811 s->ifft_out->format = inlink->format;
812812 s->ifft_out->nb_samples = s->ifft_out_size * 2;
813− s->ifft_out->ch_layout.nb_channels = s->frequency_band_count;
813+ s->ifft_out->ch_layout.nb_channels = s->nb_threads;
814814 ret = av_frame_get_buffer(s->ifft_out, 0);
815815 if (ret < 0)
816816 return ret;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t