1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

avcodec/elbg: Remove avoidable buffer

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-17 01:35:48 +02:00
parent 6af21de373
commit a6760bb92b

View File

@ -376,7 +376,6 @@ int avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook,
elbg_data elbg_d; elbg_data elbg_d;
elbg_data *elbg = &elbg_d; elbg_data *elbg = &elbg_d;
int i, j, k, steps = 0, ret = 0; int i, j, k, steps = 0, ret = 0;
int *dist_cb = av_malloc_array(numpoints, sizeof(int));
int *size_part = av_malloc_array(numCB, sizeof(int)); int *size_part = av_malloc_array(numCB, sizeof(int));
cell *list_buffer = av_malloc_array(numpoints, sizeof(cell)); cell *list_buffer = av_malloc_array(numpoints, sizeof(cell));
cell *free_cells; cell *free_cells;
@ -394,7 +393,7 @@ int avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook,
elbg->utility_inc = av_malloc_array(numCB, sizeof(*elbg->utility_inc)); elbg->utility_inc = av_malloc_array(numCB, sizeof(*elbg->utility_inc));
elbg->scratchbuf = av_malloc_array(5*dim, sizeof(int)); elbg->scratchbuf = av_malloc_array(5*dim, sizeof(int));
if (!dist_cb || !size_part || !list_buffer || !elbg->cells || if (!size_part || !list_buffer || !elbg->cells ||
!elbg->utility || !elbg->utility_inc || !elbg->scratchbuf) { !elbg->utility || !elbg->utility_inc || !elbg->scratchbuf) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto out; goto out;
@ -423,9 +422,8 @@ int avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook,
} }
} }
elbg->nearest_cb[i] = best_idx; elbg->nearest_cb[i] = best_idx;
dist_cb[i] = best_dist; elbg->error += best_dist;
elbg->error += dist_cb[i]; elbg->utility[elbg->nearest_cb[i]] += best_dist;
elbg->utility[elbg->nearest_cb[i]] += dist_cb[i];
free_cells->index = i; free_cells->index = i;
free_cells->next = elbg->cells[elbg->nearest_cb[i]]; free_cells->next = elbg->cells[elbg->nearest_cb[i]];
elbg->cells[elbg->nearest_cb[i]] = free_cells; elbg->cells[elbg->nearest_cb[i]] = free_cells;
@ -453,7 +451,6 @@ int avpriv_do_elbg(int *points, int dim, int numpoints, int *codebook,
(steps < max_steps)); (steps < max_steps));
out: out:
av_free(dist_cb);
av_free(size_part); av_free(size_part);
av_free(elbg->utility); av_free(elbg->utility);
av_free(list_buffer); av_free(list_buffer);