Commit 7ba04b3c authored by Clément Bœsch's avatar Clément Bœsch

lavfi/pixdesctest: fix chroma subsampling with odd sizes.

parent 35cf069a
...@@ -59,6 +59,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) ...@@ -59,6 +59,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
AVFilterLink *outlink = inlink->dst->outputs[0]; AVFilterLink *outlink = inlink->dst->outputs[0];
AVFrame *out; AVFrame *out;
int i, c, w = inlink->w, h = inlink->h; int i, c, w = inlink->w, h = inlink->h;
const int cw = FF_CEIL_RSHIFT(w, priv->pix_desc->log2_chroma_w);
const int ch = FF_CEIL_RSHIFT(h, priv->pix_desc->log2_chroma_h);
out = ff_get_video_buffer(outlink, outlink->w, outlink->h); out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!out) { if (!out) {
...@@ -69,12 +71,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) ...@@ -69,12 +71,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
av_frame_copy_props(out, in); av_frame_copy_props(out, in);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
int h = outlink->h; const int h1 = i == 1 || i == 2 ? ch : h;
h = i == 1 || i == 2 ? h>>priv->pix_desc->log2_chroma_h : h;
if (out->data[i]) { if (out->data[i]) {
uint8_t *data = out->data[i] + uint8_t *data = out->data[i] +
(out->linesize[i] > 0 ? 0 : out->linesize[i] * (h-1)); (out->linesize[i] > 0 ? 0 : out->linesize[i] * (h1-1));
memset(data, 0, FFABS(out->linesize[i]) * h); memset(data, 0, FFABS(out->linesize[i]) * h1);
} }
} }
...@@ -84,8 +85,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) ...@@ -84,8 +85,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
memcpy(out->data[1], in->data[1], AVPALETTE_SIZE); memcpy(out->data[1], in->data[1], AVPALETTE_SIZE);
for (c = 0; c < priv->pix_desc->nb_components; c++) { for (c = 0; c < priv->pix_desc->nb_components; c++) {
int w1 = c == 1 || c == 2 ? w>>priv->pix_desc->log2_chroma_w : w; const int w1 = c == 1 || c == 2 ? cw : w;
int h1 = c == 1 || c == 2 ? h>>priv->pix_desc->log2_chroma_h : h; const int h1 = c == 1 || c == 2 ? ch : h;
for (i = 0; i < h1; i++) { for (i = 0; i < h1; i++) {
av_read_image_line(priv->line, av_read_image_line(priv->line,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment