virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

vf_colorspace: Interpret unspecified color range as limited range

Browse Source 
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>
This commit is contained in:
Vittorio Giovara
2016-09-19 08:26:39 -04:00
committed by Ronald S. Bultje
parent d38dff8e5d
commit cb78d14cf9
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/vf_colorspace.c
View File

@@ -518,10 +518,14 @@ static int convert(AVFilterContext *ctx, void *data, int job_nr, int n_jobs)
return 0; 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) enum AVColorRange rng, int depth)
{ {
switch (rng) { 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: case AVCOL_RANGE_MPEG:
*off = 16 << (depth - 8); *off = 16 << (depth - 8);
*y_rng = 219 << (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; double rgb2yuv[3][3], (*yuv2rgb)[3] = s->yuv2rgb_dbl_coeffs;
int off, bits, in_rng; 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); s->in_rng, in_desc->comp[0].depth);
if (res < 0) { if (res < 0) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
@@ -773,7 +777,7 @@ static int create_filtergraph(AVFilterContext *ctx,
double (*rgb2yuv)[3] = s->rgb2yuv_dbl_coeffs; double (*rgb2yuv)[3] = s->rgb2yuv_dbl_coeffs;
int off, out_rng, bits; 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); s->out_rng, out_desc->comp[0].depth);
if (res < 0) { if (res < 0) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,