generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/vf_waveform: simplify memory allocations

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2015-08-31 16:45:55 +00:00
parent 32f217edad
commit 97c7c39d25
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavfilter/vf_waveform.c
View File

@ -52,6 +52,7 @@ typedef struct WaveformContext {
int eend[4];
int *emax[4];
int *emin[4];
int *peak;
int filter;
int size;
void (*waveform)(struct WaveformContext *s, AVFrame *in, AVFrame *out,
@ -908,19 +909,20 @@ static int config_output(AVFilterLink *outlink)
comp++;
}
for (p = 0; p < 4; p++) {
av_freep(&s->emax[p]);
av_freep(&s->emin[p]);
}
av_freep(&s->peak);
if (s->mode) {
outlink->h = s->size * FFMAX(comp * s->display, 1);
size = inlink->w * sizeof(int);
size = inlink->w;
} else {
outlink->w = s->size * FFMAX(comp * s->display, 1);
size = inlink->h * sizeof(int);
size = inlink->h;
}
s->peak = av_malloc_array(size, 8 * sizeof(*s->peak));
if (!s->peak)
return AVERROR(ENOMEM);
for (p = 0; p < 4; p++) {
const int is_chroma = (p == 1 || p == 2);
const int shift_w = (is_chroma ? s->desc->log2_chroma_w : 0);
@ -933,8 +935,8 @@ static int config_output(AVFilterLink *outlink)
shift = s->mode ? shift_h : shift_w;
s->emax[plane] = av_malloc(size);
s->emin[plane] = av_malloc(size);
s->emax[plane] = s->peak + size * (p + 0);
s->emin[plane] = s->peak + size * (p + 4);
if (!s->emin[plane] || !s->emax[plane])
return AVERROR(ENOMEM);
@ -942,7 +944,7 @@ static int config_output(AVFilterLink *outlink)
offset = j++ * s->size * s->display;
s->estart[plane] = offset >> shift;
s->eend[plane] = (offset + s->size - 1) >> shift;
for (i = 0; i < size / sizeof(int); i++) {
for (i = 0; i < size; i++) {
s->emax[plane][i] = s->estart[plane];
s->emin[plane][i] = s->eend[plane];
}
@ -992,12 +994,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
static av_cold void uninit(AVFilterContext *ctx)
{
WaveformContext *s = ctx->priv;
int p;
for (p = 0; p < 4; p++) {
av_freep(&s->emax[p]);
av_freep(&s->emin[p]);
}
av_freep(&s->peak);
}
static const AVFilterPad inputs[] = {