From b0a4abc8d7d25e4fe249c5658e78202082caead0 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Mon, 19 Oct 2015 14:51:36 -0400
Subject: [PATCH] video_scaler: fix VideoScaler::scale_and_pad
This method doesn't shift correctly in case of YUYV422 output format.
This patch simplify the code and force the x-shift to be correct.
Issue: #81116
Change-Id: I049d61f51a944476f5a1c3743ecb905308becc83
---
src/media/video/video_scaler.cpp | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/media/video/video_scaler.cpp b/src/media/video/video_scaler.cpp
index 5d1b12055c..009c5f3e7c 100644
--- a/src/media/video/video_scaler.cpp
+++ b/src/media/video/video_scaler.cpp
@@ -117,17 +117,19 @@ VideoScaler::scale_and_pad(const VideoFrame& input, VideoFrame& output,
// Make an offset'ed copy of output data from xoff and yoff
const auto out_desc = av_pix_fmt_desc_get((AVPixelFormat)output_frame->format);
- if (libav_utils::is_yuv_planar(*out_desc)) {
- unsigned x_shift = out_desc->log2_chroma_w;
- unsigned y_shift = out_desc->log2_chroma_h;
-
- tmp_data_[0] = output_frame->data[0] + yoff * output_frame->linesize[0] + xoff;
- tmp_data_[1] = output_frame->data[1] + (yoff >> y_shift) * output_frame->linesize[1] + (xoff >> x_shift);
- tmp_data_[2] = output_frame->data[2] + (yoff >> y_shift) * output_frame->linesize[2] + (xoff >> x_shift);
- tmp_data_[3] = nullptr;
- } else {
- memcpy(tmp_data_, output_frame->data, sizeof(tmp_data_));
- tmp_data_[0] += yoff * output_frame->linesize[0] + xoff;
+ memset(tmp_data_, 0, sizeof(tmp_data_));
+ for (int i = 0; i < 4 && output_frame->linesize[i]; i++) {
+ unsigned x_shift=xoff, y_shift=yoff;
+ if (i == 1 || i == 2) {
+ x_shift = -((-x_shift) >> out_desc->log2_chroma_w);
+ y_shift = -((-y_shift) >> out_desc->log2_chroma_h);
+ }
+#if LIBAVUTIL_VERSION_MAJOR < 56
+ auto x_step = out_desc->comp[i].step_minus1 + 1; // using deprecated api
+#else
+ auto x_step = out_desc->comp[i].step;
+#endif
+ tmp_data_[i] = output_frame->data[i] + y_shift * output_frame->linesize[i] + x_shift * x_step;
}
sws_scale(ctx_, input_frame->data, input_frame->linesize, 0,
--
GitLab