virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity

avfilter/af_dynaudnorm: allocate new frame instead of making it writable

Browse Source 
Later case does not use frame pool at all.
This commit is contained in:
Paul B Mahol 2022-02-27 19:58:06 +01:00
parent a9124a75b0
commit a2dbd17788
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libavfilter/af_dynaudnorm.c
View File

@ -647,23 +647,42 @@ static void perform_compression(DynamicAudioNormalizerContext *s, AVFrame *frame
} }
} }
static int analyze_frame(DynamicAudioNormalizerContext *s, AVFrame *frame) static int analyze_frame(DynamicAudioNormalizerContext *s, AVFilterLink *outlink, AVFrame **frame)
{ {
if (s->dc_correction || s->compress_factor > DBL_EPSILON) { if (s->dc_correction || s->compress_factor > DBL_EPSILON) {
int ret; int ret;
if ((ret = av_frame_make_writable(frame)) < 0) if (!av_frame_is_writable(*frame)) {
return ret; AVFrame *out = ff_get_audio_buffer(outlink, (*frame)->nb_samples);
if (!out) {
av_frame_free(frame);
return AVERROR(ENOMEM);
}
ret = av_frame_copy_props(out, *frame);
if (ret < 0) {
av_frame_free(&out);
return ret;
}
ret = av_frame_copy(out, *frame);
if (ret < 0) {
av_frame_free(&out);
return ret;
}
av_frame_free(frame);
*frame = out;
}
} }
if (s->dc_correction) if (s->dc_correction)
perform_dc_correction(s, frame); perform_dc_correction(s, *frame);
if (s->compress_factor > DBL_EPSILON) if (s->compress_factor > DBL_EPSILON)
perform_compression(s, frame); perform_compression(s, *frame);
if (s->channels_coupled) { if (s->channels_coupled) {
const local_gain gain = get_max_local_gain(s, frame, -1); const local_gain gain = get_max_local_gain(s, *frame, -1);
int c; int c;
for (c = 0; c < s->channels; c++) for (c = 0; c < s->channels; c++)
@ -672,7 +691,7 @@ static int analyze_frame(DynamicAudioNormalizerContext *s, AVFrame *frame)
int c; int c;
for (c = 0; c < s->channels; c++) for (c = 0; c < s->channels; c++)
update_gain_history(s, c, get_max_local_gain(s, frame, c)); update_gain_history(s, c, get_max_local_gain(s, *frame, c));
} }
return 0; return 0;
@ -740,7 +759,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
return ret; return ret;
} }
ret = analyze_frame(s, in); ret = analyze_frame(s, outlink, &in);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (!s->eof) { if (!s->eof) {