Unified · Split
| @@ -578,6 +578,8 @@ static int run_channel_cwt(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo · 577 unmodified lines | |||
| 578 | ShowCWTContext *s = ctx->priv; | 578 | ShowCWTContext *s = ctx->priv; |
| 579 | const int ch = *(int *)arg; | 579 | const int ch = *(int *)arg; |
| 580 | const AVComplexFloat *fft_out = (const AVComplexFloat *)s->fft_out->extended_data[ch]; | 580 | 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]; | ||
| 581 | const int output_padding_size = s->output_padding_size; | 583 | const int output_padding_size = s->output_padding_size; |
| 582 | const int ihop_size = s->ihop_size; | 584 | const int ihop_size = s->ihop_size; |
| 583 | const int ioffset = (output_padding_size - ihop_size) >> 1; | 585 | 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 | |||
| 586 | const int end = (count * (jobnr+1)) / nb_jobs; | 588 | const int end = (count * (jobnr+1)) / nb_jobs; |
| 587 | 589 | ||
| 588 | for (int y = start; y < end; y++) { | 590 | 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]; | ||
| 591 | AVComplexFloat *chout = ((AVComplexFloat *)s->ch_out->extended_data[ch]) + y * ihop_size; | 591 | AVComplexFloat *chout = ((AVComplexFloat *)s->ch_out->extended_data[ch]) + y * ihop_size; |
| 592 | AVComplexFloat *dstx = (AVComplexFloat *)s->dst_x->extended_data[jobnr]; | 592 | AVComplexFloat *dstx = (AVComplexFloat *)s->dst_x->extended_data[jobnr]; |
| 593 | AVComplexFloat *srcx = (AVComplexFloat *)s->src_x->extended_data[jobnr]; | 593 | AVComplexFloat *srcx = (AVComplexFloat *)s->src_x->extended_data[jobnr]; |
| @@ -803,14 +803,14 @@ static int config_output(AVFilterLink *outlink) · 209 unmodified lines | |||
| 803 | 803 | ||
| 804 | s->ifft_in->format = inlink->format; | 804 | s->ifft_in->format = inlink->format; |
| 805 | s->ifft_in->nb_samples = s->ifft_in_size * 2; | 805 | 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; |
| 807 | ret = av_frame_get_buffer(s->ifft_in, 0); | 807 | ret = av_frame_get_buffer(s->ifft_in, 0); |
| 808 | if (ret < 0) | 808 | if (ret < 0) |
| 809 | return ret; | 809 | return ret; |
| 810 | 810 | ||
| 811 | s->ifft_out->format = inlink->format; | 811 | s->ifft_out->format = inlink->format; |
| 812 | s->ifft_out->nb_samples = s->ifft_out_size * 2; | 812 | 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; |
| 814 | ret = av_frame_get_buffer(s->ifft_out, 0); | 814 | ret = av_frame_get_buffer(s->ifft_out, 0); |
| 815 | if (ret < 0) | 815 | if (ret < 0) |
| 816 | return ret; | 816 | return ret; |