diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-09-19 08:26:39 -0400 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2016-09-19 08:26:49 -0400 |
| commit | cb78d14cf9b5ab59b4a9177f390f5e1abff58644 (patch) | |
| tree | b8ee32decf6becbdaefbf065ce9abf9361f257a7 | |
| parent | d38dff8e5da54b67c257d05fe7689d49a3a745e8 (diff) | |
| download | ffmpeg-cb78d14cf9b5ab59b4a9177f390f5e1abff58644.tar.gz | |
vf_colorspace: Interpret unspecified color range as limited range
This is the assumption that is made in pixel format conversion do
throughout the code (in particular swscale), and BT-specifications
mandate.
Add a warning to inform the user that an automatic selection is being
made.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| -rw-r--r-- | libavfilter/vf_colorspace.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c index e69be504c6..c74fe008e4 100644 --- a/libavfilter/vf_colorspace.c +++ b/libavfilter/vf_colorspace.c @@ -518,10 +518,14 @@ static int convert(AVFilterContext *ctx, void *data, int job_nr, int n_jobs) return 0; } -static int get_range_off(int *off, int *y_rng, int *uv_rng, +static int get_range_off(AVFilterContext *ctx, int *off, + int *y_rng, int *uv_rng, enum AVColorRange rng, int depth) { switch (rng) { + case AVCOL_RANGE_UNSPECIFIED: + av_log(ctx, AV_LOG_WARNING, "Input range not set, assuming tv/mpeg\n"); + // fall-through case AVCOL_RANGE_MPEG: *off = 16 << (depth - 8); *y_rng = 219 << (depth - 8); @@ -740,7 +744,7 @@ static int create_filtergraph(AVFilterContext *ctx, double rgb2yuv[3][3], (*yuv2rgb)[3] = s->yuv2rgb_dbl_coeffs; int off, bits, in_rng; - res = get_range_off(&off, &s->in_y_rng, &s->in_uv_rng, + res = get_range_off(ctx, &off, &s->in_y_rng, &s->in_uv_rng, s->in_rng, in_desc->comp[0].depth); if (res < 0) { av_log(ctx, AV_LOG_ERROR, @@ -773,7 +777,7 @@ static int create_filtergraph(AVFilterContext *ctx, double (*rgb2yuv)[3] = s->rgb2yuv_dbl_coeffs; int off, out_rng, bits; - res = get_range_off(&off, &s->out_y_rng, &s->out_uv_rng, + res = get_range_off(ctx, &off, &s->out_y_rng, &s->out_uv_rng, s->out_rng, out_desc->comp[0].depth); if (res < 0) { av_log(ctx, AV_LOG_ERROR, |