From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 36D354DF2E
for <ffmpegdev@gitmailbox.com>; Sat, 26 Apr 2025 17:57:09 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 91DD068B52A;
Sat, 26 Apr 2025 20:56:22 +0300 (EEST)
Received: from haasn.dev (haasn.dev [78.46.187.166])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2951A68A5AA
for <ffmpeg-devel@ffmpeg.org>; Sat, 26 Apr 2025 20:56:11 +0300 (EEST)
Received: from haasn.dev (unknown [10.30.1.1])
by haasn.dev (Postfix) with UTF8SMTP id EBA7F42598;
Sat, 26 Apr 2025 19:56:10 +0200 (CEST)
From: Niklas Haas <ffmpeg@haasn.xyz>
To: ffmpeg-devel@ffmpeg.org
Date: Sat, 26 Apr 2025 19:41:08 +0200
Message-ID: <20250426175603.726924-5-ffmpeg@haasn.xyz>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250426175603.726924-1-ffmpeg@haasn.xyz>
References: <20250426175603.726924-1-ffmpeg@haasn.xyz>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 04/17] swscale/graph: move vshift() and
shift_img() to shared header
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Niklas Haas <git@haasn.dev>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250426175603.726924-5-ffmpeg@haasn.xyz/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: Niklas Haas <git@haasn.dev>
I need to reuse these inside `ops.c`.
---
libswscale/graph.c | 29 +++++++----------------------
libswscale/graph.h | 13 +++++++++++++
2 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/libswscale/graph.c b/libswscale/graph.c
index c5a46eb257..b921b7ec02 100644
--- a/libswscale/graph.c
+++ b/libswscale/graph.c
@@ -94,29 +94,14 @@ static int pass_append(SwsGraph *graph, enum AVPixelFormat fmt, int w, int h,
return 0;
}
-static int vshift(enum AVPixelFormat fmt, int plane)
-{
- const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt);
- return (plane == 1 || plane == 2) ? desc->log2_chroma_h : 0;
-}
-
-/* Shift an image vertically by y lines */
-static SwsImg shift_img(const SwsImg *img_base, int y)
-{
- SwsImg img = *img_base;
- for (int i = 0; i < 4 && img.data[i]; i++)
- img.data[i] += (y >> vshift(img.fmt, i)) * img.linesize[i];
- return img;
-}
-
static void run_copy(const SwsImg *out_base, const SwsImg *in_base,
int y, int h, const SwsPass *pass)
{
- SwsImg in = shift_img(in_base, y);
- SwsImg out = shift_img(out_base, y);
+ SwsImg in = ff_sws_img_shift(*in_base, y);
+ SwsImg out = ff_sws_img_shift(*out_base, y);
for (int i = 0; i < FF_ARRAY_ELEMS(out.data) && out.data[i]; i++) {
- const int lines = h >> vshift(in.fmt, i);
+ const int lines = h >> ff_fmt_vshift(in.fmt, i);
av_assert1(in.data[i]);
if (in.linesize[i] == out.linesize[i]) {
@@ -219,7 +204,7 @@ static void run_legacy_unscaled(const SwsImg *out, const SwsImg *in_base,
{
SwsContext *sws = slice_ctx(pass, y);
SwsInternal *c = sws_internal(sws);
- const SwsImg in = shift_img(in_base, y);
+ const SwsImg in = ff_sws_img_shift(*in_base, y);
c->convert_unscaled(c, (const uint8_t *const *) in.data, in.linesize, y, h,
out->data, out->linesize);
@@ -230,7 +215,7 @@ static void run_legacy_swscale(const SwsImg *out_base, const SwsImg *in,
{
SwsContext *sws = slice_ctx(pass, y);
SwsInternal *c = sws_internal(sws);
- const SwsImg out = shift_img(out_base, y);
+ const SwsImg out = ff_sws_img_shift(*out_base, y);
ff_swscale(c, (const uint8_t *const *) in->data, in->linesize, 0,
sws->src_h, out.data, out.linesize, y, h);
@@ -490,8 +475,8 @@ static void run_lut3d(const SwsImg *out_base, const SwsImg *in_base,
int y, int h, const SwsPass *pass)
{
SwsLut3D *lut = pass->priv;
- const SwsImg in = shift_img(in_base, y);
- const SwsImg out = shift_img(out_base, y);
+ const SwsImg in = ff_sws_img_shift(*in_base, y);
+ const SwsImg out = ff_sws_img_shift(*out_base, y);
ff_sws_lut3d_apply(lut, in.data[0], in.linesize[0], out.data[0],
out.linesize[0], pass->width, h);
diff --git a/libswscale/graph.h b/libswscale/graph.h
index 62b622a065..191734b794 100644
--- a/libswscale/graph.h
+++ b/libswscale/graph.h
@@ -34,6 +34,19 @@ typedef struct SwsImg {
int linesize[4];
} SwsImg;
+static av_always_inline av_const int ff_fmt_vshift(enum AVPixelFormat fmt, int plane)
+{
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt);
+ return (plane == 1 || plane == 2) ? desc->log2_chroma_h : 0;
+}
+
+static av_const inline SwsImg ff_sws_img_shift(SwsImg img, const int y)
+{
+ for (int i = 0; i < 4 && img.data[i]; i++)
+ img.data[i] += (y >> ff_fmt_vshift(img.fmt, i)) * img.linesize[i];
+ return img;
+}
+
typedef struct SwsPass SwsPass;
typedef struct SwsGraph SwsGraph;
--
2.49.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".