virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

swscale/graph: move vshift() and shift_img() to shared header

Browse Source 
I need to reuse these inside `ops.c`.
This commit is contained in:
Niklas Haas
2025-03-06 10:25:13 +01:00
parent bc9696bff8
commit d95944786e
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libswscale/graph.c
View File

@ -94,29 +94,14 @@ static int pass_append(SwsGraph *graph, enum AVPixelFormat fmt, int w, int h,
return 0; 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, static void run_copy(const SwsImg *out_base, const SwsImg *in_base,
int y, int h, const SwsPass *pass) int y, int h, const SwsPass *pass)
{ {
SwsImg in = shift_img(in_base, y); SwsImg in = ff_sws_img_shift(in_base, y);
SwsImg out = shift_img(out_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++) { 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]); av_assert1(in.data[i]);
if (in.linesize[i] == out.linesize[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); SwsContext *sws = slice_ctx(pass, y);
SwsInternal *c = sws_internal(sws); 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, c->convert_unscaled(c, (const uint8_t *const *) in.data, in.linesize, y, h,
out->data, out->linesize); 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); SwsContext *sws = slice_ctx(pass, y);
SwsInternal *c = sws_internal(sws); 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, ff_swscale(c, (const uint8_t *const *) in->data, in->linesize, 0,
sws->src_h, out.data, out.linesize, y, h); 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) int y, int h, const SwsPass *pass)
{ {
SwsLut3D *lut = pass->priv; SwsLut3D *lut = pass->priv;
const SwsImg in = shift_img(in_base, y); const SwsImg in = ff_sws_img_shift(in_base, y);
const SwsImg out = shift_img(out_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], ff_sws_lut3d_apply(lut, in.data[0], in.linesize[0], out.data[0],
out.linesize[0], pass->width, h); out.linesize[0], pass->width, h);

14
libswscale/graph.h
View File

@ -34,6 +34,20 @@ typedef struct SwsImg {
int linesize[4]; int linesize[4];
} SwsImg; } 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(const SwsImg *base, const int y)
{
SwsImg img = *base;
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 SwsPass SwsPass;
typedef struct SwsGraph SwsGraph; typedef struct SwsGraph SwsGraph;