RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_scale: Fix chroma positioning for 4:2:0 pixel format 

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Maksym Veremeyenko 2017-02-06 17:03:17 +02:00 committed by Michael Niedermayer
parent 8c2ea3030a
commit 8efb7f5a26
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/vf_scale.c
View File

@ -285,6 +285,7 @@ static int config_props(AVFilterLink *outlink)
int i; int i;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
int in_v_chr_pos = scale->in_v_chr_pos, out_v_chr_pos = scale->out_v_chr_pos;
struct SwsContext **s = swscs[i]; struct SwsContext **s = swscs[i];
*s = sws_alloc_context(); *s = sws_alloc_context();
if (!*s) if (!*s)
@ -317,17 +318,17 @@ static int config_props(AVFilterLink *outlink)
* MPEG-2 chroma positions are used by convention * MPEG-2 chroma positions are used by convention
* XXX: support other 4:2:0 pixel formats */ * XXX: support other 4:2:0 pixel formats */
if (inlink0->format == AV_PIX_FMT_YUV420P && scale->in_v_chr_pos == -513) { if (inlink0->format == AV_PIX_FMT_YUV420P && scale->in_v_chr_pos == -513) {
scale->in_v_chr_pos = (i == 0) ? 128 : (i == 1) ? 64 : 192; in_v_chr_pos = (i == 0) ? 128 : (i == 1) ? 64 : 192;
} }
if (outlink->format == AV_PIX_FMT_YUV420P && scale->out_v_chr_pos == -513) { if (outlink->format == AV_PIX_FMT_YUV420P && scale->out_v_chr_pos == -513) {
scale->out_v_chr_pos = (i == 0) ? 128 : (i == 1) ? 64 : 192; out_v_chr_pos = (i == 0) ? 128 : (i == 1) ? 64 : 192;
} }
av_opt_set_int(*s, "src_h_chr_pos", scale->in_h_chr_pos, 0); av_opt_set_int(*s, "src_h_chr_pos", scale->in_h_chr_pos, 0);
av_opt_set_int(*s, "src_v_chr_pos", scale->in_v_chr_pos, 0); av_opt_set_int(*s, "src_v_chr_pos", in_v_chr_pos, 0);
av_opt_set_int(*s, "dst_h_chr_pos", scale->out_h_chr_pos, 0); av_opt_set_int(*s, "dst_h_chr_pos", scale->out_h_chr_pos, 0);
av_opt_set_int(*s, "dst_v_chr_pos", scale->out_v_chr_pos, 0); av_opt_set_int(*s, "dst_v_chr_pos", out_v_chr_pos, 0);
if ((ret = sws_init_context(*s, NULL, NULL)) < 0) if ((ret = sws_init_context(*s, NULL, NULL)) < 0)
return ret; return ret;