RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/af_dynaudnorm: make frame writable if it may be changed

This commit is contained in:
Paul B Mahol 2022-02-27 18:46:03 +01:00
parent b15c26a22c
commit b9f91a7cbc
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavfilter/af_dynaudnorm.c
View File

@ -631,15 +631,20 @@ static void perform_compression(DynamicAudioNormalizerContext *s, AVFrame *frame
} }
} }
static void analyze_frame(DynamicAudioNormalizerContext *s, AVFrame *frame) static int analyze_frame(DynamicAudioNormalizerContext *s, AVFrame *frame)
{ {
if (s->dc_correction) { if (s->dc_correction || s->compress_factor > DBL_EPSILON) {
perform_dc_correction(s, frame); int ret;
if ((ret = av_frame_make_writable(frame)) < 0)
return ret;
} }
if (s->compress_factor > DBL_EPSILON) { if (s->dc_correction)
perform_dc_correction(s, frame);
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);
@ -653,6 +658,8 @@ static void analyze_frame(DynamicAudioNormalizerContext *s, AVFrame *frame)
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;
} }
static void amplify_frame(DynamicAudioNormalizerContext *s, AVFrame *in, static void amplify_frame(DynamicAudioNormalizerContext *s, AVFrame *in,
@ -684,7 +691,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
DynamicAudioNormalizerContext *s = ctx->priv; DynamicAudioNormalizerContext *s = ctx->priv;
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
int ret = 1; int ret;
while (((s->queue.available >= s->filter_size) || while (((s->queue.available >= s->filter_size) ||
(s->eof && s->queue.available)) && (s->eof && s->queue.available)) &&
@ -712,9 +719,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
if (out != in) if (out != in)
av_frame_free(&in); av_frame_free(&in);
ret = ff_filter_frame(outlink, out); ret = ff_filter_frame(outlink, out);
if (ret < 0)
return ret;
} }
analyze_frame(s, in); ret = analyze_frame(s, in);
if (ret < 0)
return ret;
if (!s->eof) { if (!s->eof) {
ff_bufqueue_add(ctx, &s->queue, in); ff_bufqueue_add(ctx, &s->queue, in);
cqueue_enqueue(s->is_enabled, !ctx->is_disabled); cqueue_enqueue(s->is_enabled, !ctx->is_disabled);
@ -722,7 +733,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
av_frame_free(&in); av_frame_free(&in);
} }
return ret; return 1;
} }
static int flush_buffer(DynamicAudioNormalizerContext *s, AVFilterLink *inlink, static int flush_buffer(DynamicAudioNormalizerContext *s, AVFilterLink *inlink,