har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavfi/curves: dynamically allocate LUTs

Browse Source 
This simplifies following commits.
This commit is contained in:
Clément Bœsch 2016-07-22 22:20:53 +02:00
parent 4eee06ae87
commit 050f790594
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavfilter/vf_curves.c
View File

@ -63,7 +63,7 @@ typedef struct {
int preset; int preset;
char *comp_points_str[NB_COMP + 1]; char *comp_points_str[NB_COMP + 1];
char *comp_points_str_all; char *comp_points_str_all;
uint8_t graph[NB_COMP + 1][256]; uint8_t *graph[NB_COMP + 1];
char *psfile; char *psfile;
uint8_t rgba_map[4]; uint8_t rgba_map[4];
int step; int step;
@ -379,7 +379,7 @@ end:
return ret; return ret;
} }
static int dump_curves(const char *fname, uint8_t graph[NB_COMP + 1][256], static int dump_curves(const char *fname, uint8_t *graph[NB_COMP + 1],
struct keypoint *comp_points[NB_COMP + 1]) struct keypoint *comp_points[NB_COMP + 1])
{ {
int i; int i;
@ -479,6 +479,9 @@ static av_cold int init(AVFilterContext *ctx)
} }
for (i = 0; i < NB_COMP + 1; i++) { for (i = 0; i < NB_COMP + 1; i++) {
curves->graph[i] = av_mallocz(256);
if (!curves->graph[i])
return AVERROR(ENOMEM);
ret = parse_points_str(ctx, comp_points + i, curves->comp_points_str[i]); ret = parse_points_str(ctx, comp_points + i, curves->comp_points_str[i]);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -606,6 +609,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
return ff_filter_frame(outlink, out); return ff_filter_frame(outlink, out);
} }
static av_cold void uninit(AVFilterContext *ctx)
{
int i;
CurvesContext *curves = ctx->priv;
for (i = 0; i < NB_COMP + 1; i++)
av_freep(&curves->graph[i]);
}
static const AVFilterPad curves_inputs[] = { static const AVFilterPad curves_inputs[] = {
{ {
.name = "default", .name = "default",
@ -629,6 +641,7 @@ AVFilter ff_vf_curves = {
.description = NULL_IF_CONFIG_SMALL("Adjust components curves."), .description = NULL_IF_CONFIG_SMALL("Adjust components curves."),
.priv_size = sizeof(CurvesContext), .priv_size = sizeof(CurvesContext),
.init = init, .init = init,
.uninit = uninit,
.query_formats = query_formats, .query_formats = query_formats,
.inputs = curves_inputs, .inputs = curves_inputs,
.outputs = curves_outputs, .outputs = curves_outputs,