diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 17:10:48 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 17:10:48 +0200 |
| commit | 5d8e836d0ec3bcaabf5bc2020210a1bc61975922 (patch) | |
| tree | 8ff87745055d571431ded709218556357b18341c /libavfilter/vf_lut.c | |
| parent | 151aa2ebff514a9d150a2d3a7b92be1dcc46df36 (diff) | |
| download | ffmpeg-streaming-5d8e836d0ec3bcaabf5bc2020210a1bc61975922.zip ffmpeg-streaming-5d8e836d0ec3bcaabf5bc2020210a1bc61975922.tar.gz | |
Replace all remaining occurances of step/depth_minus1 and offset_plus1
Diffstat (limited to 'libavfilter/vf_lut.c')
| -rw-r--r-- | libavfilter/vf_lut.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 3f0524d..c81575a 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -213,7 +213,7 @@ static int config_props(AVFilterLink *inlink) s->var_values[VAR_W] = inlink->w; s->var_values[VAR_H] = inlink->h; - s->is_16bit = desc->comp[0].depth_minus1 > 7; + s->is_16bit = desc->comp[0].depth > 8; switch (inlink->format) { case AV_PIX_FMT_YUV410P: @@ -251,14 +251,14 @@ static int config_props(AVFilterLink *inlink) case AV_PIX_FMT_YUVA420P16LE: case AV_PIX_FMT_YUVA422P16LE: case AV_PIX_FMT_YUVA444P16LE: - min[Y] = 16 * (1 << (desc->comp[0].depth_minus1 - 7)); - min[U] = 16 * (1 << (desc->comp[1].depth_minus1 - 7)); - min[V] = 16 * (1 << (desc->comp[2].depth_minus1 - 7)); + min[Y] = 16 * (1 << (desc->comp[0].depth - 8)); + min[U] = 16 * (1 << (desc->comp[1].depth - 8)); + min[V] = 16 * (1 << (desc->comp[2].depth - 8)); min[A] = 0; - max[Y] = 235 * (1 << (desc->comp[0].depth_minus1 - 7)); - max[U] = 240 * (1 << (desc->comp[1].depth_minus1 - 7)); - max[V] = 240 * (1 << (desc->comp[2].depth_minus1 - 7)); - max[A] = (1 << (desc->comp[3].depth_minus1 + 1)) - 1; + max[Y] = 235 * (1 << (desc->comp[0].depth - 8)); + max[U] = 240 * (1 << (desc->comp[1].depth - 8)); + max[V] = 240 * (1 << (desc->comp[2].depth - 8)); + max[A] = (1 << desc->comp[3].depth) - 1; break; default: min[0] = min[1] = min[2] = min[3] = 0; @@ -294,7 +294,7 @@ static int config_props(AVFilterLink *inlink) s->var_values[VAR_MAXVAL] = max[color]; s->var_values[VAR_MINVAL] = min[color]; - for (val = 0; val < (1 << (desc->comp[0].depth_minus1 + 1)); val++) { + for (val = 0; val < (1 << desc->comp[0].depth); val++) { s->var_values[VAR_VAL] = val; s->var_values[VAR_CLIPVAL] = av_clip(val, min[color], max[color]); s->var_values[VAR_NEGVAL] = |
