[FFmpeg-devel] [PATCH v5 01/19] swscale/graph: pass per-pass image pointers to setup()

[Niklas Haas <ffmpeg@haasn.xyz>]

From: Niklas Haas <git@haasn.dev>

This behavior had no real justification and was just incredibly confusing,
since the in/out pointers passet to setup() did not match those passed to
run(), all for what is arguably an exception anyways (the palette setup).
---
 libswscale/graph.c | 12 ++++++++----
 libswscale/graph.h |  2 --
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libswscale/graph.c b/libswscale/graph.c
index dc7784aa49..edf243823f 100644
--- a/libswscale/graph.c
+++ b/libswscale/graph.c
@@ -169,6 +169,8 @@ static void free_legacy_swscale(void *priv)
 static void setup_legacy_swscale(const SwsImg *out, const SwsImg *in,
                                  const SwsPass *pass)
 {
+    const SwsGraph *graph = pass->graph;
+    const SwsImg *in_orig = &graph->exec.input;
     SwsContext *sws = pass->priv;
     SwsInternal *c = sws_internal(sws);
     if (sws->flags & SWS_BITEXACT && sws->dither == SWS_DITHER_ED && c->dither_error[0]) {
@@ -177,7 +179,7 @@ static void setup_legacy_swscale(const SwsImg *out, const SwsImg *in,
     }
 
     if (usePal(sws->src_format))
-        ff_update_palette(c, (const uint32_t *) in->data[1]);
+        ff_update_palette(c, (const uint32_t *) in_orig->data[1]);
 }
 
 static inline SwsContext *slice_ctx(const SwsPass *pass, int y)
@@ -710,10 +712,12 @@ void ff_sws_graph_run(SwsGraph *graph, uint8_t *const out_data[4],
     memcpy(in->linesize,  in_linesize,  sizeof(in->linesize));
 
     for (int i = 0; i < graph->num_passes; i++) {
-        const SwsPass *pass = graph->passes[i];
+        const SwsPass *pass    = graph->passes[i];
         graph->exec.pass = pass;
-        if (pass->setup)
-            pass->setup(out, in, pass);
+        if (pass->setup) {
+            pass->setup(pass->output.fmt != AV_PIX_FMT_NONE ? &pass->output : out,
+                        pass->input ? &pass->input->output : in, pass);
+        }
         avpriv_slicethread_execute(graph->slicethread, pass->num_slices, 0);
     }
 }
diff --git a/libswscale/graph.h b/libswscale/graph.h
index 0630b31ce6..b829bac88c 100644
--- a/libswscale/graph.h
+++ b/libswscale/graph.h
@@ -92,8 +92,6 @@ struct SwsPass {
 
     /**
      * Called once from the main thread before running the filter. Optional.
-     * `out` and `in` always point to the main image input/output, regardless
-     * of `input` and `output` fields.
      */
     void (*setup)(const SwsImg *out, const SwsImg *in, const SwsPass *pass);
 
-- 
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".